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

comparison mercurial/localrepo.py @ 2339:11422943cf72

document and fix findincoming - add documentation about what the function does, notably the fact that it updates 'base' - transform the workflow to a more simple 'if elif elif else' - do not call remote.branches if not necessary - some nodes where missing in 'base' (from what I understand, if the root of a branch is missing but one parent is present, the parent should be in 'base') - add a testcase for an incorrect outgoing that is fixed by this cset - add a testcase for an empty group bug, it needs fixing

author	Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date	Tue, 23 May 2006 10:44:40 +0200
parents	f0680b2d1d64
children	925610b2d90a

comparison

equal deleted inserted replaced

-:3f24bc5dee81
+:11422943cf72
 r.append(l)
 return r
 def findincoming(self, remote, base=None, heads=None, force=False):
+"""Return list of roots of the subsets of missing nodes from remote
+If base dict is specified, assume that these nodes and their parents
+exist on the remote side and that no child of a node of base exists
+in both remote and self.
+Furthermore base will be updated to include the nodes that exists
+in self and remote but no children exists in self and remote.
+If a list of heads is specified, return only nodes which are heads
+or ancestors of these heads.
+All the ancestors of base are in self and in remote.
+All the descendants of the list returned are missing in self.
+(and so we know that the rest of the nodes are missing in remote, see
+outgoing)
+"""
 m = self.changelog.nodemap
 search = []
 fetch = {}
 seen = {}
 seenbranch = {}
 if not heads:
 heads = remote.heads()
 if self.changelog.tip() == nullid:
+base[nullid] = 1
 if heads != [nullid]:
 return [nullid]
 return []
 # assume we're closer to the tip than the root
 base[h] = 1
 if not unknown:
 return []
-rep = {}
+req = dict.fromkeys(unknown)
 reqcnt = 0
 # search through remote branches
 # a 'branch' here is a linear segment of history, with four parts:
 # head, root, first parent, second parent
 if n[0] in seen:
 continue
 self.ui.debug(_("examining %s:%s\n")
 % (short(n[0]), short(n[1])))
-if n[0] == nullid:
+if n[0] == nullid: # found the end of the branch
-break
+pass
-if n in seenbranch:
+elif n in seenbranch:
 self.ui.debug(_("branch already found\n"))
 continue
-if n[1] and n[1] in m: # do we know the base?
+elif n[1] and n[1] in m: # do we know the base?
 self.ui.debug(_("found incomplete branch %s:%s\n")
 % (short(n[0]), short(n[1])))
 search.append(n) # schedule branch range for scanning
 seenbranch[n] = 1
 else:
 if n[1] not in seen and n[1] not in fetch:
 if n[2] in m and n[3] in m:
 self.ui.debug(_("found new changeset %s\n") %
 short(n[1]))
 fetch[n[1]] = 1 # earliest unknown
-base[n[2]] = 1 # latest known
+for p in n[2:4]:
-continue
+if p in m:
+base[p] = 1 # latest known
-for a in n[2:4]:
-if a not in rep:
+for p in n[2:4]:
-r.append(a)
+if p not in req and p not in m:
-rep[a] = 1
+r.append(p)
+req[p] = 1
 seen[n[0]] = 1
 if r:
 reqcnt += 1
 self.ui.debug(_("request %d: %s\n") %
 (reqcnt, " ".join(map(short, r))))
 for p in range(0, len(r), 10):
 for b in remote.branches(r[p:p+10]):
 self.ui.debug(_("received %s:%s\n") %
 (short(b[0]), short(b[1])))
-if b[0] in m:
+unknown.append(b)
-self.ui.debug(_("found base node %s\n")
-% short(b[0]))
-base[b[0]] = 1
-elif b[0] not in seen:
-unknown.append(b)
 # do binary search on the branches we found
 while search:
 n = search.pop(0)
 reqcnt += 1

Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 2339:11422943cf72