This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9226

fix: don't include obsolete descendants with -s
ClosedPublic

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

Details

Reviewers
hooper
Group Reviewers
hg-reviewers
Commits
rHG136a86327316: fix: don't include obsolete descendants with -s
rHG7f07e6349e51: fix: don't include obsolete descendants with -s
Summary

The -s/--source option is for regular users (-r is there for power
users). If there are obsolete commits that are descendants of the
given revision(s), then they almost definitely should just be left
alone. That's what hg rebase does as well. So this patch makes it so
we skip obsolete commits (including those in the input set itself).

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
hooper added a comment.Oct 16 2020, 9:19 PM

Looks good.

martinvonz added a commit: rHG7f07e6349e51: fix: don't include obsolete descendants with -s.Oct 30 2020, 2:41 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG7f07e6349e51: fix: don't include obsolete descendants with -s (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/fix.py (2 lines)
Mtests/test-fix-topology.t (7 lines)

Diff 23262

hgext/fix.py

def getrevstofix(ui, repo, opts): def getrevstofix(ui, repo, opts):
"""Returns the set of revision numbers that should be fixed""" """Returns the set of revision numbers that should be fixed"""
if opts[b'all']: if opts[b'all']:
revs = repo.revs(b'(not public() and not obsolete()) or wdir()') revs = repo.revs(b'(not public() and not obsolete()) or wdir()')
elif opts[b'source']: elif opts[b'source']:
source_revs = scmutil.revrange(repo, opts[b'source']) source_revs = scmutil.revrange(repo, opts[b'source'])
revs = set(repo.revs(b'%ld::', source_revs)) revs = set(repo.revs(b'(%ld::) - obsolete()', source_revs))
if wdirrev in source_revs: if wdirrev in source_revs:
# `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'):

tests/test-fix-topology.t

| | | |
x | 2 D x | 2 D
| | | |
| x 1 B | x 1 B
|/ |/
o 0 A o 0 A
$ hg fix -s A $ hg fix -s A
abort: fixing obsolete revision could cause divergence
[255]
$ hg fix -s B $ hg fix -s B
abort: fixing obsolete revision could cause divergence abort: no changesets specified
(use --source or --working-dir)
[255] [255]
$ hg fix -s D $ hg fix -s D
abort: fixing obsolete revision could cause divergence
[255]
$ hg fix -s E $ hg fix -s E
$ cd .. $ cd ..
#endif #endif
The --all flag should fix anything that wouldn't cause a problem if you fixed The --all flag should fix anything that wouldn't cause a problem if you fixed
it, including the working copy. Obsolete revisions are not fixed because that it, including the working copy. Obsolete revisions are not fixed because that
could cause divergence. Public revisions would cause an abort because they are could cause divergence. Public revisions would cause an abort because they are