@@ -697,12 +697,16 @@ def deltagroup(repo, store, nodes, ischa
progress = repo.ui.makeprogress(topic, unit=_('chunks'),
total=len(nodes))
+ deltamode = repository.CG_DELTAMODE_STD
+ if forcedeltaparentprev:
+ deltamode = repository.CG_DELTAMODE_PREV
+
revisions = store.emitrevisions(
nodes,
nodesorder=nodesorder,
revisiondata=True,
assumehaveparentrevisions=not ellipses,
- deltaprevious=forcedeltaparentprev)
+ deltamode=deltamode)
for i, revision in enumerate(revisions):
if progress:
@@ -77,11 +77,11 @@ class filelog(object):
def emitrevisions(self, nodes, nodesorder=None,
revisiondata=False, assumehaveparentrevisions=False,
- deltaprevious=False):
+ deltamode=repository.CG_DELTAMODE_STD):
return self._revlog.emitrevisions(
nodes, nodesorder=nodesorder, revisiondata=revisiondata,
assumehaveparentrevisions=assumehaveparentrevisions,
- deltaprevious=deltaprevious)
+ deltamode=deltamode)
def addrevision(self, revisiondata, transaction, linkrev, p1, p2,
node=None, flags=revlog.REVIDX_DEFAULT_FLAGS,
@@ -1575,11 +1575,11 @@ class manifestrevlog(object):
def emitrevisions(self, nodes, nodesorder=None,
revisiondata=False, assumehaveparentrevisions=False,
- deltaprevious=False):
+ deltamode=repository.CG_DELTAMODE_STD):
return self._revlog.emitrevisions(
nodes, nodesorder=nodesorder, revisiondata=revisiondata,
assumehaveparentrevisions=assumehaveparentrevisions,
- deltaprevious=deltaprevious)
+ deltamode=deltamode)
def addgroup(self, deltas, linkmapper, transaction, addrevisioncb=None):
return self._revlog.addgroup(deltas, linkmapper, transaction,
@@ -606,7 +606,7 @@ class ifiledata(interfaceutil.Interface)
nodesorder=None,
revisiondata=False,
assumehaveparentrevisions=False,
- deltaprevious=False):
+ deltamode=CG_DELTAMODE_STD):
"""Produce ``irevisiondelta`` for revisions.
Given an iterable of nodes, emits objects conforming to the
@@ -649,10 +649,10 @@ class ifiledata(interfaceutil.Interface)
The ``linknode`` attribute on the returned ``irevisiondelta`` may not
be set and it is the caller's responsibility to resolve it, if needed.
- If ``deltaprevious`` is True and revision data is requested, all
- revision data should be emitted as deltas against the revision
- emitted just prior. The initial revision should be a delta against
- its 1st parent.
+ If ``deltamode`` is CG_DELTAMODE_PREV and revision data is requested,
+ all revision data should be emitted as deltas against the revision
+ emitted just prior. The initial revision should be a delta against its
+ 1st parent.
"""
class ifilemutation(interfaceutil.Interface):
@@ -2221,7 +2221,8 @@ class revlog(object):
return res
def emitrevisions(self, nodes, nodesorder=None, revisiondata=False,
- assumehaveparentrevisions=False, deltaprevious=False):
+ assumehaveparentrevisions=False,
+ deltamode=repository.CG_DELTAMODE_STD):
if nodesorder not in ('nodes', 'storage', None):
raise error.ProgrammingError('unhandled value for nodesorder: %s' %
nodesorder)
@@ -2229,10 +2230,8 @@ class revlog(object):
if nodesorder is None and not self._generaldelta:
nodesorder = 'storage'
- deltamode = repository.CG_DELTAMODE_STD
- if deltaprevious:
- deltamode = repository.CG_DELTAMODE_PREV
- elif not self._storedeltachains:
+ if (not self._storedeltachains and
+ deltamode != repository.CG_DELTAMODE_PREV):
deltamode = repository.CG_DELTAMODE_FULL
return storageutil.emitrevisions(
@@ -727,7 +727,8 @@ class ifiledatatests(basetestcase):
# forceprevious=True forces a delta against the previous revision.
# Special case for initial revision.
- gen = f.emitrevisions([node0], revisiondata=True, deltaprevious=True)
+ gen = f.emitrevisions([node0], revisiondata=True,
+ deltamode=repository.CG_DELTAMODE_PREV)
rev = next(gen)
self.assertEqual(rev.node, node0)
@@ -744,7 +745,7 @@ class ifiledatatests(basetestcase):
next(gen)
gen = f.emitrevisions([node0, node2], revisiondata=True,
- deltaprevious=True)
+ deltamode=repository.CG_DELTAMODE_PREV)
rev = next(gen)
self.assertEqual(rev.node, node0)