This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9227

fix: only check for obsolete commits in the --rev case
ClosedPublic

Authored by martinvonz on Oct 16 2020, 7:04 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG09914d934cf4: fix: only check for obsolete commits in the --rev case
rHG205c4066ec5d: fix: only check for obsolete commits in the --rev case
Summary

With both --all and --source, we already exclude obsolete
revisions in the revset, so there's no need to call
checkfixablectx() in those cases.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Oct 16 2020, 7:04 PM
martinvonz added a commit: rHG205c4066ec5d: fix: only check for obsolete commits in the --rev case.Oct 30 2020, 2:42 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG205c4066ec5d: fix: only check for obsolete commits in the --rev case (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/fix.py (4 lines)

Diff 23263

hgext/fix.py

# `wdir()::` is currently empty, so manually add wdir # `wdir()::` is currently empty, so manually add wdir
revs.add(wdirrev) revs.add(wdirrev)
if repo[b'.'].rev() in revs: if repo[b'.'].rev() in revs:
revs.add(wdirrev) revs.add(wdirrev)
else: else:
revs = set(scmutil.revrange(repo, opts[b'rev'])) revs = set(scmutil.revrange(repo, opts[b'rev']))
if opts.get(b'working_dir'): if opts.get(b'working_dir'):
revs.add(wdirrev) revs.add(wdirrev)
for rev in revs: for rev in revs:
checkfixablectx(ui, repo, repo[rev]) checkfixablectx(ui, repo, repo[rev])
# Allow fixing only wdir() even if there's an unfinished operation # Allow fixing only wdir() even if there's an unfinished operation
if not (len(revs) == 1 and wdirrev in revs): if not (len(revs) == 1 and wdirrev in revs):
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
rewriteutil.precheck(repo, revs, b'fix') rewriteutil.precheck(repo, revs, b'fix')
if wdirrev in revs and list( if wdirrev in revs and list(
mergestatemod.mergestate.read(repo).unresolved() mergestatemod.mergestate.read(repo).unresolved()
): ):
raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'") raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'")