This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7390

extdiff: use field names instead of field numbers on scmutil.status
ClosedPublic

Authored by durin42 on Nov 14 2019, 4:08 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG7415cd486696: extdiff: use field names instead of field numbers on scmutil.status
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.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mhgext/extdiff.py (13 lines)

Diff 18080

hgext/extdiff.py

if opts.get(b'patch'): if opts.get(b'patch'):
if subrepos: if subrepos:
raise error.Abort(_(b'--patch cannot be used with --subrepos')) raise error.Abort(_(b'--patch cannot be used with --subrepos'))
if perfile: if perfile:
raise error.Abort(_(b'--patch cannot be used with --per-file')) raise error.Abort(_(b'--patch cannot be used with --per-file'))
if node2 is None: if node2 is None:
raise error.Abort(_(b'--patch requires two revisions')) raise error.Abort(_(b'--patch requires two revisions'))
else: else:
mod_a, add_a, rem_a = map( st = repo.status(node1a, node2, matcher, listsubrepos=subrepos)
set, repo.status(node1a, node2, matcher, listsubrepos=subrepos)[:3] mod_a, add_a, rem_a = set(st.modified), set(st.added), set(st.removed)
)
if do3way: if do3way:
mod_b, add_b, rem_b = map( stb = repo.status(node1b, node2, matcher, listsubrepos=subrepos)
set, mod_b, add_b, rem_b = (
repo.status(node1b, node2, matcher, listsubrepos=subrepos)[:3], set(stb.modified),
set(stb.added),
set(stb.removed),
) )
else: else:
mod_b, add_b, rem_b = set(), set(), set() mod_b, add_b, rem_b = set(), set(), set()
modadd = mod_a | add_a | mod_b | add_b modadd = mod_a | add_a | mod_b | add_b
common = modadd | rem_a | rem_b common = modadd | rem_a | rem_b
if not common: if not common:
return 0 return 0