( )⚙ D12097 branchmap: skip obsolete revisions while computing heads

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12097

branchmap: skip obsolete revisions while computing heads
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGf8f2ecdde4b5: branchmap: skip obsolete revisions while computing heads
Summary

It's time to make this part of core Mercurial obsolescence-aware.

Not considering obsolete revisions when computing heads is clearly what
Mercurial should do. But there are a couple of small issues:

  • Let's say tip of the repo is obsolete. There are two ways of finding tiprev for branchcache (both are in use): looking at input data for update() and looking at computed heads after update(). Previously, repo tip would be tiprev of the branchcache. With this patch, an obsolete revision can no longer be tiprev. And depending on what way we use for finding tiprev (input data vs computed heads) we'll get a different result. This is relevant when recomputing cache key from cache contents, and may lead to updating cache for obsolete revisions multiple times (not from scratch, because it still would be considered valid for a subset of revisions in the repo).
  • If all commits on a branch are obsolete, the branchcache will include that branch, but the list of heads will be empty (that's why there's now if not heads when recomputing tiprev/tipnode from cache contents). Having an entry for every branch is currently required for notify extension (and test-notify.t to pass), because notify doesn't handle revsets in its subscription config very well and will throw an error if e.g. a branch doesn't exist.
  • Cloning static HTTP repos may try to stat() a non-existent obsstore file. The issue is that we now care about obsolescence during clone, but statichttpvfs doesn't implement a stat method, so a regular vfs.stat() is used, and it assumes that file is local and calls os.stat(). During a clone, we're trying to stat() .hg/store/obsstore, but in static HTTP case we provide a literal URL to the obsstore file on the remote as if it were a local file path. On windows it actually results in a failure in test-static-http.t.

The first issue is going to be addressed in a series dedicated to making sure
branchcache is properly and timely written on disk (it wasn't perfect even
before this patch, but there aren't enough tests to demonstrate that). The
second issue will be addressed in a future patch for notify extension that will
make it not raise an exception if a branch doesn't exist. And the third one was
partially addressed in the previous patch in this series and will be properly
fixed in a future patch when this series is accepted.

filteredhash() grows a keyword argument to make sure that branchcache is also
invalidated when there are new obsolete revisions in its repo view. This way
the on-disk cache format is unchanged and compatible between versions (although
it will obviously be recomputed when switching versions before/after this patch
and the repo has obsolete revisions).

There's one test that uses plain hg up without arguments while updated to a
pruned commit. To make this test pass, simply return current working directory
parent. Later in this series this code will be replaced by what prune command
does: updating to the closest non-obsolete ancestor.

Test changes:

test-branch-change.t: update branch head and cache update message. The head of
default listed in hg heads is changed because revision 2 was rewritten as 7,
and 1 is the closest ancestor on the same branch, so it's the head of default
now.

The cache invalidation message appears now because of the cache hash change,
since we're now accounting for obsolete revisions. Here's some context:

"served.hidden" repo filter means everything is visible (no filtered
revisions), so before this series branch2-served.hidden file would not contain
any cache hash, only revnum and node. Now it also has a hash when there are
obsolete changesets in the repo. The command that the message appears for is
changing branch of 5 and 6, which are now obsolete, so the cache hash changes.

In general, when cache is simply out-of-date, it can be updated using the old
version as a base. But if cache hash differs, then the cache for that
particular repo filter is recomputed (at least with the current
implementation). This is what happens here.

test-obsmarker-template.t: the pull reports 2 heads changed, but after that the
repo correctly sees only 1. The new message could be better, but it's still an
improvement over the previous one where hg pull suggested merging with an
obsolete revision.

test-obsolete.t: we can see these revisions in hg log --hidden, but they
shouldn't be considered heads even with --hidden.

test-rebase-obsolete{,2}.t: there were new heads created previously after
making new orphan changesets, but they weren't detected. Now we are properly
detecting and reporting them.

test-rebase-obsolete4.t: there's only one head now because the other head is
pruned and was falsely reported before.

test-static-http.t: add obsstore to the list of requested files. This file
doesn't exist on the remotes, but clients want it anyway (they get 404). This
is fine, because there are other nonexistent files that clients request, like
.hg/bookmarks or .hg/cache/tags2-served.

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:38 PM
marmoute added a subscriber: marmoute.Jan 31 2022, 11:51 AM

This patches looks good overall, but I would like to seems a couple of comment expanded for clarity.

mercurial/branchmap.py
360–363

Small nit: we should probably split this four-liner into individual statement.

542

handle it is a bit vague. What about:

We ignored this obsolete changeset earlier, but now that it has non-ignored children, we need to make sure its ancestors are not considered heads. So we mark it for the same post-processing we use for parent in other branches.

mercurial/scmutil.py
362

maybe clarify that we are talking of all filtered and obsolete revision that are ≤ to maxrev ?

369

The use of frozenset on the obsolete set here is unfortunate. As mean a significant computation just to validate the inner cache key.

Please add a comment about this.

I am not sur why the obsrevs are not a frozenset already so we should look into that (outside of this series).

av6 added a parent revision: D12100: obsolete: make sure windows tests pass when stat() is given a URL.Feb 3 2022, 6:57 AM
av6 edited the summary of this revision. (Show Details)
av6 updated this revision to Diff 32038.
av6 added inline comments.Feb 3 2022, 7:02 AM
mercurial/branchmap.py
360–363

Yeah, I added this todo item to my follow-up list, because I'd like to update the docstring as well.

mercurial/scmutil.py
369

I'll send a follow-up to make obsolete.getrevs() always return frozensets when this series lands.

Alphare accepted this revision.Feb 3 2022, 11:23 AM
This revision is now accepted and ready to land.Feb 3 2022, 11:23 AM
av6 added a commit: rHGf8f2ecdde4b5: branchmap: skip obsolete revisions while computing heads.Feb 3 2022, 11:51 AM
Closed by commit rHGf8f2ecdde4b5: branchmap: skip obsolete revisions while computing heads (authored by av6). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 32045

mercurial/branchmap.py

from .node import ( from .node import (
bin, bin,
hex, hex,
nullrev, nullrev,
) )
from . import ( from . import (
encoding, encoding,
error, error,
obsolete,
pycompat, pycompat,
scmutil, scmutil,
util, util,
) )
from .utils import ( from .utils import (
repoviewutil, repoviewutil,
stringutil, stringutil,
) )
<tip hex node> <tip rev number> [optional filtered repo hex hash] <tip hex node> <tip rev number> [optional filtered repo hex hash]
<branch head hex node> <open/closed state> <branch name> <branch head hex node> <open/closed state> <branch name>
<branch head hex node> <open/closed state> <branch name> <branch head hex node> <open/closed state> <branch name>
... ...
The first line is used to check if the cache is still valid. If the The first line is used to check if the cache is still valid. If the
branch cache is for a filtered repo view, an optional third hash is branch cache is for a filtered repo view, an optional third hash is
included that hashes the hashes of all filtered revisions. included that hashes the hashes of all filtered and obsolete revisions.
The open/closed state is represented by a single letter 'o' or 'c'. The open/closed state is represented by a single letter 'o' or 'c'.
This field can be used to avoid changelog reads when determining if a This field can be used to avoid changelog reads when determining if a
branch head closes a branch or not. branch head closes a branch or not.
""" """
def __init__( def __init__(
self, self,
return filename return filename
def validfor(self, repo): def validfor(self, repo):
"""Is the cache content valid regarding a repo """Is the cache content valid regarding a repo
- False when cached tipnode is unknown or if we detect a strip. - False when cached tipnode is unknown or if we detect a strip.
- True when cache is up to date or a subset of current repo.""" - True when cache is up to date or a subset of current repo."""
try: try:
return (self.tipnode == repo.changelog.node(self.tiprev)) and ( return (self.tipnode == repo.changelog.node(self.tiprev)) and (
self.filteredhash == scmutil.filteredhash(repo, self.tiprev) self.filteredhash
== scmutil.filteredhash(repo, self.tiprev, needobsolete=True)
) )
marmouteUnsubmitted
Not Done

Small nit: we should probably split this four-liner into individual statement.

marmoute: Small nit: we should probably split this four-liner into individual statement.
av6AuthorUnsubmitted
Done

Yeah, I added this todo item to my follow-up list, because I'd like to update the docstring as well.

av6: Yeah, I added this todo item to my follow-up list, because I'd like to update the docstring as…
except IndexError: except IndexError:
return False return False
def _branchtip(self, heads): def _branchtip(self, heads):
"""Return tuple with last open head in heads and false, """Return tuple with last open head in heads and false,
otherwise return last closed head and true.""" otherwise return last closed head and true."""
tip = heads[-1] tip = heads[-1]
closed = True closed = True
# Delay fetching the topological heads until they are needed. # Delay fetching the topological heads until they are needed.
# A repository without non-continous branches can skip this part. # A repository without non-continous branches can skip this part.
topoheads = None topoheads = None
# If a changeset is visible, its parents must be visible too, so # If a changeset is visible, its parents must be visible too, so
# use the faster unfiltered parent accessor. # use the faster unfiltered parent accessor.
parentrevs = repo.unfiltered().changelog.parentrevs parentrevs = repo.unfiltered().changelog.parentrevs
# Faster than using ctx.obsolete()
obsrevs = obsolete.getrevs(repo, b'obsolete')
for branch, newheadrevs in pycompat.iteritems(newbranches): for branch, newheadrevs in pycompat.iteritems(newbranches):
# For every branch, compute the new branchheads. # For every branch, compute the new branchheads.
# A branchhead is a revision such that no descendant is on # A branchhead is a revision such that no descendant is on
# the same branch. # the same branch.
# #
# The branchheads are computed iteratively in revision order. # The branchheads are computed iteratively in revision order.
# This ensures topological order, i.e. parents are processed # This ensures topological order, i.e. parents are processed
# before their children. Ancestors are inclusive here, i.e. # before their children. Ancestors are inclusive here, i.e.
# topological heads, they can't have descendants and further # topological heads, they can't have descendants and further
# checks can be skipped. Otherwise, the ancestors of the # checks can be skipped. Otherwise, the ancestors of the
# "uncertain" set are removed from branchheads. # "uncertain" set are removed from branchheads.
# This computation is heavy and avoided if at all possible. # This computation is heavy and avoided if at all possible.
bheads = self._entries.setdefault(branch, []) bheads = self._entries.setdefault(branch, [])
bheadset = {cl.rev(node) for node in bheads} bheadset = {cl.rev(node) for node in bheads}
uncertain = set() uncertain = set()
for newrev in sorted(newheadrevs): for newrev in sorted(newheadrevs):
if newrev in obsrevs:
# We ignore obsolete changesets as they shouldn't be
# considered heads.
continue
if not bheadset: if not bheadset:
bheadset.add(newrev) bheadset.add(newrev)
continue continue
parents = [p for p in parentrevs(newrev) if p != nullrev] parents = [p for p in parentrevs(newrev) if p != nullrev]
samebranch = set() samebranch = set()
otherbranch = set() otherbranch = set()
obsparents = set()
for p in parents: for p in parents:
if p in bheadset or getbranchinfo(p)[0] == branch: if p in obsrevs:
# We ignored this obsolete changeset earlier, but now
# that it has non-ignored children, we need to make
marmouteUnsubmitted
Not Done

handle it is a bit vague. What about:

We ignored this obsolete changeset earlier, but now that it has non-ignored children, we need to make sure its ancestors are not considered heads. So we mark it for the same post-processing we use for parent in other branches.

marmoute: `handle it` is a bit vague. What about: We ignored this obsolete changeset earlier, but now…
# sure their ancestors are not considered heads. To
# achieve that, we will simply treat this obsolete
# changeset as a parent from other branch.
obsparents.add(p)
elif p in bheadset or getbranchinfo(p)[0] == branch:
samebranch.add(p) samebranch.add(p)
else: else:
otherbranch.add(p) otherbranch.add(p)
if otherbranch and not (len(bheadset) == len(samebranch) == 1): if not (len(bheadset) == len(samebranch) == 1):
uncertain.update(otherbranch) uncertain.update(otherbranch)
uncertain.update(obsparents)
bheadset.difference_update(samebranch) bheadset.difference_update(samebranch)
bheadset.add(newrev) bheadset.add(newrev)
if uncertain: if uncertain:
if topoheads is None: if topoheads is None:
topoheads = set(cl.headrevs()) topoheads = set(cl.headrevs())
if bheadset - topoheads: if bheadset - topoheads:
floorrev = min(bheadset) floorrev = min(bheadset)
ancestors = set(cl.ancestors(newheadrevs, floorrev)) if floorrev <= max(uncertain):
ancestors = set(cl.ancestors(uncertain, floorrev))
bheadset -= ancestors bheadset -= ancestors
bheadrevs = sorted(bheadset) bheadrevs = sorted(bheadset)
self[branch] = [cl.node(rev) for rev in bheadrevs] self[branch] = [cl.node(rev) for rev in bheadrevs]
tiprev = bheadrevs[-1] tiprev = max(newheadrevs)
if tiprev > ntiprev: if tiprev > ntiprev:
ntiprev = tiprev ntiprev = tiprev
if ntiprev > self.tiprev: if ntiprev > self.tiprev:
self.tiprev = ntiprev self.tiprev = ntiprev
self.tipnode = cl.node(ntiprev) self.tipnode = cl.node(ntiprev)
if not self.validfor(repo): if not self.validfor(repo):
# cache key are not valid anymore # old cache key is now invalid for the repo, but we've just updated
# the cache and we assume it's valid, so let's make the cache key
# valid as well by recomputing it from the cached data
self.tipnode = repo.nullid self.tipnode = repo.nullid
self.tiprev = nullrev self.tiprev = nullrev
for heads in self.iterheads(): for heads in self.iterheads():
if not heads:
# all revisions on a branch are obsolete
continue
# note: tiprev is not necessarily the tip revision of repo,
# because the tip could be obsolete (i.e. not a head)
tiprev = max(cl.rev(node) for node in heads) tiprev = max(cl.rev(node) for node in heads)
if tiprev > self.tiprev: if tiprev > self.tiprev:
self.tipnode = cl.node(tiprev) self.tipnode = cl.node(tiprev)
self.tiprev = tiprev self.tiprev = tiprev
self.filteredhash = scmutil.filteredhash(repo, self.tiprev) self.filteredhash = scmutil.filteredhash(
repo, self.tiprev, needobsolete=True
)
duration = util.timer() - starttime duration = util.timer() - starttime
repo.ui.log( repo.ui.log(
b'branchcache', b'branchcache',
b'updated %s in %.4f seconds\n', b'updated %s in %.4f seconds\n',
_branchcachedesc(repo), _branchcachedesc(repo),
duration, duration,
) )

mercurial/destutil.py

# 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): if bookmarks.isactivewdirparent(repo):
movemark = repo[b'.'].node() movemark = repo[b'.'].node()
else:
# TODO: copy hg prune logic
node = 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)

mercurial/scmutil.py

msg = _(b'possible case-folding collision for %s') % f msg = _(b'possible case-folding collision for %s') % f
if self._abort: if self._abort:
raise error.StateError(msg) raise error.StateError(msg)
self._ui.warn(_(b"warning: %s\n") % msg) self._ui.warn(_(b"warning: %s\n") % msg)
self._loweredfiles.add(fl) self._loweredfiles.add(fl)
self._newfiles.add(f) self._newfiles.add(f)
def filteredhash(repo, maxrev): def filteredhash(repo, maxrev, needobsolete=False):
"""build hash of filtered revisions in the current repoview. """build hash of filtered revisions in the current repoview.
Multiple caches perform up-to-date validation by checking that the Multiple caches perform up-to-date validation by checking that the
tiprev and tipnode stored in the cache file match the current repository. tiprev and tipnode stored in the cache file match the current repository.
However, this is not sufficient for validating repoviews because the set However, this is not sufficient for validating repoviews because the set
of revisions in the view may change without the repository tiprev and of revisions in the view may change without the repository tiprev and
tipnode changing. tipnode changing.
This function hashes all the revs filtered from the view and returns This function hashes all the revs filtered from the view (and, optionally,
that SHA-1 digest. all obsolete revs) up to maxrev and returns that SHA-1 digest.
marmouteUnsubmitted
Not Done

maybe clarify that we are talking of all filtered and obsolete revision that are ≤ to maxrev ?

marmoute: maybe clarify that we are talking of all filtered and obsolete revision that are ≤ to maxrev ?
""" """
cl = repo.changelog cl = repo.changelog
if needobsolete:
obsrevs = obsolete.getrevs(repo, b'obsolete')
if not cl.filteredrevs and not obsrevs:
return None
# TODO: obsrevs should be a frozenset, but right now obsolete.getrevs()
marmouteUnsubmitted
Not Done

The use of frozenset on the obsolete set here is unfortunate. As mean a significant computation just to validate the inner cache key.

Please add a comment about this.

I am not sur why the obsrevs are not a frozenset already so we should look into that (outside of this series).

marmoute: The use of `frozenset` on the obsolete set here is unfortunate. As mean a significant…
av6AuthorUnsubmitted
Done

I'll send a follow-up to make obsolete.getrevs() always return frozensets when this series lands.

av6: I'll send a follow-up to make obsolete.getrevs() always return frozensets when this series…
# may return a set, which is not a hashable type.
key = (maxrev, hash(cl.filteredrevs), hash(frozenset(obsrevs)))
else:
if not cl.filteredrevs: if not cl.filteredrevs:
return None return None
key = cl._filteredrevs_hashcache.get(maxrev) key = maxrev
if not key: obsrevs = frozenset()
revs = sorted(r for r in cl.filteredrevs if r <= maxrev)
result = cl._filteredrevs_hashcache.get(key)
if not result:
revs = sorted(r for r in cl.filteredrevs | obsrevs if r <= maxrev)
if revs: if revs:
s = hashutil.sha1() s = hashutil.sha1()
for rev in revs: for rev in revs:
s.update(b'%d;' % rev) s.update(b'%d;' % rev)
key = s.digest() result = s.digest()
cl._filteredrevs_hashcache[maxrev] = key cl._filteredrevs_hashcache[key] = result
return key return result
def walkrepos(path, followsym=False, seen_dirs=None, recurse=False): def walkrepos(path, followsym=False, seen_dirs=None, recurse=False):
"""yield every hg repository under path, always recursively. """yield every hg repository under path, always recursively.
The recurse flag will only control recursion into repo working dirs""" The recurse flag will only control recursion into repo working dirs"""
def errhandler(err): def errhandler(err):
if err.filename == path: if err.filename == path:

tests/test-branch-change.t

moving bookmarks ['b1'] from 7c19914648869f5b02fc7fed31ddee9783fdd680 to de1404b45a69f8cc6437d7679033ee33e9efb4ba moving bookmarks ['b1'] from 7c19914648869f5b02fc7fed31ddee9783fdd680 to de1404b45a69f8cc6437d7679033ee33e9efb4ba
resolving manifests resolving manifests
branchmerge: False, force: False, partial: False branchmerge: False, force: False, partial: False
ancestor: 7c1991464886, local: 7c1991464886+, remote: de1404b45a69 ancestor: 7c1991464886, local: 7c1991464886+, remote: de1404b45a69
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
changed branch on 2 changesets changed branch on 2 changesets
updating the branch cache updating the branch cache
invalid branch cache (served): tip differs invalid branch cache (served): tip differs
invalid branch cache (served.hidden): tip differs
$ hg glog -r '(.^)::' $ hg glog -r '(.^)::'
@ 9:de1404b45a69 Added e @ 9:de1404b45a69 Added e
| wat (b1) | wat (b1)
* 8:343660ccab74 Added d * 8:343660ccab74 Added d
| wat () | wat ()
~ ~
changed branch on 1 changesets changed branch on 1 changesets
$ hg phase -r . $ hg phase -r .
11: secret 11: secret
$ hg branches $ hg branches
secret 11:38a9b2d53f98 secret 11:38a9b2d53f98
foo 7:8a4729a5e2b8 foo 7:8a4729a5e2b8
wat 9:de1404b45a69 (inactive) wat 9:de1404b45a69 (inactive)
default 2:28ad74487de9 (inactive) default 1:29becc82797a (inactive)
$ hg branch $ hg branch
secret secret
Changing branch of another head, different from one on which we are Changing branch of another head, different from one on which we are
$ hg glog $ hg glog
@ 11:38a9b2d53f98 added bar @ 11:38a9b2d53f98 added bar
| secret (b1) | secret (b1)

tests/test-obsmarker-template.t

searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads) added 1 changesets with 0 changes to 1 files (+1 heads)
2 new obsolescence markers 2 new obsolescence markers
obsoleted 1 changesets obsoleted 1 changesets
new changesets 7a230b46bf61 (1 drafts) new changesets 7a230b46bf61 (1 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads)
$ hg log --hidden -G $ hg log --hidden -G
o changeset: 2:7a230b46bf61 o changeset: 2:7a230b46bf61
| tag: tip | tag: tip
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: A2 | summary: A2
| |

tests/test-obsolete.t

check that heads does not report them check that heads does not report them
$ hg heads $ hg heads
5:5601fb93a350 (draft) [tip ] add new_3_c 5:5601fb93a350 (draft) [tip ] add new_3_c
$ hg heads --hidden $ hg heads --hidden
5:5601fb93a350 (draft) [tip ] add new_3_c 5:5601fb93a350 (draft) [tip ] add new_3_c
4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350]
3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9]
2:245bde4270cd (draft *obsolete*) [ ] add original_c [rewritten as 3:cdbce2fbb163]
check that summary does not report them check that summary does not report them
$ hg init ../sink $ hg init ../sink
$ echo '[paths]' >> .hg/hgrc $ echo '[paths]' >> .hg/hgrc
$ echo 'default=../sink' >> .hg/hgrc $ echo 'default=../sink' >> .hg/hgrc
$ hg summary --remote $ hg summary --remote
parent: 5:5601fb93a350 tip parent: 5:5601fb93a350 tip
add new_3_c add new_3_c
branch: default branch: default
commit: (clean) commit: (clean)
update: (current) update: (current)
phases: 3 draft phases: 3 draft
remote: 3 outgoing remote: 3 outgoing
$ hg summary --remote --hidden $ hg summary --remote --hidden
parent: 5:5601fb93a350 tip parent: 5:5601fb93a350 tip
add new_3_c add new_3_c
branch: default branch: default
commit: (clean) commit: (clean)
update: 3 new changesets, 4 branch heads (merge) update: (current)
phases: 6 draft phases: 6 draft
remote: 3 outgoing remote: 3 outgoing
check that various commands work well with filtering check that various commands work well with filtering
$ hg tip $ hg tip
5:5601fb93a350 (draft) [tip ] add new_3_c 5:5601fb93a350 (draft) [tip ] add new_3_c
$ hg log -r 6 $ hg log -r 6

tests/test-rebase-obsolete.t

$ hg up --hidden 9 $ hg up --hidden 9
3 files updated, 0 files merged, 1 files removed, 0 files unresolved 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to hidden changeset 4bde274eefcf updated to hidden changeset 4bde274eefcf
(hidden revision '4bde274eefcf' was rewritten as: acd174b7ab39) (hidden revision '4bde274eefcf' was rewritten as: acd174b7ab39)
$ echo J > J $ echo J > J
$ hg add J $ hg add J
$ hg commit -m J $ hg commit -m J
1 new orphan changesets 1 new orphan changesets
created new head
$ hg debugobsolete `hg log --rev . -T '{node}'` $ hg debugobsolete `hg log --rev . -T '{node}'`
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets obsoleted 1 changesets
$ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off
rebasing 9:4bde274eefcf "I" rebasing 9:4bde274eefcf "I"
rebasing 13:06edfc82198f tip "J" rebasing 13:06edfc82198f tip "J"
2 new content-divergent changesets 2 new content-divergent changesets

tests/test-rebase-obsolete2.t

$ hg up --hidden 'desc(B0)' $ hg up --hidden 'desc(B0)'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset a8b11f55fb19 updated to hidden changeset a8b11f55fb19
(hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290) (hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290)
$ echo C > C $ echo C > C
$ hg add C $ hg add C
$ hg commit -m C $ hg commit -m C
1 new orphan changesets 1 new orphan changesets
created new head
$ hg log -G $ hg log -G
@ 4:212cb178bcbb C @ 4:212cb178bcbb C
| |
| o 3:261e70097290 B2 | o 3:261e70097290 B2
| | | |
x | 1:a8b11f55fb19 B0 (rewritten using amend as 3:261e70097290) x | 1:a8b11f55fb19 B0 (rewritten using amend as 3:261e70097290)
|/ |/
o 0:4a2df7238c3b A o 0:4a2df7238c3b A
$ hg up --hidden 'desc(B0)' $ hg up --hidden 'desc(B0)'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to hidden changeset a8b11f55fb19 updated to hidden changeset a8b11f55fb19
(hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290) (hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290)
$ echo D > D $ echo D > D
$ hg add D $ hg add D
$ hg commit -m D $ hg commit -m D
1 new orphan changesets 1 new orphan changesets
created new head
$ hg --hidden strip -r 'desc(B1)' $ hg --hidden strip -r 'desc(B1)'
saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg
1 new orphan changesets 1 new orphan changesets
$ hg log -G $ hg log -G
@ 5:1a79b7535141 D @ 5:1a79b7535141 D
| |
| o 4:ff2c4d47b71d C | o 4:ff2c4d47b71d C
| | | |
$ hg up 10 --hidden $ hg up 10 --hidden
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to hidden changeset 121d9e3bc4c6 updated to hidden changeset 121d9e3bc4c6
(hidden revision '121d9e3bc4c6' was rewritten as: 77d874d096a2) (hidden revision '121d9e3bc4c6' was rewritten as: 77d874d096a2)
$ echo "bar" > foo $ echo "bar" > foo
$ hg add foo $ hg add foo
$ hg commit -m "bar foo" $ hg commit -m "bar foo"
1 new orphan changesets 1 new orphan changesets
created new head
$ hg log -G $ hg log -G
@ 14:73568ab6879d bar foo @ 14:73568ab6879d bar foo
| |
| o 13:77d874d096a2 10' | o 13:77d874d096a2 10'
| | | |
| | o 12:3eb461388009 john doe | | o 12:3eb461388009 john doe
| |/ | |/
x | 10:121d9e3bc4c6 P (rewritten using amend as 13:77d874d096a2) x | 10:121d9e3bc4c6 P (rewritten using amend as 13:77d874d096a2)

tests/test-rebase-obsolete4.t

|/ |/
o 0:426bada5c675 A o 0:426bada5c675 A
$ hg summary $ hg summary
parent: 2:b18e25de2cf5 tip parent: 2:b18e25de2cf5 tip
D D
branch: default branch: default
commit: 1 modified, 1 added, 1 unknown, 1 unresolved commit: 1 modified, 1 added, 1 unknown, 1 unresolved
update: 1 new changesets, 2 branch heads (merge) update: (current)
phases: 3 draft phases: 3 draft
rebase: 0 rebased, 2 remaining (rebase --continue) rebase: 0 rebased, 2 remaining (rebase --continue)
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
Also test --continue for the above case Also test --continue for the above case

tests/test-static-http.t

/remote-with-names/.hg/dirstate /remote-with-names/.hg/dirstate
/remote-with-names/.hg/localtags /remote-with-names/.hg/localtags
/remote-with-names/.hg/requires /remote-with-names/.hg/requires
/remote-with-names/.hg/store/00changelog.i /remote-with-names/.hg/store/00changelog.i
/remote-with-names/.hg/store/00manifest.i /remote-with-names/.hg/store/00manifest.i
/remote-with-names/.hg/store/data/%7E2ehgtags.i (no-py37 !) /remote-with-names/.hg/store/data/%7E2ehgtags.i (no-py37 !)
/remote-with-names/.hg/store/data/foo.i /remote-with-names/.hg/store/data/foo.i
/remote-with-names/.hg/store/data/~2ehgtags.i (py37 !) /remote-with-names/.hg/store/data/~2ehgtags.i (py37 !)
/remote-with-names/.hg/store/obsstore
/remote-with-names/.hg/store/requires /remote-with-names/.hg/store/requires
/remote/.hg/bookmarks /remote/.hg/bookmarks
/remote/.hg/bookmarks.current /remote/.hg/bookmarks.current
/remote/.hg/cache/branch2-base /remote/.hg/cache/branch2-base
/remote/.hg/cache/branch2-immutable /remote/.hg/cache/branch2-immutable
/remote/.hg/cache/branch2-served /remote/.hg/cache/branch2-served
/remote/.hg/cache/hgtagsfnodes1 /remote/.hg/cache/hgtagsfnodes1
/remote/.hg/cache/rbc-names-v1 /remote/.hg/cache/rbc-names-v1
/remote/.hg/cache/tags2-served /remote/.hg/cache/tags2-served
/remote/.hg/dirstate /remote/.hg/dirstate
/remote/.hg/localtags /remote/.hg/localtags
/remote/.hg/requires /remote/.hg/requires
/remote/.hg/store/00changelog.i /remote/.hg/store/00changelog.i
/remote/.hg/store/00manifest.i /remote/.hg/store/00manifest.i
/remote/.hg/store/data/%7E2edotfile%20with%20spaces.i (no-py37 !) /remote/.hg/store/data/%7E2edotfile%20with%20spaces.i (no-py37 !)
/remote/.hg/store/data/%7E2ehgtags.i (no-py37 !) /remote/.hg/store/data/%7E2ehgtags.i (no-py37 !)
/remote/.hg/store/data/bar.i /remote/.hg/store/data/bar.i
/remote/.hg/store/data/quux.i /remote/.hg/store/data/quux.i
/remote/.hg/store/data/~2edotfile%20with%20spaces.i (py37 !) /remote/.hg/store/data/~2edotfile%20with%20spaces.i (py37 !)
/remote/.hg/store/data/~2ehgtags.i (py37 !) /remote/.hg/store/data/~2ehgtags.i (py37 !)
/remote/.hg/store/obsstore
/remote/.hg/store/requires /remote/.hg/store/requires
/remotempty/.hg/bookmarks /remotempty/.hg/bookmarks
/remotempty/.hg/bookmarks.current /remotempty/.hg/bookmarks.current
/remotempty/.hg/dirstate /remotempty/.hg/dirstate
/remotempty/.hg/requires /remotempty/.hg/requires
/remotempty/.hg/store/00changelog.i /remotempty/.hg/store/00changelog.i
/remotempty/.hg/store/00manifest.i /remotempty/.hg/store/00manifest.i
/remotempty/.hg/store/requires /remotempty/.hg/store/requires