mercurial-crew-with-dirclash: comparison mercurial/hg.py

equal deleted inserted replaced

-:7369ec5d93f2
+:004e811f7706
 nl.append(n)
 break
 return nl
-def findincoming(self, remote):
+def findincoming(self, remote, base={}):
 m = self.changelog.nodemap
 search = []
 fetch = []
-base = {}
 seen = {}
 seenbranch = {}
 # if we have an empty repo, fetch everything
 if self.changelog.tip() == nullid:
 heads = remote.heads()
 unknown = []
 for h in heads:
 if h not in m:
 unknown.append(h)
+else:
+base[h] = 1
 if not unknown:
 return None
 rep = {}
 " ".join([short(f) for f in fetch]) + "\n")
 self.ui.debug("%d total queries\n" % reqcnt)
 return fetch
+def findoutgoing(self, remote):
+base = {}
+findincoming(self, remote, base)
+remain = dict.fromkeys(self.changelog.nodemap)
+# prune everything remote has from the tree
+remove = base.keys()
+while remove:
+n = remove.pop(0)
+if n in remain:
+del remain[n]
+for p in self.changelog.parents(n):
+remain.append(p)
+# find every node whose parents have been pruned
+subset = []
+for n in remain:
+p1, p2 = self.changelog.parents(n)
+if p1 not in remain and p2 not in remain:
+subset.append(n)
+# this is the set of all roots we have to push
+return subset
 def changegroup(self, basenodes):
 nodes = self.newer(basenodes)
 # construct the link map