Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 13639:595dba23d337

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diff: make diff -c aware of revision sets
author Steve Borho <steve@borho.org>
date Mon, 14 Mar 2011 13:11:26 -0500
parents 0e217d479c16
children 7e6c2f58ad56
comparison
equal deleted inserted replaced
13638:72040d98ff0a 13639:595dba23d337
1616 1616
1617 if revs and change: 1617 if revs and change:
1618 msg = _('cannot specify --rev and --change at the same time') 1618 msg = _('cannot specify --rev and --change at the same time')
1619 raise util.Abort(msg) 1619 raise util.Abort(msg)
1620 elif change: 1620 elif change:
1621 node2 = repo.lookup(change) 1621 node2 = cmdutil.revsingle(repo, change, None).node()
1622 node1 = repo[node2].parents()[0].node() 1622 node1 = repo[node2].parents()[0].node()
1623 else: 1623 else:
1624 node1, node2 = cmdutil.revpair(repo, revs) 1624 node1, node2 = cmdutil.revpair(repo, revs)
1625 1625
1626 if reverse: 1626 if reverse: