--- a/mercurial/localrepo.py Sun Sep 27 09:34:40 2009 +0200
+++ b/mercurial/localrepo.py Sun Sep 27 09:38:53 2009 +0200
@@ -1475,19 +1475,16 @@
inc = self.findincoming(remote, common, remote_heads, force=force)
update, updated_heads = self.findoutgoing(remote, common, remote_heads)
- if revs is not None:
- msng_cl, bases, heads = self.changelog.nodesbetween(update, revs)
- else:
- bases, heads = update, self.changelog.heads()
+ msng_cl, bases, heads = self.changelog.nodesbetween(update, revs)
- def checkbranch(lheads, rheads, updatelh):
+ def checkbranch(lheads, rheads, updatelb):
'''
check whether there are more local heads than remote heads on
a specific branch.
lheads: local branch heads
rheads: remote branch heads
- updatelh: outgoing local branch heads
+ updatelb: outgoing local branch bases
'''
warn = 0
@@ -1495,13 +1492,15 @@
if not revs and len(lheads) > len(rheads):
warn = 1
else:
+ # add local heads involved in the push
updatelheads = [self.changelog.heads(x, lheads)
- for x in updatelh]
+ for x in updatelb]
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)
@@ -1517,7 +1516,7 @@
if not rheads: # new branch requires --force
self.ui.warn(_("abort: push creates new"
" remote branch '%s'!\n") %
- self[updatelh[0]].branch())
+ self[updatelb[0]].branch())
else:
self.ui.warn(_("abort: push creates new remote heads!\n"))
@@ -1560,11 +1559,11 @@
else:
rheads = []
lheads = localhds[lh]
- updatelh = [upd for upd in update
+ updatelb = [upd for upd in update
if self[upd].branch() == lh]
- if not updatelh:
+ if not updatelb:
continue
- if not checkbranch(lheads, rheads, updatelh):
+ if not checkbranch(lheads, rheads, updatelb):
return None, 0
else:
if not checkbranch(heads, remote_heads, update):