[Updated] D12099: destutil: if wdp is obsolete, update to the closest non-obsolete ancestor
av6 (Anton Shestakov)
phabricator at mercurial-scm.org
Thu Feb 3 16:53:22 UTC 2022
Closed by commit rHGfbf7e383e961: destutil: if wdp is obsolete, update to the closest non-obsolete ancestor (authored by av6).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D12099?vs=31995&id=32047
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D12099/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D12099
AFFECTED FILES
mercurial/destutil.py
tests/test-update-branches.t
CHANGE DETAILS
diff --git a/tests/test-update-branches.t b/tests/test-update-branches.t
--- a/tests/test-update-branches.t
+++ b/tests/test-update-branches.t
@@ -696,9 +696,8 @@
(commit or update --clean to discard changes)
[255]
-Test that we don't crash when updating from a pruned changeset (i.e. has no
-successors). Behavior should probably be that we update to the first
-non-obsolete parent but that will be decided later.
+Test that we update to the closest non-obsolete ancestor when updating from a
+pruned changeset (i.e. that has no successors)
$ hg id --debug -r 2
bd10386d478cd5a9faf2e604114c8e6da62d3889
$ hg up --quiet 0
@@ -706,21 +705,18 @@
$ hg debugobsolete bd10386d478cd5a9faf2e604114c8e6da62d3889
1 new obsolescence markers
obsoleted 1 changesets
+ $ hg log -r '_destupdate()'
+ 1:0786582aa4b1 1 (no-eol)
$ hg up
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-
-Test experimental revset support
-
- $ hg log -r '_destupdate()'
- 2:bd10386d478c 2 (no-eol)
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Test that boolean flags allow --no-flag specification to override [defaults]
$ cat >> $HGRCPATH <<EOF
> [defaults]
> update = --check
> EOF
- $ hg co 2
+ $ hg co 1
abort: uncommitted changes
[20]
- $ hg co --no-check 2
+ $ hg co --no-check 1
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/mercurial/destutil.py b/mercurial/destutil.py
--- a/mercurial/destutil.py
+++ b/mercurial/destutil.py
@@ -65,9 +65,8 @@
# replaced changesets: same as divergent except we know there
# is no conflict
#
- # pruned changeset: no update is done; though, we could
- # consider updating to the first non-obsolete parent,
- # similar to what is current done for 'hg prune'
+ # pruned changeset: update to the closest non-obsolete ancestor,
+ # similar to what 'hg prune' currently does
if successors:
# flatten the list here handles both divergent (len > 1)
@@ -77,11 +76,15 @@
# get the max revision for the given successors set,
# i.e. the 'tip' of a set
node = repo.revs(b'max(%ln)', successors).first()
- if bookmarks.isactivewdirparent(repo):
- movemark = repo[b'.'].node()
else:
- # TODO: copy hg prune logic
- node = repo[b'.'].node()
+ p1 = p1.p1()
+ 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
To: av6, #hg-reviewers, marmoute, Alphare
Cc: marmoute, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220203/bd237295/attachment-0002.html>
More information about the Mercurial-patches
mailing list