Mercurial > hg

changeset 26705:2f5c45fe3a3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: rename bundle to cg to reflect its nature as a cg?unpacker The new convention is that bundles contain changegroups. bundle1 happens to *only* be a changegroup, but bundle2 is a more featureful container that isn't something you can pass to addgroup().
author Augie Fackler <augie@google.com>
date Wed, 14 Oct 2015 11:32:33 -0400
parents d7e614513413
children 8c0c3059f478
files mercurial/revlog.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/revlog.py	Tue Oct 13 17:16:10 2015 -0400
+++ b/mercurial/revlog.py	Wed Oct 14 11:32:33 2015 -0400
@@ -1442,7 +1442,7 @@
             ifh.write(data[1])
             self.checkinlinesize(transaction, ifh)
 
-    def addgroup(self, bundle, linkmapper, transaction, addrevisioncb=None):
+    def addgroup(self, cg, linkmapper, transaction, addrevisioncb=None):
         """
         add a delta group
 
@@ -1479,7 +1479,7 @@
             # loop through our set of deltas
             chain = None
             while True:
-                chunkdata = bundle.deltachunk(chain)
+                chunkdata = cg.deltachunk(chain)
                 if not chunkdata:
                     break
                 node = chunkdata['node']