This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12099

destutil: if wdp is obsolete, update to the closest non-obsolete ancestor
ClosedPublic

Authored by av6 on Jan 28 2022, 12:39 PM.

Details

Reviewers
marmoute
Alphare
Group Reviewers
hg-reviewers
Commits
rHGfbf7e383e961: destutil: if wdp is obsolete, update to the closest non-obsolete ancestor
Summary

As the original comments suggest, using prune as a model here was an existing
idea, and now this patch implements it.

I think it would be even better to do what solveobswdp() from evolve does (in
short, it allows to update to a successor of the closest ancestor even if that
ancestor is obsolete), but that is outside of this series' scope.

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

av6 created this revision.Jan 28 2022, 12:39 PM
marmoute added a subscriber: marmoute.Jan 31 2022, 12:04 PM

This looks an improvement.

However maybe we can go further. What about:

Update to the successors of the first non pruned ancestors. (Possibly to successors of obsolete ancestors of pruned successors of obsolete ancestors of the pruned changesets).

marmoute accepted this revision.Jan 31 2022, 12:04 PM
av6 added a comment.Feb 3 2022, 7:12 AM
In D12099#185743, @marmoute wrote:

Update to the successors of the first non pruned ancestors. (Possibly to successors of obsolete ancestors of pruned successors of obsolete ancestors of the pruned changesets).

Yes, I've mentioned it in the commit description together with the reason I'm going the simplest way of handling obsolete wdp in this series. This patch is primarily just to make test-update-branches.t pass.

Also when I had a WIP patch porting evolve's solveobswdp() to core it looked like it could be pretty bikesheddable, which is not a quality I'd like a patch to have while we're not too far away from code freeze.

marmoute added a comment.Feb 3 2022, 8:03 AM
In D12099#185943, @av6 wrote:
In D12099#185743, @marmoute wrote:

Update to the successors of the first non pruned ancestors. (Possibly to successors of obsolete ancestors of pruned successors of obsolete ancestors of the pruned changesets).

Yes, I've mentioned it in the commit description together with the reason I'm going the simplest way of handling obsolete wdp in this series. This patch is primarily just to make test-update-branches.t pass.

To clarify, I am all good with that.

Alphare accepted this revision.Feb 3 2022, 11:33 AM
This revision is now accepted and ready to land.Feb 3 2022, 11:33 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/destutil.py (17 lines)
Mtests/test-update-branches.t (18 lines)

Diff 32047

mercurial/destutil.py

# #
# divergent changesets: update to highest rev, similar to what # divergent changesets: update to highest rev, similar to what
# is currently done when there are more than one head # is currently done when there are more than one head
# (i.e. 'tip') # (i.e. 'tip')
# #
# replaced changesets: same as divergent except we know there # replaced changesets: same as divergent except we know there
# is no conflict # is no conflict
# #
# pruned changeset: no update is done; though, we could # pruned changeset: update to the closest non-obsolete ancestor,
# consider updating to the first non-obsolete parent, # similar to what 'hg prune' currently does
# similar to what is current done for 'hg prune'
if successors: if successors:
# flatten the list here handles both divergent (len > 1) # flatten the list here handles both divergent (len > 1)
# and the usual case (len = 1) # and the usual case (len = 1)
successors = [n for sub in successors for n in sub] successors = [n for sub in successors for n in sub]
# get the max revision for the given successors set, # get the max revision for the given successors set,
# i.e. the 'tip' of a set # i.e. the 'tip' of a set
node = repo.revs(b'max(%ln)', successors).first() node = repo.revs(b'max(%ln)', successors).first()
if bookmarks.isactivewdirparent(repo):
movemark = repo[b'.'].node()
else: else:
# TODO: copy hg prune logic p1 = p1.p1()
node = repo[b'.'].node() while p1.obsolete():
p1 = p1.p1()
node = p1.node()
if node is not None and bookmarks.isactivewdirparent(repo):
movemark = repo[b'.'].node()
return node, movemark, None return node, movemark, None
def _destupdatebook(repo, clean): def _destupdatebook(repo, clean):
"""decide on an update destination from active bookmark""" """decide on an update destination from active bookmark"""
# we also move the active bookmark, if any # we also move the active bookmark, if any
node = None node = None
activemark, movemark = bookmarks.calculateupdate(repo.ui, repo) activemark, movemark = bookmarks.calculateupdate(repo.ui, repo)

tests/test-update-branches.t

Test that 5 is not detected as a valid destination from 2 Test that 5 is not detected as a valid destination from 2
$ hg up --quiet 0 $ hg up --quiet 0
$ hg up --quiet 2 $ hg up --quiet 2
$ hg up 5 $ hg up 5
abort: uncommitted changes abort: uncommitted changes
(commit or update --clean to discard changes) (commit or update --clean to discard changes)
[255] [255]
Test that we don't crash when updating from a pruned changeset (i.e. has no Test that we update to the closest non-obsolete ancestor when updating from a
successors). Behavior should probably be that we update to the first pruned changeset (i.e. that has no successors)
non-obsolete parent but that will be decided later.
$ hg id --debug -r 2 $ hg id --debug -r 2
bd10386d478cd5a9faf2e604114c8e6da62d3889 bd10386d478cd5a9faf2e604114c8e6da62d3889
$ hg up --quiet 0 $ hg up --quiet 0
$ hg up --quiet 2 $ hg up --quiet 2
$ hg debugobsolete bd10386d478cd5a9faf2e604114c8e6da62d3889 $ hg debugobsolete bd10386d478cd5a9faf2e604114c8e6da62d3889
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets obsoleted 1 changesets
$ hg up
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Test experimental revset support
$ hg log -r '_destupdate()' $ hg log -r '_destupdate()'
2:bd10386d478c 2 (no-eol) 1:0786582aa4b1 1 (no-eol)
$ hg up
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Test that boolean flags allow --no-flag specification to override [defaults] Test that boolean flags allow --no-flag specification to override [defaults]
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [defaults] > [defaults]
> update = --check > update = --check
> EOF > EOF
$ hg co 2 $ hg co 1
abort: uncommitted changes abort: uncommitted changes
[20] [20]
$ hg co --no-check 2 $ hg co --no-check 1
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved