comparison mercurial/utils/storageutil.py @ 40512:4fe63b573791

merge with stable
author Augie Fackler <augie@google.com>
date Fri, 02 Nov 2018 14:24:29 -0400
parents 968dd7e02ac5 634b45317459
children aeb2be20b33b
comparison
equal deleted inserted replaced
40511:c2a0bc6412db 40512:4fe63b573791
338 fnode = store.node 338 fnode = store.node
339 frev = store.rev 339 frev = store.rev
340 340
341 if nodesorder == 'nodes': 341 if nodesorder == 'nodes':
342 revs = [frev(n) for n in nodes] 342 revs = [frev(n) for n in nodes]
343 elif nodesorder == 'storage': 343 elif nodesorder == 'linear':
344 revs = sorted(frev(n) for n in nodes)
345 else:
346 revs = set(frev(n) for n in nodes) 344 revs = set(frev(n) for n in nodes)
347 revs = dagop.linearize(revs, store.parentrevs) 345 revs = dagop.linearize(revs, store.parentrevs)
346 else: # storage and default
347 revs = sorted(frev(n) for n in nodes)
348 348
349 prevrev = None 349 prevrev = None
350 350
351 if deltamode == repository.CG_DELTAMODE_PREV or assumehaveparentrevisions: 351 if deltamode == repository.CG_DELTAMODE_PREV or assumehaveparentrevisions:
352 prevrev = store.parentrevs(revs[0])[0] 352 prevrev = store.parentrevs(revs[0])[0]