Mercurial > public > mercurial-scm > hg

diff mercurial/revlog.py @ 40430:6a917075535a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
storage: also use `deltamode argument` for ifiledata Now that lower level uses such argument, we can propagate the change to higher layers.
author Boris Feld <boris.feld@octobus.net>
date Tue, 09 Oct 2018 23:26:35 +0200
parents 59a870a4ad6e
children 4fe63b573791
line wrap: on
line diff
--- a/mercurial/revlog.py	Tue Oct 09 22:02:01 2018 +0200
+++ b/mercurial/revlog.py	Tue Oct 09 23:26:35 2018 +0200
@@ -2205,7 +2205,8 @@
         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)
@@ -2213,10 +2214,8 @@
         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(