D3010: status: use context-returning revpair()
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sun Apr 1 06:37:39 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3c7c13e75663: status: use context-returning revpair() (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3010?vs=7490&id=7498
REVISION DETAIL
https://phab.mercurial-scm.org/D3010
AFFECTED FILES
mercurial/commands.py
CHANGE DETAILS
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4877,11 +4877,11 @@
raise error.Abort(msg)
elif change:
repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
- node2 = scmutil.revsingle(repo, change, None).node()
- node1 = repo[node2].p1().node()
+ ctx2 = scmutil.revsingle(repo, change, None)
+ ctx1 = ctx2.p1()
else:
repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
- node1, node2 = scmutil.revpairnodes(repo, revs)
+ ctx1, ctx2 = scmutil.revpair(repo, revs)
if pats or ui.configbool('commands', 'status.relative'):
cwd = repo.getcwd()
@@ -4904,24 +4904,24 @@
else:
show = states[:5]
- m = scmutil.match(repo[node2], pats, opts)
+ m = scmutil.match(ctx2, pats, opts)
if terse:
# we need to compute clean and unknown to terse
- stat = repo.status(node1, node2, m,
+ stat = repo.status(ctx1.node(), ctx2.node(), m,
'ignored' in show or 'i' in terse,
True, True, opts.get('subrepos'))
stat = cmdutil.tersedir(stat, terse)
else:
- stat = repo.status(node1, node2, m,
+ stat = repo.status(ctx1.node(), ctx2.node(), m,
'ignored' in show, 'clean' in show,
'unknown' in show, opts.get('subrepos'))
changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
if (opts.get('all') or opts.get('copies')
or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
- copy = copies.pathcopies(repo[node1], repo[node2], m)
+ copy = copies.pathcopies(ctx1, ctx2, m)
ui.pager('status')
fm = ui.formatter('status', opts)
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list