Mercurial > public > mercurial-scm > hg
comparison mercurial/revlog.py @ 40460:4fe63b573791
merge with stable
author | Augie Fackler <augie@google.com> |
---|---|
date | Fri, 02 Nov 2018 14:24:29 -0400 |
parents | 6a917075535a 256b1f0c24e8 |
children | 39369475445c |
comparison
equal
deleted
inserted
replaced
40457:c2a0bc6412db | 40460:4fe63b573791 |
---|---|
2205 return res | 2205 return res |
2206 | 2206 |
2207 def emitrevisions(self, nodes, nodesorder=None, revisiondata=False, | 2207 def emitrevisions(self, nodes, nodesorder=None, revisiondata=False, |
2208 assumehaveparentrevisions=False, | 2208 assumehaveparentrevisions=False, |
2209 deltamode=repository.CG_DELTAMODE_STD): | 2209 deltamode=repository.CG_DELTAMODE_STD): |
2210 if nodesorder not in ('nodes', 'storage', None): | 2210 if nodesorder not in ('nodes', 'storage', 'linear', None): |
2211 raise error.ProgrammingError('unhandled value for nodesorder: %s' % | 2211 raise error.ProgrammingError('unhandled value for nodesorder: %s' % |
2212 nodesorder) | 2212 nodesorder) |
2213 | 2213 |
2214 if nodesorder is None and not self._generaldelta: | 2214 if nodesorder is None and not self._generaldelta: |
2215 nodesorder = 'storage' | 2215 nodesorder = 'storage' |