mercurial-scm/hg-stable: mercurial/utils/storageutil.py annotate

annotate mercurial/utils/storageutil.py @ 40497:968dd7e02ac5

changegroup: allow to force delta to be against p1 This new developer option is useful to general more "generic" bundle. Without this option, a bundle generated from the repository use deltas similar to the one stored in the specific repository it was generated from. This makes performance testing a bit tricky. Using deltas similar to the final result means all delta stored in the bundle can be applied to the target repository without any further processing (except for the rare case of a full snapshot). The application of such bundles (almost) never exercises the (slower) path of searching for a new valid delta. This result in unrealistic and too favorable timing and profile. Instead, we introduce an option to make sure all revisions are stored as a delta against p1. It might not be the best generation option, but it guarantees that the content will be "generic", not favoring a specific target.

author	Boris Feld <boris.feld@octobus.net>
date	Wed, 10 Oct 2018 00:21:02 +0200
parents	59a870a4ad6e
children	4fe63b573791

rev	line source
39882 f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	1 # storageutil.py - Storage functionality agnostic of backend implementation.
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	2 #
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	3 # Copyright 2018 Gregory Szorc <gregory.szorc@gmail.com>
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	4 #
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	7
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	8 from __future__ import absolute_import
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	9
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	10 import hashlib
39883 3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	11 import re
40325 b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	12 import struct
39882 f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	13
40003 0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	14 from ..i18n import _
39882 f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	15 from ..node import (
40003 0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	16 bin,
39882 f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	17 nullid,
40005 fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	18 nullrev,
39882 f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	19 )
39886 d63153611ed5 storageutil: extract revision number iteration Gregory Szorc <gregory.szorc@gmail.com> parents: 39885 diff changeset	20 from .. import (
40011 f5d819d84461 storageutil: pass nodes into emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 40010 diff changeset	21 dagop,
40003 0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	22 error,
40010 631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	23 mdiff,
39886 d63153611ed5 storageutil: extract revision number iteration Gregory Szorc <gregory.szorc@gmail.com> parents: 39885 diff changeset	24 pycompat,
40495 59a870a4ad6e changegroup: refactor emitrevision to use a `deltamode` argument Boris Feld <boris.feld@octobus.net> parents: 40325 diff changeset	25 repository,
39886 d63153611ed5 storageutil: extract revision number iteration Gregory Szorc <gregory.szorc@gmail.com> parents: 39885 diff changeset	26 )
39882 f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	27
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	28 _nullhash = hashlib.sha1(nullid)
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	29
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	30 def hashrevisionsha1(text, p1, p2):
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	31 """Compute the SHA-1 for revision data and its parents.
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	32
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	33 This hash combines both the current file contents and its history
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	34 in a manner that makes it easy to distinguish nodes with the same
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	35 content in the revision graph.
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	36 """
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	37 # As of now, if one of the parent node is null, p2 is null
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	38 if p2 == nullid:
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	39 # deep copy of a hash is faster than creating one
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	40 s = _nullhash.copy()
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	41 s.update(p1)
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	42 else:
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	43 # none of the parent nodes are nullid
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	44 if p1 < p2:
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	45 a = p1
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	46 b = p2
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	47 else:
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	48 a = p2
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	49 b = p1
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	50 s = hashlib.sha1(a)
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	51 s.update(b)
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	52 s.update(text)
f8eb71f9e3bd storageutil: new module for storage primitives (API) Gregory Szorc <gregory.szorc@gmail.com> parents: diff changeset	53 return s.digest()
39883 3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	54
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	55 METADATA_RE = re.compile(b'\x01\n')
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	56
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	57 def parsemeta(text):
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	58 """Parse metadata header from revision data.
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	59
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	60 Returns a 2-tuple of (metadata, offset), where both can be None if there
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	61 is no metadata.
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	62 """
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	63 # text can be buffer, so we can't use .startswith or .index
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	64 if text[:2] != b'\x01\n':
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	65 return None, None
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	66 s = METADATA_RE.search(text, 2).start()
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	67 mtext = text[2:s]
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	68 meta = {}
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	69 for l in mtext.splitlines():
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	70 k, v = l.split(b': ', 1)
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	71 meta[k] = v
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	72 return meta, s + 2
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	73
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	74 def packmeta(meta, text):
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	75 """Add metadata to fulltext to produce revision text."""
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	76 keys = sorted(meta)
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	77 metatext = b''.join(b'%s: %s\n' % (k, meta[k]) for k in keys)
3e896b51aa5d storageutil: move metadata parsing and packing from revlog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39882 diff changeset	78 return b'\x01\n%s\x01\n%s' % (metatext, text)
39884 d269ddbf54f0 storageutil: move _censoredtext() from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 39883 diff changeset	79
d269ddbf54f0 storageutil: move _censoredtext() from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 39883 diff changeset	80 def iscensoredtext(text):
d269ddbf54f0 storageutil: move _censoredtext() from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 39883 diff changeset	81 meta = parsemeta(text)[0]
d269ddbf54f0 storageutil: move _censoredtext() from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 39883 diff changeset	82 return meta and b'censored' in meta
39885 1b65fb4d43d6 storageutil: new function for extracting metadata-less content from text Gregory Szorc <gregory.szorc@gmail.com> parents: 39884 diff changeset	83
1b65fb4d43d6 storageutil: new function for extracting metadata-less content from text Gregory Szorc <gregory.szorc@gmail.com> parents: 39884 diff changeset	84 def filtermetadata(text):
1b65fb4d43d6 storageutil: new function for extracting metadata-less content from text Gregory Szorc <gregory.szorc@gmail.com> parents: 39884 diff changeset	85 """Extract just the revision data from source text.
1b65fb4d43d6 storageutil: new function for extracting metadata-less content from text Gregory Szorc <gregory.szorc@gmail.com> parents: 39884 diff changeset	86
1b65fb4d43d6 storageutil: new function for extracting metadata-less content from text Gregory Szorc <gregory.szorc@gmail.com> parents: 39884 diff changeset	87 Returns ``text`` unless it has a metadata header, in which case we return
1b65fb4d43d6 storageutil: new function for extracting metadata-less content from text Gregory Szorc <gregory.szorc@gmail.com> parents: 39884 diff changeset	88 a new buffer without hte metadata.
1b65fb4d43d6 storageutil: new function for extracting metadata-less content from text Gregory Szorc <gregory.szorc@gmail.com> parents: 39884 diff changeset	89 """
1b65fb4d43d6 storageutil: new function for extracting metadata-less content from text Gregory Szorc <gregory.szorc@gmail.com> parents: 39884 diff changeset	90 if not text.startswith(b'\x01\n'):
1b65fb4d43d6 storageutil: new function for extracting metadata-less content from text Gregory Szorc <gregory.szorc@gmail.com> parents: 39884 diff changeset	91 return text
1b65fb4d43d6 storageutil: new function for extracting metadata-less content from text Gregory Szorc <gregory.szorc@gmail.com> parents: 39884 diff changeset	92
1b65fb4d43d6 storageutil: new function for extracting metadata-less content from text Gregory Szorc <gregory.szorc@gmail.com> parents: 39884 diff changeset	93 offset = text.index(b'\x01\n', 2)
1b65fb4d43d6 storageutil: new function for extracting metadata-less content from text Gregory Szorc <gregory.szorc@gmail.com> parents: 39884 diff changeset	94 return text[offset + 2:]
39886 d63153611ed5 storageutil: extract revision number iteration Gregory Szorc <gregory.szorc@gmail.com> parents: 39885 diff changeset	95
40006 1d97a332c6d9 storageutil: extract copy metadata retrieval out of filelog Gregory Szorc <gregory.szorc@gmail.com> parents: 40005 diff changeset	96 def filerevisioncopied(store, node):
1d97a332c6d9 storageutil: extract copy metadata retrieval out of filelog Gregory Szorc <gregory.szorc@gmail.com> parents: 40005 diff changeset	97 """Resolve file revision copy metadata.
1d97a332c6d9 storageutil: extract copy metadata retrieval out of filelog Gregory Szorc <gregory.szorc@gmail.com> parents: 40005 diff changeset	98
1d97a332c6d9 storageutil: extract copy metadata retrieval out of filelog Gregory Szorc <gregory.szorc@gmail.com> parents: 40005 diff changeset	99 Returns ``False`` if the file has no copy metadata. Otherwise a
1d97a332c6d9 storageutil: extract copy metadata retrieval out of filelog Gregory Szorc <gregory.szorc@gmail.com> parents: 40005 diff changeset	100 2-tuple of the source filename and node.
1d97a332c6d9 storageutil: extract copy metadata retrieval out of filelog Gregory Szorc <gregory.szorc@gmail.com> parents: 40005 diff changeset	101 """
1d97a332c6d9 storageutil: extract copy metadata retrieval out of filelog Gregory Szorc <gregory.szorc@gmail.com> parents: 40005 diff changeset	102 if store.parents(node)[0] != nullid:
1d97a332c6d9 storageutil: extract copy metadata retrieval out of filelog Gregory Szorc <gregory.szorc@gmail.com> parents: 40005 diff changeset	103 return False
1d97a332c6d9 storageutil: extract copy metadata retrieval out of filelog Gregory Szorc <gregory.szorc@gmail.com> parents: 40005 diff changeset	104
1d97a332c6d9 storageutil: extract copy metadata retrieval out of filelog Gregory Szorc <gregory.szorc@gmail.com> parents: 40005 diff changeset	105 meta = parsemeta(store.revision(node))[0]
1d97a332c6d9 storageutil: extract copy metadata retrieval out of filelog Gregory Szorc <gregory.szorc@gmail.com> parents: 40005 diff changeset	106
1d97a332c6d9 storageutil: extract copy metadata retrieval out of filelog Gregory Szorc <gregory.szorc@gmail.com> parents: 40005 diff changeset	107 # copy and copyrev occur in pairs. In rare cases due to old bugs,
1d97a332c6d9 storageutil: extract copy metadata retrieval out of filelog Gregory Szorc <gregory.szorc@gmail.com> parents: 40005 diff changeset	108 # one can occur without the other. So ensure both are present to flag
1d97a332c6d9 storageutil: extract copy metadata retrieval out of filelog Gregory Szorc <gregory.szorc@gmail.com> parents: 40005 diff changeset	109 # as a copy.
1d97a332c6d9 storageutil: extract copy metadata retrieval out of filelog Gregory Szorc <gregory.szorc@gmail.com> parents: 40005 diff changeset	110 if meta and b'copy' in meta and b'copyrev' in meta:
1d97a332c6d9 storageutil: extract copy metadata retrieval out of filelog Gregory Szorc <gregory.szorc@gmail.com> parents: 40005 diff changeset	111 return meta[b'copy'], bin(meta[b'copyrev'])
1d97a332c6d9 storageutil: extract copy metadata retrieval out of filelog Gregory Szorc <gregory.szorc@gmail.com> parents: 40005 diff changeset	112
1d97a332c6d9 storageutil: extract copy metadata retrieval out of filelog Gregory Szorc <gregory.szorc@gmail.com> parents: 40005 diff changeset	113 return False
1d97a332c6d9 storageutil: extract copy metadata retrieval out of filelog Gregory Szorc <gregory.szorc@gmail.com> parents: 40005 diff changeset	114
40008 1470183068b8 storageutil: invert logic of file data comparison Gregory Szorc <gregory.szorc@gmail.com> parents: 40007 diff changeset	115 def filedataequivalent(store, node, filedata):
1470183068b8 storageutil: invert logic of file data comparison Gregory Szorc <gregory.szorc@gmail.com> parents: 40007 diff changeset	116 """Determines whether file data is equivalent to a stored node.
1470183068b8 storageutil: invert logic of file data comparison Gregory Szorc <gregory.szorc@gmail.com> parents: 40007 diff changeset	117
1470183068b8 storageutil: invert logic of file data comparison Gregory Szorc <gregory.szorc@gmail.com> parents: 40007 diff changeset	118 Returns True if the passed file data would hash to the same value
1470183068b8 storageutil: invert logic of file data comparison Gregory Szorc <gregory.szorc@gmail.com> parents: 40007 diff changeset	119 as a stored revision and False otherwise.
1470183068b8 storageutil: invert logic of file data comparison Gregory Szorc <gregory.szorc@gmail.com> parents: 40007 diff changeset	120
1470183068b8 storageutil: invert logic of file data comparison Gregory Szorc <gregory.szorc@gmail.com> parents: 40007 diff changeset	121 When a stored revision is censored, filedata must be empty to have
1470183068b8 storageutil: invert logic of file data comparison Gregory Szorc <gregory.szorc@gmail.com> parents: 40007 diff changeset	122 equivalence.
1470183068b8 storageutil: invert logic of file data comparison Gregory Szorc <gregory.szorc@gmail.com> parents: 40007 diff changeset	123
1470183068b8 storageutil: invert logic of file data comparison Gregory Szorc <gregory.szorc@gmail.com> parents: 40007 diff changeset	124 When a stored revision has copy metadata, it is ignored as part
1470183068b8 storageutil: invert logic of file data comparison Gregory Szorc <gregory.szorc@gmail.com> parents: 40007 diff changeset	125 of the compare.
1470183068b8 storageutil: invert logic of file data comparison Gregory Szorc <gregory.szorc@gmail.com> parents: 40007 diff changeset	126 """
40007 422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	127
422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	128 if filedata.startswith(b'\x01\n'):
422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	129 revisiontext = b'\x01\n\x01\n' + filedata
422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	130 else:
422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	131 revisiontext = filedata
422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	132
422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	133 p1, p2 = store.parents(node)
422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	134
422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	135 computednode = hashrevisionsha1(revisiontext, p1, p2)
422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	136
422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	137 if computednode == node:
40008 1470183068b8 storageutil: invert logic of file data comparison Gregory Szorc <gregory.szorc@gmail.com> parents: 40007 diff changeset	138 return True
40007 422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	139
422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	140 # Censored files compare against the empty file.
422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	141 if store.iscensored(store.rev(node)):
40008 1470183068b8 storageutil: invert logic of file data comparison Gregory Szorc <gregory.szorc@gmail.com> parents: 40007 diff changeset	142 return filedata == b''
40007 422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	143
422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	144 # Renaming a file produces a different hash, even if the data
422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	145 # remains unchanged. Check if that's the case.
422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	146 if store.renamed(node):
40008 1470183068b8 storageutil: invert logic of file data comparison Gregory Szorc <gregory.szorc@gmail.com> parents: 40007 diff changeset	147 return store.read(node) == filedata
40007 422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	148
40008 1470183068b8 storageutil: invert logic of file data comparison Gregory Szorc <gregory.szorc@gmail.com> parents: 40007 diff changeset	149 return False
40007 422beffd71ba storageutil: extract filelog.cmp() to a standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40006 diff changeset	150
39886 d63153611ed5 storageutil: extract revision number iteration Gregory Szorc <gregory.szorc@gmail.com> parents: 39885 diff changeset	151 def iterrevs(storelen, start=0, stop=None):
d63153611ed5 storageutil: extract revision number iteration Gregory Szorc <gregory.szorc@gmail.com> parents: 39885 diff changeset	152 """Iterate over revision numbers in a store."""
d63153611ed5 storageutil: extract revision number iteration Gregory Szorc <gregory.szorc@gmail.com> parents: 39885 diff changeset	153 step = 1
d63153611ed5 storageutil: extract revision number iteration Gregory Szorc <gregory.szorc@gmail.com> parents: 39885 diff changeset	154
d63153611ed5 storageutil: extract revision number iteration Gregory Szorc <gregory.szorc@gmail.com> parents: 39885 diff changeset	155 if stop is not None:
d63153611ed5 storageutil: extract revision number iteration Gregory Szorc <gregory.szorc@gmail.com> parents: 39885 diff changeset	156 if start > stop:
d63153611ed5 storageutil: extract revision number iteration Gregory Szorc <gregory.szorc@gmail.com> parents: 39885 diff changeset	157 step = -1
d63153611ed5 storageutil: extract revision number iteration Gregory Szorc <gregory.szorc@gmail.com> parents: 39885 diff changeset	158 stop += step
d63153611ed5 storageutil: extract revision number iteration Gregory Szorc <gregory.szorc@gmail.com> parents: 39885 diff changeset	159 if stop > storelen:
d63153611ed5 storageutil: extract revision number iteration Gregory Szorc <gregory.szorc@gmail.com> parents: 39885 diff changeset	160 stop = storelen
d63153611ed5 storageutil: extract revision number iteration Gregory Szorc <gregory.szorc@gmail.com> parents: 39885 diff changeset	161 else:
d63153611ed5 storageutil: extract revision number iteration Gregory Szorc <gregory.szorc@gmail.com> parents: 39885 diff changeset	162 stop = storelen
d63153611ed5 storageutil: extract revision number iteration Gregory Szorc <gregory.szorc@gmail.com> parents: 39885 diff changeset	163
d63153611ed5 storageutil: extract revision number iteration Gregory Szorc <gregory.szorc@gmail.com> parents: 39885 diff changeset	164 return pycompat.xrange(start, stop, step)
40003 0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	165
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	166 def fileidlookup(store, fileid, identifier):
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	167 """Resolve the file node for a value.
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	168
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	169 ``store`` is an object implementing the ``ifileindex`` interface.
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	170
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	171 ``fileid`` can be:
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	172
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	173 * A 20 byte binary node.
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	174 * An integer revision number
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	175 * A 40 byte hex node.
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	176 * A bytes that can be parsed as an integer representing a revision number.
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	177
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	178 ``identifier`` is used to populate ``error.LookupError`` with an identifier
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	179 for the store.
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	180
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	181 Raises ``error.LookupError`` on failure.
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	182 """
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	183 if isinstance(fileid, int):
40004 ad8389ecd3f5 storageutil: consistently raise LookupError (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 40003 diff changeset	184 try:
ad8389ecd3f5 storageutil: consistently raise LookupError (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 40003 diff changeset	185 return store.node(fileid)
ad8389ecd3f5 storageutil: consistently raise LookupError (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 40003 diff changeset	186 except IndexError:
40321 6994a8be3663 storageutil: convert fileid to bytes to avoid cast to %s Gregory Szorc <gregory.szorc@gmail.com> parents: 40011 diff changeset	187 raise error.LookupError('%d' % fileid, identifier,
6994a8be3663 storageutil: convert fileid to bytes to avoid cast to %s Gregory Szorc <gregory.szorc@gmail.com> parents: 40011 diff changeset	188 _('no match found'))
40003 0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	189
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	190 if len(fileid) == 20:
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	191 try:
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	192 store.rev(fileid)
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	193 return fileid
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	194 except error.LookupError:
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	195 pass
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	196
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	197 if len(fileid) == 40:
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	198 try:
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	199 rawnode = bin(fileid)
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	200 store.rev(rawnode)
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	201 return rawnode
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	202 except TypeError:
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	203 pass
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	204
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	205 try:
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	206 rev = int(fileid)
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	207
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	208 if b'%d' % rev != fileid:
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	209 raise ValueError
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	210
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	211 try:
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	212 return store.node(rev)
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	213 except (IndexError, TypeError):
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	214 pass
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	215 except (ValueError, OverflowError):
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	216 pass
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	217
0e8836be9541 storageutil: implement file identifier resolution method (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 39886 diff changeset	218 raise error.LookupError(fileid, identifier, _('no match found'))
40005 fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	219
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	220 def resolvestripinfo(minlinkrev, tiprev, headrevs, linkrevfn, parentrevsfn):
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	221 """Resolve information needed to strip revisions.
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	222
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	223 Finds the minimum revision number that must be stripped in order to
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	224 strip ``minlinkrev``.
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	225
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	226 Returns a 2-tuple of the minimum revision number to do that and a set
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	227 of all revision numbers that have linkrevs that would be broken
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	228 by that strip.
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	229
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	230 ``tiprev`` is the current tip-most revision. It is ``len(store) - 1``.
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	231 ``headrevs`` is an iterable of head revisions.
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	232 ``linkrevfn`` is a callable that receives a revision and returns a linked
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	233 revision.
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	234 ``parentrevsfn`` is a callable that receives a revision number and returns
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	235 an iterable of its parent revision numbers.
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	236 """
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	237 brokenrevs = set()
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	238 strippoint = tiprev + 1
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	239
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	240 heads = {}
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	241 futurelargelinkrevs = set()
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	242 for head in headrevs:
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	243 headlinkrev = linkrevfn(head)
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	244 heads[head] = headlinkrev
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	245 if headlinkrev >= minlinkrev:
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	246 futurelargelinkrevs.add(headlinkrev)
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	247
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	248 # This algorithm involves walking down the rev graph, starting at the
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	249 # heads. Since the revs are topologically sorted according to linkrev,
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	250 # once all head linkrevs are below the minlink, we know there are
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	251 # no more revs that could have a linkrev greater than minlink.
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	252 # So we can stop walking.
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	253 while futurelargelinkrevs:
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	254 strippoint -= 1
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	255 linkrev = heads.pop(strippoint)
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	256
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	257 if linkrev < minlinkrev:
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	258 brokenrevs.add(strippoint)
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	259 else:
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	260 futurelargelinkrevs.remove(linkrev)
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	261
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	262 for p in parentrevsfn(strippoint):
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	263 if p != nullrev:
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	264 plinkrev = linkrevfn(p)
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	265 heads[p] = plinkrev
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	266 if plinkrev >= minlinkrev:
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	267 futurelargelinkrevs.add(plinkrev)
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	268
fa3dc85a747e storageutil: extract functionality for resolving strip revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 40004 diff changeset	269 return strippoint, brokenrevs
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	270
40011 f5d819d84461 storageutil: pass nodes into emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 40010 diff changeset	271 def emitrevisions(store, nodes, nodesorder, resultcls, deltaparentfn=None,
f5d819d84461 storageutil: pass nodes into emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 40010 diff changeset	272 candeltafn=None, rawsizefn=None, revdifffn=None, flagsfn=None,
40495 59a870a4ad6e changegroup: refactor emitrevision to use a `deltamode` argument Boris Feld <boris.feld@octobus.net> parents: 40325 diff changeset	273 deltamode=repository.CG_DELTAMODE_STD,
59a870a4ad6e changegroup: refactor emitrevision to use a `deltamode` argument Boris Feld <boris.feld@octobus.net> parents: 40325 diff changeset	274 revisiondata=False, assumehaveparentrevisions=False):
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	275 """Generic implementation of ifiledata.emitrevisions().
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	276
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	277 Emitting revision data is subtly complex. This function attempts to
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	278 encapsulate all the logic for doing so in a backend-agnostic way.
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	279
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	280 ``store``
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	281 Object conforming to ``ifilestorage`` interface.
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	282
40011 f5d819d84461 storageutil: pass nodes into emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 40010 diff changeset	283 ``nodes``
f5d819d84461 storageutil: pass nodes into emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 40010 diff changeset	284 List of revision nodes whose data to emit.
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	285
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	286 ``resultcls``
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	287 A type implementing the ``irevisiondelta`` interface that will be
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	288 constructed and returned.
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	289
40010 631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	290 ``deltaparentfn`` (optional)
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	291 Callable receiving a revision number and returning the revision number
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	292 of a revision that the internal delta is stored against. This delta
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	293 will be preferred over computing a new arbitrary delta.
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	294
40010 631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	295 If not defined, a delta will always be computed from raw revision
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	296 data.
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	297
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	298 ``candeltafn`` (optional)
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	299 Callable receiving a pair of revision numbers that returns a bool
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	300 indicating whether a delta between them can be produced.
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	301
40010 631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	302 If not defined, it is assumed that any two revisions can delta with
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	303 each other.
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	304
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	305 ``rawsizefn`` (optional)
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	306 Callable receiving a revision number and returning the length of the
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	307 ``store.revision(rev, raw=True)``.
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	308
40010 631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	309 If not defined, ``len(store.revision(rev, raw=True))`` will be called.
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	310
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	311 ``revdifffn`` (optional)
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	312 Callable receiving a pair of revision numbers that returns a delta
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	313 between them.
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	314
40010 631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	315 If not defined, a delta will be computed by invoking mdiff code
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	316 on ``store.revision()`` results.
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	317
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	318 Defining this function allows a precomputed or stored delta to be
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	319 used without having to compute on.
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	320
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	321 ``flagsfn`` (optional)
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	322 Callable receiving a revision number and returns the integer flags
40010 631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	323 value for it. If not defined, flags value will be 0.
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	324
40495 59a870a4ad6e changegroup: refactor emitrevision to use a `deltamode` argument Boris Feld <boris.feld@octobus.net> parents: 40325 diff changeset	325 ``deltamode``
59a870a4ad6e changegroup: refactor emitrevision to use a `deltamode` argument Boris Feld <boris.feld@octobus.net> parents: 40325 diff changeset	326 constaint on delta to be sent:
59a870a4ad6e changegroup: refactor emitrevision to use a `deltamode` argument Boris Feld <boris.feld@octobus.net> parents: 40325 diff changeset	327 * CG_DELTAMODE_STD - normal mode, try to reuse storage deltas,
59a870a4ad6e changegroup: refactor emitrevision to use a `deltamode` argument Boris Feld <boris.feld@octobus.net> parents: 40325 diff changeset	328 * CG_DELTAMODE_PREV - only delta against "prev",
59a870a4ad6e changegroup: refactor emitrevision to use a `deltamode` argument Boris Feld <boris.feld@octobus.net> parents: 40325 diff changeset	329 * CG_DELTAMODE_FULL - only issue full snapshot.
59a870a4ad6e changegroup: refactor emitrevision to use a `deltamode` argument Boris Feld <boris.feld@octobus.net> parents: 40325 diff changeset	330
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	331 Whether to send fulltext revisions instead of deltas, if allowed.
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	332
40011 f5d819d84461 storageutil: pass nodes into emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 40010 diff changeset	333 ``nodesorder``
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	334 ``revisiondata``
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	335 ``assumehaveparentrevisions``
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	336 """
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	337
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	338 fnode = store.node
40011 f5d819d84461 storageutil: pass nodes into emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 40010 diff changeset	339 frev = store.rev
f5d819d84461 storageutil: pass nodes into emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 40010 diff changeset	340
f5d819d84461 storageutil: pass nodes into emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 40010 diff changeset	341 if nodesorder == 'nodes':
f5d819d84461 storageutil: pass nodes into emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 40010 diff changeset	342 revs = [frev(n) for n in nodes]
f5d819d84461 storageutil: pass nodes into emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 40010 diff changeset	343 elif nodesorder == 'storage':
f5d819d84461 storageutil: pass nodes into emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 40010 diff changeset	344 revs = sorted(frev(n) for n in nodes)
f5d819d84461 storageutil: pass nodes into emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 40010 diff changeset	345 else:
f5d819d84461 storageutil: pass nodes into emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 40010 diff changeset	346 revs = set(frev(n) for n in nodes)
f5d819d84461 storageutil: pass nodes into emitrevisions() Gregory Szorc <gregory.szorc@gmail.com> parents: 40010 diff changeset	347 revs = dagop.linearize(revs, store.parentrevs)
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	348
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	349 prevrev = None
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	350
40495 59a870a4ad6e changegroup: refactor emitrevision to use a `deltamode` argument Boris Feld <boris.feld@octobus.net> parents: 40325 diff changeset	351 if deltamode == repository.CG_DELTAMODE_PREV or assumehaveparentrevisions:
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	352 prevrev = store.parentrevs(revs[0])[0]
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	353
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	354 # Set of revs available to delta against.
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	355 available = set()
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	356
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	357 for rev in revs:
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	358 if rev == nullrev:
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	359 continue
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	360
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	361 node = fnode(rev)
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	362 p1rev, p2rev = store.parentrevs(rev)
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	363
40010 631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	364 if deltaparentfn:
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	365 deltaparentrev = deltaparentfn(rev)
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	366 else:
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	367 deltaparentrev = nullrev
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	368
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	369 # Forced delta against previous mode.
40495 59a870a4ad6e changegroup: refactor emitrevision to use a `deltamode` argument Boris Feld <boris.feld@octobus.net> parents: 40325 diff changeset	370 if deltamode == repository.CG_DELTAMODE_PREV:
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	371 baserev = prevrev
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	372
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	373 # We're instructed to send fulltext. Honor that.
40495 59a870a4ad6e changegroup: refactor emitrevision to use a `deltamode` argument Boris Feld <boris.feld@octobus.net> parents: 40325 diff changeset	374 elif deltamode == repository.CG_DELTAMODE_FULL:
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	375 baserev = nullrev
40497 968dd7e02ac5 changegroup: allow to force delta to be against p1 Boris Feld <boris.feld@octobus.net> parents: 40495 diff changeset	376 # We're instructed to use p1. Honor that
968dd7e02ac5 changegroup: allow to force delta to be against p1 Boris Feld <boris.feld@octobus.net> parents: 40495 diff changeset	377 elif deltamode == repository.CG_DELTAMODE_P1:
968dd7e02ac5 changegroup: allow to force delta to be against p1 Boris Feld <boris.feld@octobus.net> parents: 40495 diff changeset	378 baserev = p1rev
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	379
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	380 # There is a delta in storage. We try to use that because it
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	381 # amounts to effectively copying data from storage and is
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	382 # therefore the fastest.
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	383 elif deltaparentrev != nullrev:
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	384 # Base revision was already emitted in this group. We can
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	385 # always safely use the delta.
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	386 if deltaparentrev in available:
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	387 baserev = deltaparentrev
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	388
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	389 # Base revision is a parent that hasn't been emitted already.
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	390 # Use it if we can assume the receiver has the parent revision.
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	391 elif (assumehaveparentrevisions
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	392 and deltaparentrev in (p1rev, p2rev)):
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	393 baserev = deltaparentrev
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	394
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	395 # No guarantee the receiver has the delta parent. Send delta
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	396 # against last revision (if possible), which in the common case
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	397 # should be similar enough to this revision that the delta is
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	398 # reasonable.
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	399 elif prevrev is not None:
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	400 baserev = prevrev
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	401 else:
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	402 baserev = nullrev
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	403
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	404 # Storage has a fulltext revision.
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	405
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	406 # Let's use the previous revision, which is as good a guess as any.
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	407 # There is definitely room to improve this logic.
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	408 elif prevrev is not None:
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	409 baserev = prevrev
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	410 else:
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	411 baserev = nullrev
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	412
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	413 # But we can't actually use our chosen delta base for whatever
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	414 # reason. Reset to fulltext.
40010 631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	415 if baserev != nullrev and (candeltafn and not candeltafn(baserev, rev)):
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	416 baserev = nullrev
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	417
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	418 revision = None
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	419 delta = None
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	420 baserevisionsize = None
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	421
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	422 if revisiondata:
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	423 if store.iscensored(baserev) or store.iscensored(rev):
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	424 try:
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	425 revision = store.revision(node, raw=True)
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	426 except error.CensoredNodeError as e:
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	427 revision = e.tombstone
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	428
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	429 if baserev != nullrev:
40010 631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	430 if rawsizefn:
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	431 baserevisionsize = rawsizefn(baserev)
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	432 else:
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	433 baserevisionsize = len(store.revision(baserev,
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	434 raw=True))
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	435
40495 59a870a4ad6e changegroup: refactor emitrevision to use a `deltamode` argument Boris Feld <boris.feld@octobus.net> parents: 40325 diff changeset	436 elif (baserev == nullrev
59a870a4ad6e changegroup: refactor emitrevision to use a `deltamode` argument Boris Feld <boris.feld@octobus.net> parents: 40325 diff changeset	437 and deltamode != repository.CG_DELTAMODE_PREV):
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	438 revision = store.revision(node, raw=True)
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	439 available.add(rev)
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	440 else:
40010 631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	441 if revdifffn:
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	442 delta = revdifffn(baserev, rev)
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	443 else:
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	444 delta = mdiff.textdiff(store.revision(baserev, raw=True),
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	445 store.revision(rev, raw=True))
631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	446
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	447 available.add(rev)
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	448
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	449 yield resultcls(
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	450 node=node,
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	451 p1node=fnode(p1rev),
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	452 p2node=fnode(p2rev),
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	453 basenode=fnode(baserev),
40010 631c6f5058b9 storageutil: make all callables optional Gregory Szorc <gregory.szorc@gmail.com> parents: 40009 diff changeset	454 flags=flagsfn(rev) if flagsfn else 0,
40009 842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	455 baserevisionsize=baserevisionsize,
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	456 revision=revision,
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	457 delta=delta)
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	458
842ffcf1d42f storageutil: extract most of emitrevisions() to standalone function Gregory Szorc <gregory.szorc@gmail.com> parents: 40008 diff changeset	459 prevrev = rev
40325 b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	460
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	461 def deltaiscensored(delta, baserev, baselenfn):
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	462 """Determine if a delta represents censored revision data.
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	463
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	464 ``baserev`` is the base revision this delta is encoded against.
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	465 ``baselenfn`` is a callable receiving a revision number that resolves the
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	466 length of the revision fulltext.
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	467
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	468 Returns a bool indicating if the result of the delta represents a censored
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	469 revision.
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	470 """
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	471 # Fragile heuristic: unless new file meta keys are added alphabetically
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	472 # preceding "censored", all censored revisions are prefixed by
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	473 # "\1\ncensored:". A delta producing such a censored revision must be a
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	474 # full-replacement delta, so we inspect the first and only patch in the
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	475 # delta for this prefix.
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	476 hlen = struct.calcsize(">lll")
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	477 if len(delta) <= hlen:
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	478 return False
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	479
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	480 oldlen = baselenfn(baserev)
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	481 newlen = len(delta) - hlen
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	482 if delta[:hlen] != mdiff.replacediffheader(oldlen, newlen):
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	483 return False
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	484
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	485 add = "\1\ncensored:"
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	486 addlen = len(add)
b0fbd1792e2d storageutil: extract most of peek_censored from revlog Gregory Szorc <gregory.szorc@gmail.com> parents: 40321 diff changeset	487 return newlen >= addlen and delta[hlen:hlen + addlen] == add

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/utils/storageutil.py @ 40497:968dd7e02ac5