Mercurial > public > mercurial-scm > hg-stable
view mercurial/destutil.py @ 48701:f8f2ecdde4b5
branchmap: skip obsolete revisions while computing heads
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.
Differential Revision: https://phab.mercurial-scm.org/D12097
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Fri, 07 Jan 2022 11:53:23 +0300 |
parents | d4ba4d51f85f |
children | fbf7e383e961 |
line wrap: on
line source
# destutil.py - Mercurial utility function for command destination # # Copyright Olivia Mackall <olivia@selenic.com> and other # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. from __future__ import absolute_import from .i18n import _ from . import bookmarks, error, obsutil, scmutil, stack def orphanpossibledestination(repo, rev): """Return all changesets that may be a new parent for orphan `rev`. This function works fine on non-orphan revisions, it's just silly because there's no destination implied by obsolete markers, so it'll return nothing. """ tonode = repo.changelog.node parents = repo.changelog.parentrevs torev = repo.changelog.rev dest = set() tovisit = list(parents(rev)) while tovisit: r = tovisit.pop() succsets = obsutil.successorssets(repo, tonode(r)) if not succsets: # if there are no successors for r, r was probably pruned # and we should walk up to r's parents to try and find # some successors. tovisit.extend(parents(r)) else: # We should probably pick only one destination from split # (case where '1 < len(ss)'), This could be the currently # tipmost, but the correct result is less clear when # results of the split have been moved such that they # reside on multiple branches. for ss in succsets: for n in ss: dr = torev(n) if dr != -1: dest.add(dr) return dest def _destupdateobs(repo, clean): """decide of an update destination from obsolescence markers""" node = None wc = repo[None] p1 = wc.p1() movemark = None if p1.obsolete() and not p1.children(): # allow updating to successors successors = obsutil.successorssets(repo, p1.node()) # behavior of certain cases is as follows, # # divergent changesets: update to highest rev, similar to what # is currently done when there are more than one head # (i.e. 'tip') # # 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' if successors: # flatten the list here handles both divergent (len > 1) # and the usual case (len = 1) successors = [n for sub in successors for n in sub] # 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() return node, movemark, None def _destupdatebook(repo, clean): """decide on an update destination from active bookmark""" # we also move the active bookmark, if any node = None activemark, movemark = bookmarks.calculateupdate(repo.ui, repo) if activemark is not None: node = repo._bookmarks[activemark] return node, movemark, activemark def _destupdatebranch(repo, clean): """decide on an update destination from current branch This ignores closed branch heads. """ wc = repo[None] movemark = node = None currentbranch = wc.branch() if clean: currentbranch = repo[b'.'].branch() if currentbranch in repo.branchmap(): heads = repo.branchheads(currentbranch) if heads: node = repo.revs(b'max(.::(%ln))', heads).first() if bookmarks.isactivewdirparent(repo): movemark = repo[b'.'].node() elif currentbranch == b'default' and not wc.p1(): # "null" parent belongs to "default" branch, but it doesn't exist, so # update to the tipmost non-closed branch head node = repo.revs(b'max(head() and not closed())').first() else: node = repo[b'.'].node() return node, movemark, None def _destupdatebranchfallback(repo, clean): """decide on an update destination from closed heads in current branch""" wc = repo[None] currentbranch = wc.branch() movemark = None if currentbranch in repo.branchmap(): # here, all descendant branch heads are closed heads = repo.branchheads(currentbranch, closed=True) assert heads, b"any branch has at least one head" node = repo.revs(b'max(.::(%ln))', heads).first() assert ( node is not None ), b"any revision has at least one descendant branch head" if bookmarks.isactivewdirparent(repo): movemark = repo[b'.'].node() else: # here, no "default" branch, and all branches are closed node = repo.lookup(b'tip') assert node is not None, b"'tip' exists even in empty repository" return node, movemark, None # order in which each step should be evaluated # steps are run until one finds a destination destupdatesteps = [b'evolution', b'bookmark', b'branch', b'branchfallback'] # mapping to ease extension overriding steps. destupdatestepmap = { b'evolution': _destupdateobs, b'bookmark': _destupdatebook, b'branch': _destupdatebranch, b'branchfallback': _destupdatebranchfallback, } def destupdate(repo, clean=False): """destination for bare update operation return (rev, movemark, activemark) - rev: the revision to update to, - movemark: node to move the active bookmark from (cf bookmark.calculate update), - activemark: a bookmark to activate at the end of the update. """ node = movemark = activemark = None for step in destupdatesteps: node, movemark, activemark = destupdatestepmap[step](repo, clean) if node is not None: break rev = repo[node].rev() return rev, movemark, activemark msgdestmerge = { # too many matching divergent bookmark b'toomanybookmarks': { b'merge': ( _( b"multiple matching bookmarks to merge -" b" please merge with an explicit rev or bookmark" ), _(b"run 'hg heads' to see all heads, specify rev with -r"), ), b'rebase': ( _( b"multiple matching bookmarks to rebase -" b" please rebase to an explicit rev or bookmark" ), _(b"run 'hg heads' to see all heads, specify destination with -d"), ), }, # no other matching divergent bookmark b'nootherbookmarks': { b'merge': ( _( b"no matching bookmark to merge - " b"please merge with an explicit rev or bookmark" ), _(b"run 'hg heads' to see all heads, specify rev with -r"), ), b'rebase': ( _( b"no matching bookmark to rebase - " b"please rebase to an explicit rev or bookmark" ), _(b"run 'hg heads' to see all heads, specify destination with -d"), ), }, # branch have too many unbookmarked heads, no obvious destination b'toomanyheads': { b'merge': ( _(b"branch '%s' has %d heads - please merge with an explicit rev"), _(b"run 'hg heads .' to see heads, specify rev with -r"), ), b'rebase': ( _(b"branch '%s' has %d heads - please rebase to an explicit rev"), _(b"run 'hg heads .' to see heads, specify destination with -d"), ), }, # branch have no other unbookmarked heads b'bookmarkedheads': { b'merge': ( _(b"heads are bookmarked - please merge with an explicit rev"), _(b"run 'hg heads' to see all heads, specify rev with -r"), ), b'rebase': ( _(b"heads are bookmarked - please rebase to an explicit rev"), _(b"run 'hg heads' to see all heads, specify destination with -d"), ), }, # branch have just a single heads, but there is other branches b'nootherbranchheads': { b'merge': ( _(b"branch '%s' has one head - please merge with an explicit rev"), _(b"run 'hg heads' to see all heads, specify rev with -r"), ), b'rebase': ( _(b"branch '%s' has one head - please rebase to an explicit rev"), _(b"run 'hg heads' to see all heads, specify destination with -d"), ), }, # repository have a single head b'nootherheads': { b'merge': (_(b'nothing to merge'), None), b'rebase': (_(b'nothing to rebase'), None), }, # repository have a single head and we are not on it b'nootherheadsbehind': { b'merge': (_(b'nothing to merge'), _(b"use 'hg update' instead")), b'rebase': (_(b'nothing to rebase'), _(b"use 'hg update' instead")), }, # We are not on a head b'notatheads': { b'merge': ( _(b'working directory not at a head revision'), _(b"use 'hg update' or merge with an explicit revision"), ), b'rebase': ( _(b'working directory not at a head revision'), _(b"use 'hg update' or rebase to an explicit revision"), ), }, b'emptysourceset': { b'merge': (_(b'source set is empty'), None), b'rebase': (_(b'source set is empty'), None), }, b'multiplebranchessourceset': { b'merge': (_(b'source set is rooted in multiple branches'), None), b'rebase': ( _(b'rebaseset is rooted in multiple named branches'), _(b'specify an explicit destination with --dest'), ), }, } def _destmergebook(repo, action=b'merge', sourceset=None, destspace=None): """find merge destination in the active bookmark case""" node = None bmheads = bookmarks.headsforactive(repo) curhead = repo._bookmarks[repo._activebookmark] if len(bmheads) == 2: if curhead == bmheads[0]: node = bmheads[1] else: node = bmheads[0] elif len(bmheads) > 2: msg, hint = msgdestmerge[b'toomanybookmarks'][action] raise error.ManyMergeDestAbort(msg, hint=hint) elif len(bmheads) <= 1: msg, hint = msgdestmerge[b'nootherbookmarks'][action] raise error.NoMergeDestAbort(msg, hint=hint) assert node is not None return node def _destmergebranch( repo, action=b'merge', sourceset=None, onheadcheck=True, destspace=None ): """find merge destination based on branch heads""" node = None if sourceset is None: sourceset = [repo[repo.dirstate.p1()].rev()] branch = repo.dirstate.branch() elif not sourceset: msg, hint = msgdestmerge[b'emptysourceset'][action] raise error.NoMergeDestAbort(msg, hint=hint) else: branch = None for ctx in repo.set(b'roots(%ld::%ld)', sourceset, sourceset): if branch is not None and ctx.branch() != branch: msg, hint = msgdestmerge[b'multiplebranchessourceset'][action] raise error.ManyMergeDestAbort(msg, hint=hint) branch = ctx.branch() bheads = repo.branchheads(branch) onhead = repo.revs(b'%ld and %ln', sourceset, bheads) if onheadcheck and not onhead: # Case A: working copy if not on a head. (merge only) # # This is probably a user mistake We bailout pointing at 'hg update' if len(repo.heads()) <= 1: msg, hint = msgdestmerge[b'nootherheadsbehind'][action] else: msg, hint = msgdestmerge[b'notatheads'][action] raise error.Abort(msg, hint=hint) # remove heads descendants of source from the set bheads = list(repo.revs(b'%ln - (%ld::)', bheads, sourceset)) # filters out bookmarked heads nbhs = list(repo.revs(b'%ld - bookmark()', bheads)) if destspace is not None: # restrict search space # used in the 'hg pull --rebase' case, see issue 5214. nbhs = list(repo.revs(b'%ld and %ld', destspace, nbhs)) if len(nbhs) > 1: # Case B: There is more than 1 other anonymous heads # # This means that there will be more than 1 candidate. This is # ambiguous. We abort asking the user to pick as explicit destination # instead. msg, hint = msgdestmerge[b'toomanyheads'][action] msg %= (branch, len(bheads) + 1) raise error.ManyMergeDestAbort(msg, hint=hint) elif not nbhs: # Case B: There is no other anonymous heads # # This means that there is no natural candidate to merge with. # We abort, with various messages for various cases. if bheads: msg, hint = msgdestmerge[b'bookmarkedheads'][action] elif len(repo.heads()) > 1: msg, hint = msgdestmerge[b'nootherbranchheads'][action] msg %= branch elif not onhead: # if 'onheadcheck == False' (rebase case), # this was not caught in Case A. msg, hint = msgdestmerge[b'nootherheadsbehind'][action] else: msg, hint = msgdestmerge[b'nootherheads'][action] raise error.NoMergeDestAbort(msg, hint=hint) else: node = nbhs[0] assert node is not None return node def destmerge( repo, action=b'merge', sourceset=None, onheadcheck=True, destspace=None ): """return the default destination for a merge (or raise exception about why it can't pick one) :action: the action being performed, controls emitted error message """ # destspace is here to work around issues with `hg pull --rebase` see # issue5214 for details if repo._activebookmark: node = _destmergebook( repo, action=action, sourceset=sourceset, destspace=destspace ) else: node = _destmergebranch( repo, action=action, sourceset=sourceset, onheadcheck=onheadcheck, destspace=destspace, ) return repo[node].rev() def desthistedit(ui, repo): """Default base revision to edit for `hg histedit`.""" default = ui.config(b'histedit', b'defaultrev') if default is None: revs = stack.getstack(repo) elif default: revs = scmutil.revrange(repo, [default]) else: raise error.ConfigError( _(b"config option histedit.defaultrev can't be empty") ) if revs: # Take the first revision of the revset as the root return revs.min() return None def stackbase(ui, repo): revs = stack.getstack(repo) return revs.first() if revs else None def _statusotherbook(ui, repo): bmheads = bookmarks.headsforactive(repo) curhead = repo._bookmarks[repo._activebookmark] if repo.revs(b'%n and parents()', curhead): # we are on the active bookmark bmheads = [b for b in bmheads if curhead != b] if bmheads: msg = _(b'%i other divergent bookmarks for "%s"\n') ui.status(msg % (len(bmheads), repo._activebookmark)) def _statusotherbranchheads(ui, repo): currentbranch = repo.dirstate.branch() allheads = repo.branchheads(currentbranch, closed=True) heads = repo.branchheads(currentbranch) if repo.revs(b'%ln and parents()', allheads): # we are on a head, even though it might be closed # # on closed otherheads # ========= ========== # o 0 all heads for current branch are closed # N only descendant branch heads are closed # x 0 there is only one non-closed branch head # N there are some non-closed branch heads # ========= ========== otherheads = repo.revs(b'%ln - parents()', heads) if repo[b'.'].closesbranch(): ui.warn( _( b'no open descendant heads on branch "%s", ' b'updating to a closed head\n' ) % currentbranch ) if otherheads: ui.warn( _( b"(committing will reopen the head, " b"use 'hg heads .' to see %i other heads)\n" ) % (len(otherheads)) ) else: ui.warn( _(b'(committing will reopen branch "%s")\n') % currentbranch ) elif otherheads: curhead = repo[b'.'] ui.status( _(b'updated to "%s: %s"\n') % (curhead, curhead.description().split(b'\n')[0]) ) ui.status( _(b'%i other heads for branch "%s"\n') % (len(otherheads), currentbranch) ) def statusotherdests(ui, repo): """Print message about other head""" # XXX we should probably include a hint: # - about what to do # - how to see such heads if repo._activebookmark: _statusotherbook(ui, repo) else: _statusotherbranchheads(ui, repo)