Mercurial > public > mercurial-scm > hg
comparison hgext/extdiff.py @ 13660:a56c1b2bff18
Updating hgext.extdiff to use revsets
author | David Wolever <david@wolever.net> |
---|---|
date | Tue, 15 Mar 2011 17:50:02 -0400 |
parents | 40c06bbf58be |
children | 5c0e1222e7c0 |
comparison
equal
deleted
inserted
replaced
13659:a73f38d8bbdb | 13660:a56c1b2bff18 |
---|---|
119 | 119 |
120 if revs and change: | 120 if revs and change: |
121 msg = _('cannot specify --rev and --change at the same time') | 121 msg = _('cannot specify --rev and --change at the same time') |
122 raise util.Abort(msg) | 122 raise util.Abort(msg) |
123 elif change: | 123 elif change: |
124 node2 = repo.lookup(change) | 124 node2 = cmdutil.revsingle(repo, change, None).node() |
125 node1a, node1b = repo.changelog.parents(node2) | 125 node1a, node1b = repo.changelog.parents(node2) |
126 else: | 126 else: |
127 node1a, node2 = cmdutil.revpair(repo, revs) | 127 node1a, node2 = cmdutil.revpair(repo, revs) |
128 if not revs: | 128 if not revs: |
129 node1b = repo.dirstate.parents()[1] | 129 node1b = repo.dirstate.parents()[1] |