This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7396

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

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGe01e0641f18a: cmdutil: 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
Mmercurial/cmdutil.py (23 lines)

Diff 18086

mercurial/cmdutil.py

status = repo.status(match=match) status = repo.status(match=match)
overrides = {(b'ui', b'commitsubrepos'): True} overrides = {(b'ui', b'commitsubrepos'): True}
with repo.ui.configoverride(overrides, b'record'): with repo.ui.configoverride(overrides, b'record'):
# subrepoutil.precommit() modifies the status # subrepoutil.precommit() modifies the status
tmpstatus = scmutil.status( tmpstatus = scmutil.status(
copymod.copy(status[0]), copymod.copy(status.modified),
copymod.copy(status[1]), copymod.copy(status.added),
copymod.copy(status[2]), copymod.copy(status.removed),
copymod.copy(status[3]), copymod.copy(status.deleted),
copymod.copy(status[4]), copymod.copy(status.unknown),
copymod.copy(status[5]), copymod.copy(status.ignored),
copymod.copy(status[6]), # pytype: disable=wrong-arg-count copymod.copy(status.clean), # pytype: disable=wrong-arg-count
) )
# Force allows -X subrepo to skip the subrepo. # Force allows -X subrepo to skip the subrepo.
subs, commitsubs, newstate = subrepoutil.precommit( subs, commitsubs, newstate = subrepoutil.precommit(
repo.ui, wctx, tmpstatus, match, force=True repo.ui, wctx, tmpstatus, match, force=True
) )
for s in subs: for s in subs:
if s in commitsubs: if s in commitsubs:
'merge' can be set to false if a pending uncommitted merge should be 'merge' can be set to false if a pending uncommitted merge should be
ignored (such as when 'update --check' runs). ignored (such as when 'update --check' runs).
'hint' is the usual hint given to Abort exception. 'hint' is the usual hint given to Abort exception.
""" """
if merge and repo.dirstate.p2() != nullid: if merge and repo.dirstate.p2() != nullid:
raise error.Abort(_(b'outstanding uncommitted merge'), hint=hint) raise error.Abort(_(b'outstanding uncommitted merge'), hint=hint)
modified, added, removed, deleted = repo.status()[:4] st = repo.status()
if modified or added or removed or deleted: if st.modified or st.added or st.removed or st.deleted:
raise error.Abort(_(b'uncommitted changes'), hint=hint) raise error.Abort(_(b'uncommitted changes'), hint=hint)
ctx = repo[None] ctx = repo[None]
for s in sorted(ctx.substate): for s in sorted(ctx.substate):
ctx.sub(s).bailifchanged(hint=hint) ctx.sub(s).bailifchanged(hint=hint)
def logmessage(ui, opts): def logmessage(ui, opts):
""" get the log message according to -m and -l option """ """ get the log message according to -m and -l option """
return ret return ret
def remove( def remove(
ui, repo, m, prefix, uipathfn, after, force, subrepos, dryrun, warnings=None ui, repo, m, prefix, uipathfn, after, force, subrepos, dryrun, warnings=None
): ):
ret = 0 ret = 0
s = repo.status(match=m, clean=True) s = repo.status(match=m, clean=True)
modified, added, deleted, clean = s[0], s[1], s[3], s[6] modified, added, deleted, clean = s.modified, s.added, s.deleted, s.clean
wctx = repo[None] wctx = repo[None]
if warnings is None: if warnings is None:
warnings = [] warnings = []
warn = True warn = True
else: else:
warn = False warn = False
date = old.date() date = old.date()
if opts.get(b'date'): if opts.get(b'date'):
date = dateutil.parsedate(opts.get(b'date')) date = dateutil.parsedate(opts.get(b'date'))
user = opts.get(b'user') or old.user() user = opts.get(b'user') or old.user()
if len(old.parents()) > 1: if len(old.parents()) > 1:
# ctx.files() isn't reliable for merges, so fall back to the # ctx.files() isn't reliable for merges, so fall back to the
# slower repo.status() method # slower repo.status() method
files = {fn for st in base.status(old)[:3] for fn in st} st = base.status(old)
files = set(st.modified) | set(st.added) | set(st.removed)
else: else:
files = set(old.files()) files = set(old.files())
# add/remove the files to the working copy if the "addremove" option # add/remove the files to the working copy if the "addremove" option
# was specified. # was specified.
matcher = scmutil.match(wctx, pats, opts) matcher = scmutil.match(wctx, pats, opts)
relative = scmutil.anypats(pats, opts) relative = scmutil.anypats(pats, opts)
uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative) uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)