# HG changeset patch # User Augie Fackler # Date 2015-10-14 15:32:33 # Node ID 2f5c45fe3a3b743191a58e08d952476b5c2caf66 # Parent d7e6145134136067f33cf9097c3bbc6b78c1da5b 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(). diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -1442,7 +1442,7 @@ class revlog(object): 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 @@ class revlog(object): # 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']