equal
deleted
inserted
replaced
5172 |
5172 |
5173 if revs and change: |
5173 if revs and change: |
5174 msg = _('cannot specify --rev and --change at the same time') |
5174 msg = _('cannot specify --rev and --change at the same time') |
5175 raise util.Abort(msg) |
5175 raise util.Abort(msg) |
5176 elif change: |
5176 elif change: |
5177 node2 = repo.lookup(change) |
5177 node2 = scmutil.revsingle(repo, change, None).node() |
5178 node1 = repo[node2].p1().node() |
5178 node1 = repo[node2].p1().node() |
5179 else: |
5179 else: |
5180 node1, node2 = scmutil.revpair(repo, revs) |
5180 node1, node2 = scmutil.revpair(repo, revs) |
5181 |
5181 |
5182 cwd = (pats and repo.getcwd()) or '' |
5182 cwd = (pats and repo.getcwd()) or '' |