mercurial-scm/hg: mercurial/localrepo.py comparison

comparison mercurial/localrepo.py @ 10925:a101a743c570 stable

prepush: rewrite most of the code from scratch For servers with branchmap support, the algorithm now works as follows: 1. A list of branches in outgoing changesets is created. 2. Using the remote branchmap, a check for new branches is performed. 3. A map (from branch to head list) of locally known remote heads before the push is created, and one which, after step 4, will contain the locally known remote heads after the push. 4. The post-push head map is updated with the outgoing changesets, using the branch cache update mechanism. 5. A check for new heads is performed, by comparing the length of the head list before and after push, for each branch. If there are new heads, an error depending on whether or not there are incoming changes on the branch, is returned. 6. If the push is allowed, a warning is written if there are incoming changes on any branches involved in the push. For old servers, an algorithm similar to step 4-6 above is used to check for new topological heads only. Two bugs are also fixed: 1. Sometimes you would be allowed to push new branch heads without --force. A test for this case was added. 2. You would get the "note: unsynced remote changes!" warning if there were any incoming changesets, even if they were on unrelated branches.

author	Sune Foldager <cryo@cyanite.org>
date	Thu, 15 Apr 2010 21:59:21 +0200
parents	816bac2f9452
children	4d81cbd8a851 17031fea4e95

comparison

equal deleted inserted replaced

-:1782278bab8a
+:a101a743c570
 '''
 common = {}
 remote_heads = remote.heads()
 inc = self.findincoming(remote, common, remote_heads, force=force)
+cl = self.changelog
 update, updated_heads = self.findoutgoing(remote, common, remote_heads)
-msng_cl, bases, heads = self.changelog.nodesbetween(update, revs)
+outg, bases, heads = cl.nodesbetween(update, revs)
-def checkbranch(lheads, rheads, lheadcnt, branchname=None):
+if not bases:
-'''
+self.ui.status(_("no changes found\n"))
-check whether there are more local heads than remote heads on
+return None, 1
-a specific branch.
+if not force and remote_heads != [nullid]:
-lheads: local branch heads
-rheads: remote branch heads
+def fail_multiple_heads(unsynced, branch=None):
-lheadcnt: total number of local branch heads
+if branch:
-'''
-warn = 0
-if len(lheads) > len(rheads):
-warn = 1
-else:
-# add local heads involved in the push
-updatelheads = [self.changelog.heads(x, lheads)
-for x in update]
-newheads = set(sum(updatelheads, [])) & set(lheads)
-if not newheads:
-return True
-# add heads we don't have or that are not involved in the push
-for r in rheads:
-if r in self.changelog.nodemap:
-desc = self.changelog.heads(r, heads)
-l = [h for h in heads if h in desc]
-if not l:
-newheads.add(r)
-else:
-newheads.add(r)
-if len(newheads) > len(rheads):
-warn = 1
-if warn:
-if branchname is not None:
 msg = _("abort: push creates new remote heads"
-" on branch '%s'!\n") % branchname
+" on branch '%s'!\n") % branch
 else:
 msg = _("abort: push creates new remote heads!\n")
 self.ui.warn(msg)
-if lheadcnt > len(rheads):
+if unsynced:
+self.ui.status(_("(you should pull and merge or"
+" use push -f to force)\n"))
+else:
 self.ui.status(_("(did you forget to merge?"
 " use push -f to force)\n"))
-else:
+return None, 0
-self.ui.status(_("(you should pull and merge or"
-" use push -f to force)\n"))
+if remote.capable('branchmap'):
-return False
+# Check for each named branch if we're creating new remote heads.
-return True
+# To be a remote head after push, node must be either:
+# - unknown locally
-if not bases:
+# - a local outgoing head descended from update
-self.ui.status(_("no changes found\n"))
+# - a remote head that's known locally and not
-return None, 1
+#   ancestral to an outgoing head
-elif not force:
+#
-# Check for each named branch if we're creating new remote heads.
+# New named branches cannot be created without --force.
-# To be a remote head after push, node must be either:
-# - unknown locally
+# 1. Create set of branches involved in the push.
-# - a local outgoing head descended from update
+branches = set(self[n].branch() for n in outg)
-# - a remote head that's known locally and not
-#   ancestral to an outgoing head
+# 2. Check for new branches on the remote.
-#
+remotemap = remote.branchmap()
-# New named branches cannot be created without --force.
+newbranches = branches - set(remotemap)
+if newbranches: # new branch requires --force
-if remote_heads != [nullid]:
+branchnames = ', '.join("%s" % b for b in newbranches)
-if remote.capable('branchmap'):
+self.ui.warn(_("abort: push creates "
-remotebrheads = remote.branchmap()
+"new remote branches: %s!\n")
+% branchnames)
-lbrmap = self.branchmap()
+self.ui.status(_("(use 'hg push -f' to force)\n"))
-localbrheads = {}
+return None, 0
-if not revs:
-for br, hds in lbrmap.iteritems():
+# 3. Construct the initial oldmap and newmap dicts.
-localbrheads[br] = (len(hds), hds)
+# They contain information about the remote heads before and
-else:
+# after the push, respectively.
-ctxgen = (self[n] for n in msng_cl)
+# Heads not found locally are not included in either dict,
-self._updatebranchcache(localbrheads, ctxgen)
+# since they won't be affected by the push.
-for br, hds in localbrheads.iteritems():
+# unsynced contains all branches with incoming changesets.
-localbrheads[br] = (len(lbrmap[br]), hds)
+oldmap = {}
+newmap = {}
-newbranches = list(set(localbrheads) - set(remotebrheads))
+unsynced = set()
-if newbranches: # new branch requires --force
+for branch in branches:
-branchnames = ', '.join("%s" % b for b in newbranches)
+remoteheads = remotemap[branch]
-self.ui.warn(_("abort: push creates "
+prunedheads = [h for h in remoteheads if h in cl.nodemap]
-"new remote branches: %s!\n")
+oldmap[branch] = prunedheads
-% branchnames)
+newmap[branch] = list(prunedheads)
-# propose 'push -b .' in the msg too?
+if len(remoteheads) > len(prunedheads):
-self.ui.status(_("(use 'hg push -f' to force)\n"))
+unsynced.add(branch)
-return None, 0
-for branch, x in localbrheads.iteritems():
+# 4. Update newmap with outgoing changes.
-if branch in remotebrheads:
+# This will possibly add new heads and remove existing ones.
-headcnt, lheads = x
+ctxgen = (self[n] for n in outg)
-rheads = remotebrheads[branch]
+self._updatebranchcache(newmap, ctxgen)
-if not checkbranch(lheads, rheads, headcnt, branch):
-return None, 0
+# 5. Check for new heads.
-else:
+# If there are more heads after the push than before, a suitable
-if not checkbranch(heads, remote_heads, len(heads)):
+# warning, depending on unsynced status, is displayed.
-return None, 0
+for branch in branches:
+if len(newmap[branch]) > len(oldmap[branch]):
-if inc:
+return fail_multiple_heads(branch in unsynced, branch)
-self.ui.warn(_("note: unsynced remote changes!\n"))
+# 6. Check for unsynced changes on involved branches.
+if unsynced:
+self.ui.warn(_("note: unsynced remote changes!\n"))
+else:
+# Old servers: Check for new topological heads.
+# Code based on _updatebranchcache.
+newheads = set(h for h in remote_heads if h in cl.nodemap)
+oldheadcnt = len(newheads)
+newheads.update(outg)
+if len(newheads) > 1:
+for latest in reversed(outg):
+if latest not in newheads:
+continue
+minhrev = min(cl.rev(h) for h in newheads)
+reachable = cl.reachable(latest, cl.node(minhrev))
+reachable.remove(latest)
+newheads.difference_update(reachable)
+if len(newheads) > oldheadcnt:
+return fail_multiple_heads(inc)
+if inc:
+self.ui.warn(_("note: unsynced remote changes!\n"))
 if revs is None:
 # use the fast path, no race possible on push
 nodes = self.changelog.findmissing(common.keys())
 cg = self._changegroup(nodes, 'push')

Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 10925:a101a743c570 stable