D7390: extdiff: use field names instead of field numbers on scmutil.status
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Thu Nov 14 21:08:44 UTC 2019
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
As part of my pytype adventures I want to make scmutil.status no longer a
subclass of tuple. This is part of that process.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D7390
AFFECTED FILES
hgext/extdiff.py
CHANGE DETAILS
diff --git a/hgext/extdiff.py b/hgext/extdiff.py
--- a/hgext/extdiff.py
+++ b/hgext/extdiff.py
@@ -401,13 +401,14 @@
if node2 is None:
raise error.Abort(_(b'--patch requires two revisions'))
else:
- mod_a, add_a, rem_a = map(
- set, repo.status(node1a, node2, matcher, listsubrepos=subrepos)[:3]
- )
+ st = repo.status(node1a, node2, matcher, listsubrepos=subrepos)
+ mod_a, add_a, rem_a = set(st.modified), set(st.added), set(st.removed)
if do3way:
- mod_b, add_b, rem_b = map(
- set,
- repo.status(node1b, node2, matcher, listsubrepos=subrepos)[:3],
+ stb = repo.status(node1b, node2, matcher, listsubrepos=subrepos)
+ mod_b, add_b, rem_b = (
+ set(stb.modified),
+ set(stb.added),
+ set(stb.removed),
)
else:
mod_b, add_b, rem_b = set(), set(), set()
To: durin42, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list