This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12088

fix: remove unnecessary and overly strict check for divergence
ClosedPublic

Authored by martinvonz on Jan 25 2022, 1:32 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG657e490756e6: fix: remove unnecessary and overly strict check for divergence
Summary

rewriteutil.precheck() checks for divergence these days, so we can
remove the redundant check in hg fix.

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.

Event Timeline

martinvonz created this revision.Jan 25 2022, 1:32 PM
martinvonz added a comment.Jan 25 2022, 1:35 PM

This patch is almost a year old. I just found it in my repo. It looks good to current-me, so I'm not sure why I didn't send it a year ago. Maybe I just had a few more fixes for precheck() to send and then I forgot this patch.

martinvonz updated this revision to Diff 31980.Jan 26 2022, 1:29 PM
martinvonz added a commit: rHG657e490756e6: fix: remove unnecessary and overly strict check for divergence.Jan 26 2022, 2:14 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG657e490756e6: fix: remove unnecessary and overly strict check for divergence (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/fix.py (13 lines)
Mtests/test-fix.t (5 lines)

Diff 31983

hgext/fix.py

context, context,
copies, copies,
error, error,
logcmdutil, logcmdutil,
match as matchmod, match as matchmod,
mdiff, mdiff,
merge, merge,
mergestate as mergestatemod, mergestate as mergestatemod,
obsolete,
pycompat, pycompat,
registrar, registrar,
rewriteutil, rewriteutil,
scmutil, scmutil,
util, util,
worker, worker,
) )
# `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(logcmdutil.revrange(repo, opts[b'rev'])) revs = set(logcmdutil.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:
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 ( if (
wdirrev in revs wdirrev in revs
and mergestatemod.mergestate.read(repo).unresolvedcount() and mergestatemod.mergestate.read(repo).unresolvedcount()
): ):
raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'") raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'")
if not revs: if not revs:
raise error.Abort( raise error.Abort(
b'no changesets specified', hint=b'use --source or --working-dir' b'no changesets specified', hint=b'use --source or --working-dir'
) )
return revs return revs
def checkfixablectx(ui, repo, ctx):
"""Aborts if the revision shouldn't be replaced with a fixed one."""
if ctx.obsolete():
# It would be better to actually check if the revision has a successor.
if not obsolete.isenabled(repo, obsolete.allowdivergenceopt):
raise error.Abort(
b'fixing obsolete revision could cause divergence'
)
def pathstofix(ui, repo, pats, opts, match, basectxs, fixctx): def pathstofix(ui, repo, pats, opts, match, basectxs, fixctx):
"""Returns the set of files that should be fixed in a context """Returns the set of files that should be fixed in a context
The result depends on the base contexts; we include any file that has The result depends on the base contexts; we include any file that has
changed relative to any of the base contexts. Base contexts should be changed relative to any of the base contexts. Base contexts should be
ancestors of the context being fixed. ancestors of the context being fixed.
""" """
files = set() files = set()

tests/test-fix.t

$ hg init abortobsoleterev $ hg init abortobsoleterev
$ cd abortobsoleterev $ cd abortobsoleterev
$ printf "foo\n" > foo.changed $ printf "foo\n" > foo.changed
$ hg commit -Aqm "foo" $ hg commit -Aqm "foo"
$ hg ci --amend -m rewritten $ hg ci --amend -m rewritten
$ hg --hidden fix -r 0 $ hg --hidden fix -r 0
abort: fixing obsolete revision could cause divergence abort: cannot fix b87e30dbf19b, as that creates content-divergence with 2e007a78dfb8
[255] (add --verbose for details or see 'hg help evolution.instability')
[10]
$ hg --hidden fix -r 0 --config experimental.evolution.allowdivergence=true $ hg --hidden fix -r 0 --config experimental.evolution.allowdivergence=true
2 new content-divergent changesets 2 new content-divergent changesets
$ hg cat -r tip foo.changed $ hg cat -r tip foo.changed
FOO FOO
$ cd .. $ cd ..