This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3996

amend: use ctx1.status(ctx2) instead of repo.status(ctx1, ctx2)
ClosedPublic

Authored by martinvonz on Aug 1 2018, 12:30 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe252f136b948: amend: use ctx1.status(ctx2) instead of repo.status(ctx1, ctx2)

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (2 lines)

Diff 9707

mercurial/cmdutil.py

date = opts.get('date') or old.date() date = opts.get('date') or old.date()
# Parse the date to allow comparison between date and old.date() # Parse the date to allow comparison between date and old.date()
date = dateutil.parsedate(date) date = dateutil.parsedate(date)
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 = set([fn for st in repo.status(base, old)[:3] files = set([fn for st in base.status(old)[:3]
for fn in st]) for fn in st])
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)
if (opts.get('addremove') if (opts.get('addremove')