Mercurial > hgsubversion

comparison diff_cmd.py @ 152:1fde85a10f9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
push: Fix the bad implementation that required modifying the dirstate to push.
author Augie Fackler <durin42@gmail.com>
date Mon, 22 Dec 2008 21:22:11 -0600
parents 40474f6c1f84
children e37f9d3fd5e7
comparison
equal deleted inserted replaced
151:2decec74ad0c 152:1fde85a10f9e
30 """ 30 """
31 hge = hg_delta_editor.HgChangeReceiver(hg_repo_path, 31 hge = hg_delta_editor.HgChangeReceiver(hg_repo_path,
32 ui_=ui) 32 ui_=ui)
33 svn_commit_hashes = dict(zip(hge.revmap.itervalues(), 33 svn_commit_hashes = dict(zip(hge.revmap.itervalues(),
34 hge.revmap.iterkeys())) 34 hge.revmap.iterkeys()))
35 o_r = util.outgoing_revisions(ui, repo, hge, svn_commit_hashes)
36 parent = repo.parents()[0] 35 parent = repo.parents()[0]
36 o_r = util.outgoing_revisions(ui, repo, hge, svn_commit_hashes, parent.node())
37 if o_r: 37 if o_r:
38 parent = repo[o_r[-1]].parents()[0] 38 parent = repo[o_r[-1]].parents()[0]
39 base_rev, _junk = svn_commit_hashes[parent.node()] 39 base_rev, _junk = svn_commit_hashes[parent.node()]
40 it = patch.diff(repo, parent.node(), None, 40 it = patch.diff(repo, parent.node(), None,
41 opts=patch.diffopts(ui, opts={'git': True, 41 opts=patch.diffopts(ui, opts={'git': True,