discovery: process heads in sorted order

mercurial/discovery.py

@@ -1,339 +1,339 b''
 # discovery.py - protocol changeset discovery functions
 #
 # Copyright 2010 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 from node import nullid, short
 from i18n import _
 import util, setdiscovery, treediscovery, phases, obsolete, bookmarks
 import branchmap
 
 def findcommonincoming(repo, remote, heads=None, force=False):
     """Return a tuple (common, anyincoming, heads) used to identify the common
     subset of nodes between repo and remote.
 
     "common" is a list of (at least) the heads of the common subset.
     "anyincoming" is testable as a boolean indicating if any nodes are missing
       locally. If remote does not support getbundle, this actually is a list of
       roots of the nodes that would be incoming, to be supplied to
       changegroupsubset. No code except for pull should be relying on this fact
       any longer.
     "heads" is either the supplied heads, or else the remote's heads.
 
     If you pass heads and they are all known locally, the response lists just
     these heads in "common" and in "heads".
 
     Please use findcommonoutgoing to compute the set of outgoing nodes to give
     extensions a good hook into outgoing.
     """
 
     if not remote.capable('getbundle'):
         return treediscovery.findcommonincoming(repo, remote, heads, force)
 
     if heads:
         allknown = True
         nm = repo.changelog.nodemap
         for h in heads:
             if nm.get(h) is None:
                 allknown = False
                 break
         if allknown:
             return (heads, False, heads)
 
     res = setdiscovery.findcommonheads(repo.ui, repo, remote,
                                        abortwhenunrelated=not force)
     common, anyinc, srvheads = res
     return (list(common), anyinc, heads or list(srvheads))
 
 class outgoing(object):
     '''Represents the set of nodes present in a local repo but not in a
     (possibly) remote one.
 
     Members:
 
       missing is a list of all nodes present in local but not in remote.
       common is a list of all nodes shared between the two repos.
       excluded is the list of missing changeset that shouldn't be sent remotely.
       missingheads is the list of heads of missing.
       commonheads is the list of heads of common.
 
     The sets are computed on demand from the heads, unless provided upfront
     by discovery.'''
 
     def __init__(self, revlog, commonheads, missingheads):
         self.commonheads = commonheads
         self.missingheads = missingheads
         self._revlog = revlog
         self._common = None
         self._missing = None
         self.excluded = []
 
     def _computecommonmissing(self):
         sets = self._revlog.findcommonmissing(self.commonheads,
                                               self.missingheads)
         self._common, self._missing = sets
 
     @util.propertycache
     def common(self):
         if self._common is None:
             self._computecommonmissing()
         return self._common
 
     @util.propertycache
     def missing(self):
         if self._missing is None:
             self._computecommonmissing()
         return self._missing
 
 def findcommonoutgoing(repo, other, onlyheads=None, force=False,
                        commoninc=None, portable=False):
     '''Return an outgoing instance to identify the nodes present in repo but
     not in other.
 
     If onlyheads is given, only nodes ancestral to nodes in onlyheads
     (inclusive) are included. If you already know the local repo's heads,
     passing them in onlyheads is faster than letting them be recomputed here.
 
     If commoninc is given, it must be the result of a prior call to
     findcommonincoming(repo, other, force) to avoid recomputing it here.
 
     If portable is given, compute more conservative common and missingheads,
     to make bundles created from the instance more portable.'''
     # declare an empty outgoing object to be filled later
     og = outgoing(repo.changelog, None, None)
 
     # get common set if not provided
     if commoninc is None:
         commoninc = findcommonincoming(repo, other, force=force)
     og.commonheads, _any, _hds = commoninc
 
     # compute outgoing
     mayexclude = (repo._phasecache.phaseroots[phases.secret] or repo.obsstore)
     if not mayexclude:
         og.missingheads = onlyheads or repo.heads()
     elif onlyheads is None:
         # use visible heads as it should be cached
         og.missingheads = repo.filtered("unserved").heads()
         og.excluded = [ctx.node() for ctx in repo.set('secret() or extinct()')]
     else:
         # compute common, missing and exclude secret stuff
         sets = repo.changelog.findcommonmissing(og.commonheads, onlyheads)
         og._common, allmissing = sets
         og._missing = missing = []
         og.excluded = excluded = []
         for node in allmissing:
             ctx = repo[node]
             if ctx.phase() >= phases.secret or ctx.extinct():
                 excluded.append(node)
             else:
                 missing.append(node)
         if len(missing) == len(allmissing):
             missingheads = onlyheads
         else: # update missing heads
             missingheads = phases.newheads(repo, onlyheads, excluded)
         og.missingheads = missingheads
     if portable:
         # recompute common and missingheads as if -r<rev> had been given for
         # each head of missing, and --base <rev> for each head of the proper
         # ancestors of missing
         og._computecommonmissing()
         cl = repo.changelog
         missingrevs = set(cl.rev(n) for n in og._missing)
         og._common = set(cl.ancestors(missingrevs)) - missingrevs
         commonheads = set(og.commonheads)
         og.missingheads = [h for h in og.missingheads if h not in commonheads]
 
     return og
 
 def _headssummary(repo, remote, outgoing):
     """compute a summary of branch and heads status before and after push
 
     return {'branch': ([remoteheads], [newheads], [unsyncedheads])} mapping
 
     - branch: the branch name
     - remoteheads: the list of remote heads known locally
                    None is the branch is new
     - newheads: the new remote heads (known locally) with outgoing pushed
     - unsyncedheads: the list of remote heads unknown locally.
     """
     cl = repo.changelog
     headssum = {}
     # A. Create set of branches involved in the push.
     branches = set(repo[n].branch() for n in outgoing.missing)
     remotemap = remote.branchmap()
     newbranches = branches - set(remotemap)
     branches.difference_update(newbranches)
 
     # A. register remote heads
     remotebranches = set()
     for branch, heads in remote.branchmap().iteritems():
         remotebranches.add(branch)
         known = []
         unsynced = []
         for h in heads:
             if h in cl.nodemap:
                 known.append(h)
             else:
                 unsynced.append(h)
         headssum[branch] = (known, list(known), unsynced)
     # B. add new branch data
     missingctx = list(repo[n] for n in outgoing.missing)
     touchedbranches = set()
     for ctx in missingctx:
         branch = ctx.branch()
         touchedbranches.add(branch)
         if branch not in headssum:
             headssum[branch] = (None, [], [])
 
     # C drop data about untouched branches:
     for branch in remotebranches - touchedbranches:
         del headssum[branch]
 
     # D. Update newmap with outgoing changes.
     # This will possibly add new heads and remove existing ones.
     newmap = branchmap.branchcache((branch, heads[1])
                                  for branch, heads in headssum.iteritems()
                                  if heads[0] is not None)
     newmap.update(repo, (ctx.rev() for ctx in missingctx))
     for branch, newheads in newmap.iteritems():
         headssum[branch][1][:] = newheads
     return headssum
 
 def _oldheadssummary(repo, remoteheads, outgoing, inc=False):
     """Compute branchmapsummary for repo without branchmap support"""
 
     cl = repo.changelog
     # 1-4b. old servers: Check for new topological heads.
     # Construct {old,new}map with branch = None (topological branch).
     # (code based on update)
     oldheads = set(h for h in remoteheads if h in cl.nodemap)
     # all nodes in outgoing.missing are children of either:
     # - an element of oldheads
     # - another element of outgoing.missing
     # - nullrev
     # This explains why the new head are very simple to compute.
     r = repo.set('heads(%ln + %ln)', oldheads, outgoing.missing)
     newheads = list(c.node() for c in r)
     unsynced = inc and set([None]) or set()
     return {None: (oldheads, newheads, unsynced)}
 
 def checkheads(repo, remote, outgoing, remoteheads, newbranch=False, inc=False):
     """Check that a push won't add any outgoing head
 
     raise Abort error and display ui message as needed.
     """
     # Check for each named branch if we're creating new remote heads.
     # To be a remote head after push, node must be either:
     # - unknown locally
     # - a local outgoing head descended from update
     # - a remote head that's known locally and not
     #   ancestral to an outgoing head
     if remoteheads == [nullid]:
         # remote is empty, nothing to check.
         return
 
     if remote.capable('branchmap'):
         headssum = _headssummary(repo, remote, outgoing)
     else:
         headssum = _oldheadssummary(repo, remoteheads, outgoing, inc)
     newbranches = [branch for branch, heads in headssum.iteritems()
                    if heads[0] is None]
     # 1. Check for new branches on the remote.
     if newbranches and not newbranch:  # new branch requires --new-branch
         branchnames = ', '.join(sorted(newbranches))
         raise util.Abort(_("push creates new remote branches: %s!")
                            % branchnames,
                          hint=_("use 'hg push --new-branch' to create"
                                 " new remote branches"))
 
     # 2 compute newly pushed bookmarks. We
     # we don't warned about bookmarked heads.
     localbookmarks = repo._bookmarks
     remotebookmarks = remote.listkeys('bookmarks')
     bookmarkedheads = set()
     for bm in localbookmarks:
         rnode = remotebookmarks.get(bm)
         if rnode and rnode in repo:
             lctx, rctx = repo[bm], repo[rnode]
             if bookmarks.validdest(repo, rctx, lctx):
                 bookmarkedheads.add(lctx.node())
 
     # 3. Check for new heads.
     # If there are more heads after the push than before, a suitable
     # error message, depending on unsynced status, is displayed.
     error = None
     unsynced = False
     allmissing = set(outgoing.missing)
     allfuturecommon = set(c.node() for c in repo.set('%ld', outgoing.common))
     allfuturecommon.update(allmissing)
-    for branch, heads in headssum.iteritems():
+    for branch, heads in sorted(headssum.iteritems()):
         if heads[0] is None:
             # Maybe we should abort if we push more that one head
             # for new branches ?
             continue
         candidate_newhs = set(heads[1])
         # add unsynced data
         oldhs = set(heads[0])
         oldhs.update(heads[2])
         candidate_newhs.update(heads[2])
         dhs = None
         discardedheads = set()
         if repo.obsstore:
             # remove future heads which are actually obsolete by another
             # pushed element:
             #
             # XXX as above, There are several cases this case does not handle
             # XXX properly
             #
             # (1) if <nh> is public, it won't be affected by obsolete marker
             #     and a new is created
             #
             # (2) if the new heads have ancestors which are not obsolete and
             #     not ancestors of any other heads we will have a new head too.
             #
             # This two case will be easy to handle for know changeset but much
             # more tricky for unsynced changes.
             newhs = set()
             for nh in candidate_newhs:
                 if nh in repo and repo[nh].phase() <= phases.public:
                     newhs.add(nh)
                 else:
                     for suc in obsolete.allsuccessors(repo.obsstore, [nh]):
                         if suc != nh and suc in allfuturecommon:
                             discardedheads.add(nh)
                             break
                     else:
                         newhs.add(nh)
         else:
             newhs = candidate_newhs
         if [h for h in heads[2] if h not in discardedheads]:
             unsynced = True
         if len(newhs) > len(oldhs):
             # strip updates to existing remote heads from the new heads list
-            dhs = list(newhs - bookmarkedheads - oldhs)
+            dhs = sorted(newhs - bookmarkedheads - oldhs)
         if dhs:
             if error is None:
                 if branch not in ('default', None):
                     error = _("push creates new remote head %s "
                               "on branch '%s'!") % (short(dhs[0]), branch)
                 else:
                     error = _("push creates new remote head %s!"
                               ) % short(dhs[0])
                 if heads[2]: # unsynced
                     hint = _("you should pull and merge or "
                              "use push -f to force")
                 else:
                     hint = _("did you forget to merge? "
                              "use push -f to force")
             if branch is not None:
                 repo.ui.note(_("new remote heads on branch '%s'\n") % branch)
             for h in dhs:
                 repo.ui.note(_("new remote head %s\n") % short(h))
     if error:
         raise util.Abort(error, hint=hint)
 
     # 6. Check for unsynced changes on involved branches.
     if unsynced:
         repo.ui.warn(_("note: unsynced remote changes!\n"))

tests/test-push-warn.t

@@ -1,732 +1,732 b''
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "graphlog=" >> $HGRCPATH
 
   $ hg init a
   $ cd a
   $ echo foo > t1
   $ hg add t1
   $ hg commit -m "1"
 
   $ cd ..
   $ hg clone a b
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cd a
   $ echo foo > t2
   $ hg add t2
   $ hg commit -m "2"
 
   $ cd ../b
   $ echo foo > t3
   $ hg add t3
   $ hg commit -m "3"
 
   $ hg push ../a
   pushing to ../a
   searching for changes
   abort: push creates new remote head 1e108cc5548c!
   (you should pull and merge or use push -f to force)
   [255]
 
   $ hg push --debug ../a
   pushing to ../a
   query 1; heads
   searching for changes
   taking quick initial sample
   searching: 2 queries
   query 2; still undecided: 1, sample size is: 1
   2 total queries
   listing keys for "bookmarks"
   new remote heads on branch 'default'
   new remote head 1e108cc5548c
   abort: push creates new remote head 1e108cc5548c!
   (you should pull and merge or use push -f to force)
   [255]
 
   $ hg pull ../a
   pulling from ../a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg push ../a
   pushing to ../a
   searching for changes
   abort: push creates new remote head 1e108cc5548c!
   (did you forget to merge? use push -f to force)
   [255]
 
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg commit -m "4"
   $ hg push ../a
   pushing to ../a
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 1 changes to 1 files
 
   $ cd ..
 
   $ hg init c
   $ cd c
   $ for i in 0 1 2; do
   >     echo $i >> foo
   >     hg ci -Am $i
   > done
   adding foo
   $ cd ..
 
   $ hg clone c d
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cd d
   $ for i in 0 1; do
   >    hg co -C $i
   >    echo d-$i >> foo
   >    hg ci -m d-$i
   > done
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   created new head
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   created new head
 
   $ HGMERGE=true hg merge 3
   merging foo
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg ci -m c-d
 
   $ hg push ../c
   pushing to ../c
   searching for changes
   abort: push creates new remote head 6346d66eb9f5!
   (did you forget to merge? use push -f to force)
   [255]
 
   $ hg push -r 2 ../c
   pushing to ../c
   searching for changes
   no changes found
   [1]
 
   $ hg push -r 3 ../c
   pushing to ../c
   searching for changes
   abort: push creates new remote head a5dda829a167!
   (did you forget to merge? use push -f to force)
   [255]
 
   $ hg push -v -r 3 -r 4 ../c
   pushing to ../c
   searching for changes
   new remote heads on branch 'default'
   new remote head a5dda829a167
   new remote head ee8fbc7a0295
   abort: push creates new remote head a5dda829a167!
   (did you forget to merge? use push -f to force)
   [255]
 
   $ hg push -v -f -r 3 -r 4 ../c
   pushing to ../c
   searching for changes
   2 changesets found
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files (+2 heads)
 
   $ hg push -r 5 ../c
   pushing to ../c
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (-1 heads)
 
   $ hg in ../c
   comparing with ../c
   searching for changes
   no changes found
   [1]
 
 
 Issue450: push -r warns about remote head creation even if no heads
 will be created
 
   $ hg init ../e
   $ hg push -r 0 ../e
   pushing to ../e
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
 
   $ hg push -r 1 ../e
   pushing to ../e
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
 
   $ cd ..
 
 
 Issue736: named branches are not considered for detection of
 unmerged heads in "hg push"
 
   $ hg init f
   $ cd f
   $ hg -q branch a
   $ echo 0 > foo
   $ hg -q ci -Am 0
   $ echo 1 > foo
   $ hg -q ci -m 1
   $ hg -q up 0
   $ echo 2 > foo
   $ hg -q ci -m 2
   $ hg -q up 0
   $ hg -q branch b
   $ echo 3 > foo
   $ hg -q ci -m 3
   $ cd ..
 
   $ hg -q clone f g
   $ cd g
 
 Push on existing branch and new branch:
 
   $ hg -q up 1
   $ echo 4 > foo
   $ hg -q ci -m 4
   $ hg -q up 0
   $ echo 5 > foo
   $ hg -q branch c
   $ hg -q ci -m 5
 
   $ hg push ../f
   pushing to ../f
   searching for changes
   abort: push creates new remote branches: c!
   (use 'hg push --new-branch' to create new remote branches)
   [255]
 
   $ hg push -r 4 -r 5 ../f
   pushing to ../f
   searching for changes
   abort: push creates new remote branches: c!
   (use 'hg push --new-branch' to create new remote branches)
   [255]
 
 
 Multiple new branches:
 
   $ hg -q branch d
   $ echo 6 > foo
   $ hg -q ci -m 6
 
   $ hg push ../f
   pushing to ../f
   searching for changes
   abort: push creates new remote branches: c, d!
   (use 'hg push --new-branch' to create new remote branches)
   [255]
 
   $ hg push -r 4 -r 6 ../f
   pushing to ../f
   searching for changes
   abort: push creates new remote branches: c, d!
   (use 'hg push --new-branch' to create new remote branches)
   [255]
 
   $ cd ../g
 
 
 Fail on multiple head push:
 
   $ hg -q up 1
   $ echo 7 > foo
   $ hg -q ci -m 7
 
   $ hg push -r 4 -r 7 ../f
   pushing to ../f
   searching for changes
   abort: push creates new remote head 0b715ef6ff8f on branch 'a'!
   (did you forget to merge? use push -f to force)
   [255]
 
 Push replacement head on existing branches:
 
   $ hg -q up 3
   $ echo 8 > foo
   $ hg -q ci -m 8
 
   $ hg push -r 7 -r 8 ../f
   pushing to ../f
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files
 
 
 Merge of branch a to other branch b followed by unrelated push
 on branch a:
 
   $ hg -q up 7
   $ HGMERGE=true hg -q merge 8
   $ hg -q ci -m 9
   $ hg -q up 8
   $ echo 10 > foo
   $ hg -q ci -m 10
 
   $ hg push -r 9 ../f
   pushing to ../f
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (-1 heads)
 
   $ hg push -r 10 ../f
   pushing to ../f
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
 
 
 Cheating the counting algorithm:
 
   $ hg -q up 9
   $ HGMERGE=true hg -q merge 2
   $ hg -q ci -m 11
   $ hg -q up 1
   $ echo 12 > foo
   $ hg -q ci -m 12
 
   $ hg push -r 11 -r 12 ../f
   pushing to ../f
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files
 
 
 Failed push of new named branch:
 
   $ echo 12 > foo
   $ hg -q ci -m 12a
   [1]
   $ hg -q up 11
   $ echo 13 > foo
   $ hg -q branch e
   $ hg -q ci -m 13d
 
   $ hg push -r 12 -r 13 ../f
   pushing to ../f
   searching for changes
   abort: push creates new remote branches: e!
   (use 'hg push --new-branch' to create new remote branches)
   [255]
 
 
 Using --new-branch to push new named branch:
 
   $ hg push --new-branch -r 12 -r 13 ../f
   pushing to ../f
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
 
 
 Checking prepush logic does not allow silently pushing
 multiple new heads:
 
   $ cd ..
   $ hg init h
   $ echo init > h/init
   $ hg -R h ci -Am init
   adding init
   $ echo a > h/a
   $ hg -R h ci -Am a
   adding a
   $ hg clone h i
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg -R h up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b > h/b
   $ hg -R h ci -Am b
   adding b
   created new head
   $ hg -R i up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo c > i/c
   $ hg -R i ci -Am c
   adding c
   created new head
 
   $ hg -R i push h
   pushing to h
   searching for changes
   abort: push creates new remote head 97bd0c84d346!
   (you should pull and merge or use push -f to force)
   [255]
 
 
 Check prepush logic with merged branches:
 
   $ hg init j
   $ hg -R j branch a
   marked working directory as branch a
   (branches are permanent and global, did you want a bookmark?)
   $ echo init > j/foo
   $ hg -R j ci -Am init
   adding foo
   $ hg clone j k
   updating to branch a
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo a1 > j/foo
   $ hg -R j ci -m a1
   $ hg -R k branch b
   marked working directory as branch b
   (branches are permanent and global, did you want a bookmark?)
   $ echo b > k/foo
   $ hg -R k ci -m b
   $ hg -R k up 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg -R k merge b
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg -R k ci -m merge
 
   $ hg -R k push -r a j
   pushing to j
   searching for changes
   abort: push creates new remote branches: b!
   (use 'hg push --new-branch' to create new remote branches)
   [255]
 
 
 Prepush -r should not allow you to sneak in new heads:
 
   $ hg init l
   $ cd l
   $ echo a >> foo
   $ hg -q add foo
   $ hg -q branch a
   $ hg -q ci -ma
   $ hg -q up null
   $ echo a >> foo
   $ hg -q add foo
   $ hg -q branch b
   $ hg -q ci -mb
   $ cd ..
   $ hg -q clone l m -u a
   $ cd m
   $ hg -q merge b
   $ hg -q ci -mmb
   $ hg -q up 0
   $ echo a >> foo
   $ hg -q ci -ma2
   $ hg -q up 2
   $ echo a >> foo
   $ hg -q branch -f b
   $ hg -q ci -mb2
   $ hg -q merge 3
   $ hg -q ci -mma
 
   $ hg push ../l -b b
   pushing to ../l
   searching for changes
-  abort: push creates new remote head e7e31d71180f on branch 'a'!
+  abort: push creates new remote head 451211cc22b0 on branch 'a'!
   (did you forget to merge? use push -f to force)
   [255]
 
   $ cd ..
 
 
 Check prepush with new branch head on former topo non-head:
 
   $ hg init n
   $ cd n
   $ hg branch A
   marked working directory as branch A
   (branches are permanent and global, did you want a bookmark?)
   $ echo a >a
   $ hg ci -Ama
   adding a
   $ hg branch B
   marked working directory as branch B
   (branches are permanent and global, did you want a bookmark?)
   $ echo b >b
   $ hg ci -Amb
   adding b
 
 b is now branch head of B, and a topological head
 a is now branch head of A, but not a topological head
 
   $ hg clone . inner
   updating to branch B
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd inner
   $ hg up B
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo b1 >b1
   $ hg ci -Amb1
   adding b1
 
 in the clone b1 is now the head of B
 
   $ cd ..
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo a2 >a2
   $ hg ci -Ama2
   adding a2
 
 a2 is now the new branch head of A, and a new topological head
 it replaces a former inner branch head, so it should at most warn about
 A, not B
 
 glog of local:
 
   $ hg glog --template "{rev}: {branches} {desc}\n"
   @  2: A a2
   |
   | o  1: B b
   |/
   o  0: A a
   
 glog of remote:
 
   $ hg glog -R inner --template "{rev}: {branches} {desc}\n"
   @  2: B b1
   |
   o  1: B b
   |
   o  0: A a
   
 outgoing:
 
   $ hg out inner --template "{rev}: {branches} {desc}\n"
   comparing with inner
   searching for changes
   2: A a2
 
   $ hg push inner
   pushing to inner
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
 
   $ cd ..
 
 
 Check prepush with new branch head on former topo head:
 
   $ hg init o
   $ cd o
   $ hg branch A
   marked working directory as branch A
   (branches are permanent and global, did you want a bookmark?)
   $ echo a >a
   $ hg ci -Ama
   adding a
   $ hg branch B
   marked working directory as branch B
   (branches are permanent and global, did you want a bookmark?)
   $ echo b >b
   $ hg ci -Amb
   adding b
 
 b is now branch head of B, and a topological head
 
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo a1 >a1
   $ hg ci -Ama1
   adding a1
 
 a1 is now branch head of A, and a topological head
 
   $ hg clone . inner
   updating to branch A
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd inner
   $ hg up B
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b1 >b1
   $ hg ci -Amb1
   adding b1
 
 in the clone b1 is now the head of B
 
   $ cd ..
   $ echo a2 >a2
   $ hg ci -Ama2
   adding a2
 
 a2 is now the new branch head of A, and a topological head
 it replaces a former topological and branch head, so this should not warn
 
 glog of local:
 
   $ hg glog --template "{rev}: {branches} {desc}\n"
   @  3: A a2
   |
   o  2: A a1
   |
   | o  1: B b
   |/
   o  0: A a
   
 glog of remote:
 
   $ hg glog -R inner --template "{rev}: {branches} {desc}\n"
   @  3: B b1
   |
   | o  2: A a1
   | |
   o |  1: B b
   |/
   o  0: A a
   
 outgoing:
 
   $ hg out inner --template "{rev}: {branches} {desc}\n"
   comparing with inner
   searching for changes
   3: A a2
 
   $ hg push inner
   pushing to inner
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
 
   $ cd ..
 
 
 Check prepush with new branch head and new child of former branch head
 but child is on different branch:
 
   $ hg init p
   $ cd p
   $ hg branch A
   marked working directory as branch A
   (branches are permanent and global, did you want a bookmark?)
   $ echo a0 >a
   $ hg ci -Ama0
   adding a
   $ echo a1 >a
   $ hg ci -ma1
   $ hg up null
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg branch B
   marked working directory as branch B
   (branches are permanent and global, did you want a bookmark?)
   $ echo b0 >b
   $ hg ci -Amb0
   adding b
   $ echo b1 >b
   $ hg ci -mb1
 
   $ hg clone . inner
   updating to branch B
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg up A
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg branch -f B
   marked working directory as branch B
   (branches are permanent and global, did you want a bookmark?)
   $ echo a3 >a
   $ hg ci -ma3
   created new head
   $ hg up 3
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg branch -f A
   marked working directory as branch A
   (branches are permanent and global, did you want a bookmark?)
   $ echo b3 >b
   $ hg ci -mb3
   created new head
 
 glog of local:
 
   $ hg glog --template "{rev}: {branches} {desc}\n"
   @  5: A b3
   |
   | o  4: B a3
   | |
   o |  3: B b1
   | |
   o |  2: B b0
    /
   o  1: A a1
   |
   o  0: A a0
   
 glog of remote:
 
   $ hg glog -R inner --template "{rev}: {branches} {desc}\n"
   @  3: B b1
   |
   o  2: B b0
   
   o  1: A a1
   |
   o  0: A a0
   
 outgoing:
 
   $ hg out inner --template "{rev}: {branches} {desc}\n"
   comparing with inner
   searching for changes
   4: B a3
   5: A b3
 
   $ hg push inner
   pushing to inner
   searching for changes
   abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'!
   (did you forget to merge? use push -f to force)
   [255]
 
   $ hg push inner -r4 -r5
   pushing to inner
   searching for changes
   abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'!
   (did you forget to merge? use push -f to force)
   [255]
 
   $ hg in inner
   comparing with inner
   searching for changes
   no changes found
   [1]
 
   $ cd ..