Mercurial > hgsubversion

comparison diff_cmd.py @ 138:40474f6c1f84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diff_cmd: more robust, add tests.
author Augie Fackler <durin42@gmail.com>
date Thu, 11 Dec 2008 19:49:36 -0600
parents 91ce18fa0375
children 1fde85a10f9e
comparison
equal deleted inserted replaced
137:904a4b08f70f 138:40474f6c1f84
35 o_r = util.outgoing_revisions(ui, repo, hge, svn_commit_hashes) 35 o_r = util.outgoing_revisions(ui, repo, hge, svn_commit_hashes)
36 parent = repo.parents()[0] 36 parent = repo.parents()[0]
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)) 41 opts=patch.diffopts(ui, opts={'git': True,
42 'show_function': False,
43 'ignore_all_space': False,
44 'ignore_space_change': False,
45 'ignore_blank_lines': False,
46 'unified': True,
47 'text': False,
48 }))
42 ui.write(filterdiff(''.join(it), base_rev)) 49 ui.write(filterdiff(''.join(it), base_rev))