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

equal deleted inserted replaced

-:d7e859cf2f1b
+:5d8553352d2e
 def join(self, f):
 return os.path.join(self.path, f)
 def file(self, f):
+if f[0] == '/': f = f[1:]
 return filelog(self.opener, f)
 def transaction(self):
 return transaction(self.opener, self.join("journal"),
 self.join("undo"))
 m = self.changelog.nodemap
 search = []
 fetch = []
 seen = {}
 seenbranch = {}
+self.ui.status("searching for changes\n")
 tip = remote.branches([])[0]
 self.ui.debug("remote tip branch is %s:%s\n" %
 (short(tip[0]), short(tip[1])))
 # if we have an empty repo, fetch everything
 # otherwise, assume we're closer to the tip than the root
 unknown = [tip]
 if tip[0] in m:
-self.ui.note("nothing to do!\n")
+self.ui.status("nothing to do!\n")
 return None
 while unknown:
 n = unknown.pop(0)
 seen[n[0]] = 1
 changed.sort()
 # the changegroup is changesets + manifests + all file revs
 revs = [ self.changelog.rev(n) for n in nodes ]
-yield self.changelog.group(linkmap)
+for y in self.changelog.group(linkmap): yield y
-yield self.manifest.group(linkmap)
+for y in self.manifest.group(linkmap): yield y
 for f in changed:
+yield struct.pack(">l", len(f) + 4) + f
 g = self.file(f).group(linkmap)
-if not g: raise "couldn't find change to %s" % f
+for y in g:
-l = struct.pack(">l", len(f))
+yield y
-yield "".join([l, f, g])
 def addchangegroup(self, generator):
 changesets = files = revisions = 0
 self.lock()
 return d
 if not generator: return
 source = genread(generator)
-def getchunk(add = 0):
+def getchunk():
 d = source.read(4)
 if not d: return ""
 l = struct.unpack(">l", d)[0]
-return source.read(l - 4 + add)
+if l <= 4: return ""
+return source.read(l - 4)
+def getgroup():
+while 1:
+c = getchunk()
+if not c: break
+yield c
 tr = self.transaction()
 simple = True
 need = {}
 self.ui.status("adding changesets\n")
 # pull off the changeset group
 def report(x):
 self.ui.debug("add changeset %s\n" % short(x))
 return self.changelog.count()
-csg = getchunk()
 co = self.changelog.tip()
-cn = self.changelog.addgroup(csg, report, tr)
+cn = self.changelog.addgroup(getgroup(), report, tr)
-revisions = self.changelog.rev(cn) - self.changelog.rev(co)
+changesets = self.changelog.rev(cn) - self.changelog.rev(co)
-changesets = revisions
 self.ui.status("adding manifests\n")
 # pull off the manifest group
-mfg = getchunk()
 mm = self.manifest.tip()
-mo = self.manifest.addgroup(mfg, lambda x: self.changelog.rev(x), tr)
+mo = self.manifest.addgroup(getgroup(),
+lambda x: self.changelog.rev(x), tr)
-revisions += self.manifest.rev(mo) - self.manifest.rev(mm)
 # do we need a resolve?
 if self.changelog.ancestor(co, cn) != co:
 simple = False
 resolverev = self.changelog.count()
 new.sort()
 # process the files
 self.ui.status("adding files\n")
 while 1:
-f = getchunk(4)
+f = getchunk()
 if not f: break
-fg = getchunk()
 self.ui.debug("adding %s revisions\n" % f)
 fl = self.file(f)
 o = fl.tip()
-n = fl.addgroup(fg, lambda x: self.changelog.rev(x), tr)
+n = fl.addgroup(getgroup(), lambda x: self.changelog.rev(x), tr)
 revisions += fl.rev(n) - fl.rev(o)
 files += 1
 if f in need:
 del need[f]
 # manifest resolve determined we need to merge the tips
 revisions += 1
 # For simple merges, we don't need to resolve manifests or changesets
 if simple:
 self.ui.debug("simple merge, skipping resolve\n")
-self.ui.status(("added %d changesets, %d files," +
+self.ui.status(("modified %d files, added %d changesets" +
 " and %d new revisions\n")
-% (changesets, files, revisions))
+% (files, changesets, revisions))
 tr.close()
 return
 node = self.manifest.add(nmap, tr, resolverev, mm, mo)
 revisions += 1
 def changegroup(self, nodes):
 n = " ".join(map(hex, nodes))
 zd = zlib.decompressobj()
 f = self.do_cmd("changegroup", roots=n)
+bytes = 0
 while 1:
 d = f.read(4096)
+bytes += len(d)
 if not d:
 yield zd.flush()
 break
 yield zd.decompress(d)
+self.ui.note("%d bytes of data transfered\n" % bytes)
 def repository(ui, path=None, create=0):
 if path and path[:7] == "http://":
 return remoterepository(ui, path)
 if path and path[:5] == "hg://":

changeset 192	5d8553352d2e
parent 191	d7e859cf2f1b
child 199	2424676edd8c