mercurial-scm/hg-stable: mercurial/filelog.py annotate

annotate mercurial/filelog.py @ 39847:97986c9c69d3

verify: start to abstract file verification Currently, the file storage interface has a handful of attributes that are exclusively or near-exclusively used by repo verification code. In order to support verification on non-revlog/alternate storage backends, we'll need to abstract verification so it can be performed in a storage-agnostic way. This commit starts that process. We establish a new verifyintegrity() method on revlogs and expose it to the file storage interface. Most of verify.verifier.checklog() has been ported to this new method. We need a way to represent verification problems. So we invent an interface to represent a verification problem, invent a revlog type to implement that interface, and use it. The arguments to verifyintegrity() will almost certainly change in the future, once more functionality is ported from the verify code. And the "revlogv1" version check is very hacky. (The code in verify is actually buggy because it is comparing the full 32-bit header integer instead of just the revlog version short. I'll likely fix this in a subsequent commit.) Differential Revision: https://phab.mercurial-scm.org/D4701

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Wed, 19 Sep 2018 11:17:28 -0700
parents	979e9f124caa
children	68282a7b29a7

rev	line source
1089 142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	1 # filelog.py - file history class for mercurial
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	2 #
4635 63b9d2deed48 Updated copyright notices and add "and others" to "hg version" Thomas Arendsen Hein <thomas@intevation.de> parents: 4258 diff changeset	3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 7634 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 8531 diff changeset	6 # GNU General Public License version 2 or any later version.
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	7
25948 34bd1a5eef5b filelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 24255 diff changeset	8 from __future__ import absolute_import
34bd1a5eef5b filelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 24255 diff changeset	9
34bd1a5eef5b filelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 24255 diff changeset	10 from . import (
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	11 error,
37441 a3202fa83aff filelog: declare that filelog implements a storage interface Gregory Szorc <gregory.szorc@gmail.com> parents: 35567 diff changeset	12 repository,
25948 34bd1a5eef5b filelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 24255 diff changeset	13 revlog,
34bd1a5eef5b filelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 24255 diff changeset	14 )
37810 856f381ad74b interfaceutil: module to stub out zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37497 diff changeset	15 from .utils import (
856f381ad74b interfaceutil: module to stub out zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37497 diff changeset	16 interfaceutil,
856f381ad74b interfaceutil: module to stub out zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37497 diff changeset	17 )
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	18
37810 856f381ad74b interfaceutil: module to stub out zope.interface Gregory Szorc <gregory.szorc@gmail.com> parents: 37497 diff changeset	19 @interfaceutil.implementer(repository.ifilestorage)
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	20 class filelog(object):
4258 b11a2fb59cf5 revlog: simplify revlog version handling Matt Mackall <mpm@selenic.com> parents: 4257 diff changeset	21 def __init__(self, opener, path):
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	22 self._revlog = revlog.revlog(opener,
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	23 '/'.join(('data', path + '.i')),
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	24 censorable=True)
39799 76f92d208f7a filelog: record what's using attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 39798 diff changeset	25 # Full name of the user visible file, relative to the repository root.
76f92d208f7a filelog: record what's using attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 39798 diff changeset	26 # Used by LFS.
35567 07769a04bc66 filelog: add the ability to report the user facing name Matt Harbison <matt_harbison@yahoo.com> parents: 34041 diff changeset	27 self.filename = path
39799 76f92d208f7a filelog: record what's using attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 39798 diff changeset	28 # Used by repo upgrade.
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	29 self.index = self._revlog.index
39799 76f92d208f7a filelog: record what's using attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 39798 diff changeset	30 # Used by verify.
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	31 self.version = self._revlog.version
39799 76f92d208f7a filelog: record what's using attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 39798 diff changeset	32 # Used by changegroup generation.
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	33 self._generaldelta = self._revlog._generaldelta
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	34
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	35 def __len__(self):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	36 return len(self._revlog)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	37
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	38 def __iter__(self):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	39 return self._revlog.__iter__()
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	40
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	41 def revs(self, start=0, stop=None):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	42 return self._revlog.revs(start=start, stop=stop)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	43
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	44 def parents(self, node):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	45 return self._revlog.parents(node)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	46
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	47 def parentrevs(self, rev):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	48 return self._revlog.parentrevs(rev)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	49
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	50 def rev(self, node):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	51 return self._revlog.rev(node)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	52
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	53 def node(self, rev):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	54 return self._revlog.node(rev)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	55
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	56 def lookup(self, node):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	57 return self._revlog.lookup(node)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	58
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	59 def linkrev(self, rev):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	60 return self._revlog.linkrev(rev)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	61
39799 76f92d208f7a filelog: record what's using attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 39798 diff changeset	62 # Used by LFS, verify.
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	63 def flags(self, rev):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	64 return self._revlog.flags(rev)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	65
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	66 def commonancestorsheads(self, node1, node2):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	67 return self._revlog.commonancestorsheads(node1, node2)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	68
39799 76f92d208f7a filelog: record what's using attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 39798 diff changeset	69 # Used by dagop.blockdescendants().
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	70 def descendants(self, revs):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	71 return self._revlog.descendants(revs)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	72
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	73 def heads(self, start=None, stop=None):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	74 return self._revlog.heads(start, stop)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	75
39799 76f92d208f7a filelog: record what's using attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 39798 diff changeset	76 # Used by hgweb, children extension.
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	77 def children(self, node):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	78 return self._revlog.children(node)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	79
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	80 def deltaparent(self, rev):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	81 return self._revlog.deltaparent(rev)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	82
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	83 def iscensored(self, rev):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	84 return self._revlog.iscensored(rev)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	85
39799 76f92d208f7a filelog: record what's using attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 39798 diff changeset	86 # Used by verify.
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	87 def rawsize(self, rev):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	88 return self._revlog.rawsize(rev)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	89
39799 76f92d208f7a filelog: record what's using attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 39798 diff changeset	90 # Might be unused.
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	91 def checkhash(self, text, node, p1=None, p2=None, rev=None):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	92 return self._revlog.checkhash(text, node, p1=p1, p2=p2, rev=rev)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	93
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	94 def revision(self, node, _df=None, raw=False):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	95 return self._revlog.revision(node, _df=_df, raw=raw)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	96
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	97 def revdiff(self, rev1, rev2):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	98 return self._revlog.revdiff(rev1, rev2)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	99
39259 b41d023a412a repository: establish API for emitting revision deltas Gregory Szorc <gregory.szorc@gmail.com> parents: 38736 diff changeset	100 def emitrevisiondeltas(self, requests):
b41d023a412a repository: establish API for emitting revision deltas Gregory Szorc <gregory.szorc@gmail.com> parents: 38736 diff changeset	101 return self._revlog.emitrevisiondeltas(requests)
b41d023a412a repository: establish API for emitting revision deltas Gregory Szorc <gregory.szorc@gmail.com> parents: 38736 diff changeset	102
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	103 def addrevision(self, revisiondata, transaction, linkrev, p1, p2,
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	104 node=None, flags=revlog.REVIDX_DEFAULT_FLAGS,
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	105 cachedelta=None):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	106 return self._revlog.addrevision(revisiondata, transaction, linkrev,
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	107 p1, p2, node=node, flags=flags,
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	108 cachedelta=cachedelta)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	109
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	110 def addgroup(self, deltas, linkmapper, transaction, addrevisioncb=None):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	111 return self._revlog.addgroup(deltas, linkmapper, transaction,
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	112 addrevisioncb=addrevisioncb)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	113
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	114 def getstrippoint(self, minlink):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	115 return self._revlog.getstrippoint(minlink)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	116
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	117 def strip(self, minlink, transaction):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	118 return self._revlog.strip(minlink, transaction)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	119
39794 a6b3c4c1019f revlog: move censor logic out of censor extension Gregory Szorc <gregory.szorc@gmail.com> parents: 39781 diff changeset	120 def censorrevision(self, tr, node, tombstone=b''):
a6b3c4c1019f revlog: move censor logic out of censor extension Gregory Szorc <gregory.szorc@gmail.com> parents: 39781 diff changeset	121 return self._revlog.censorrevision(node, tombstone=tombstone)
a6b3c4c1019f revlog: move censor logic out of censor extension Gregory Szorc <gregory.szorc@gmail.com> parents: 39781 diff changeset	122
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	123 def files(self):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	124 return self._revlog.files()
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	125
39799 76f92d208f7a filelog: record what's using attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 39798 diff changeset	126 # Used by verify.
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	127 def checksize(self):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	128 return self._revlog.checksize()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	129
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	130 def read(self, node):
360 10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	131 t = self.revision(node)
686 d7d68d27ebe5 Reapply startswith() changes that got lost with stale edit Matt Mackall <mpm@selenic.com> parents: 681 diff changeset	132 if not t.startswith('\1\n'):
360 10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	133 return t
2579 0875cda033fd use __contains__, index or split instead of str.find Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2470 diff changeset	134 s = t.index('\1\n', 2)
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	135 return t[s + 2:]
360 10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	136
10519e4cbd02 filelog: add metadata support mpm@selenic.com parents: 358 diff changeset	137 def add(self, text, meta, transaction, link, p1=None, p2=None):
686 d7d68d27ebe5 Reapply startswith() changes that got lost with stale edit Matt Mackall <mpm@selenic.com> parents: 681 diff changeset	138 if meta or text.startswith('\1\n'):
37442 0596d27457c6 revlog: move parsemeta() and packmeta() from filelog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37441 diff changeset	139 text = revlog.packmeta(meta, text)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	140 return self.addrevision(text, transaction, link, p1, p2)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	141
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1089 diff changeset	142 def renamed(self, node):
7634 14a4337a9b9b revlog: kill from-style imports Matt Mackall <mpm@selenic.com> parents: 7622 diff changeset	143 if self.parents(node)[0] != revlog.nullid:
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1089 diff changeset	144 return False
13240 e5060aa22043 filelog: move metadata parsing to a helper function Matt Mackall <mpm@selenic.com> parents: 11541 diff changeset	145 t = self.revision(node)
37442 0596d27457c6 revlog: move parsemeta() and packmeta() from filelog (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37441 diff changeset	146 m = revlog.parsemeta(t)[0]
37833 6614cac550ae filelog: don't crash on invalid copy metadata (issue5748) Gregory Szorc <gregory.szorc@gmail.com> parents: 37810 diff changeset	147 # copy and copyrev occur in pairs. In rare cases due to bugs,
6614cac550ae filelog: don't crash on invalid copy metadata (issue5748) Gregory Szorc <gregory.szorc@gmail.com> parents: 37810 diff changeset	148 # one can occur without the other.
6614cac550ae filelog: don't crash on invalid copy metadata (issue5748) Gregory Szorc <gregory.szorc@gmail.com> parents: 37810 diff changeset	149 if m and "copy" in m and "copyrev" in m:
7634 14a4337a9b9b revlog: kill from-style imports Matt Mackall <mpm@selenic.com> parents: 7622 diff changeset	150 return (m["copy"], revlog.bin(m["copyrev"]))
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1089 diff changeset	151 return False
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1089 diff changeset	152
2898 db397c38005d merge: use file size stored in revlog index Matt Mackall <mpm@selenic.com> parents: 2895 diff changeset	153 def size(self, rev):
db397c38005d merge: use file size stored in revlog index Matt Mackall <mpm@selenic.com> parents: 2895 diff changeset	154 """return the size of a given revision"""
db397c38005d merge: use file size stored in revlog index Matt Mackall <mpm@selenic.com> parents: 2895 diff changeset	155
db397c38005d merge: use file size stored in revlog index Matt Mackall <mpm@selenic.com> parents: 2895 diff changeset	156 # for revisions with renames, we have to go the slow way
db397c38005d merge: use file size stored in revlog index Matt Mackall <mpm@selenic.com> parents: 2895 diff changeset	157 node = self.node(rev)
db397c38005d merge: use file size stored in revlog index Matt Mackall <mpm@selenic.com> parents: 2895 diff changeset	158 if self.renamed(node):
db397c38005d merge: use file size stored in revlog index Matt Mackall <mpm@selenic.com> parents: 2895 diff changeset	159 return len(self.read(node))
24118 76f6ae06ddf5 revlog: add "iscensored()" to revlog public API Mike Edgar <adgar@google.com> parents: 24117 diff changeset	160 if self.iscensored(rev):
22597 58ec36686f0e filelog: censored files compare against empty data, have 0 size Mike Edgar <adgar@google.com> parents: 22596 diff changeset	161 return 0
2898 db397c38005d merge: use file size stored in revlog index Matt Mackall <mpm@selenic.com> parents: 2895 diff changeset	162
11540 2370e270a29a filelog: test behaviour for data starting with "\1\n" Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11539 diff changeset	163 # XXX if self.read(node).startswith("\1\n"), this returns (size+4)
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	164 return self._revlog.size(rev)
2898 db397c38005d merge: use file size stored in revlog index Matt Mackall <mpm@selenic.com> parents: 2895 diff changeset	165
2887 05257fd28591 filelog: add hash-based comparisons Matt Mackall <mpm@selenic.com> parents: 2859 diff changeset	166 def cmp(self, node, text):
11539 a463e3c50212 cmp: document the fact that we return True if content is different Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10706 diff changeset	167 """compare text with a given file revision
a463e3c50212 cmp: document the fact that we return True if content is different Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10706 diff changeset	168
a463e3c50212 cmp: document the fact that we return True if content is different Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10706 diff changeset	169 returns True if text is different than what is stored.
a463e3c50212 cmp: document the fact that we return True if content is different Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10706 diff changeset	170 """
2887 05257fd28591 filelog: add hash-based comparisons Matt Mackall <mpm@selenic.com> parents: 2859 diff changeset	171
11541 ab9fa7a85dd9 filelog: cmp: don't read data if hashes are identical (issue2273) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11540 diff changeset	172 t = text
ab9fa7a85dd9 filelog: cmp: don't read data if hashes are identical (issue2273) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11540 diff changeset	173 if text.startswith('\1\n'):
ab9fa7a85dd9 filelog: cmp: don't read data if hashes are identical (issue2273) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11540 diff changeset	174 t = '\1\n\1\n' + text
ab9fa7a85dd9 filelog: cmp: don't read data if hashes are identical (issue2273) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11540 diff changeset	175
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	176 samehashes = not self._revlog.cmp(node, t)
11541 ab9fa7a85dd9 filelog: cmp: don't read data if hashes are identical (issue2273) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11540 diff changeset	177 if samehashes:
ab9fa7a85dd9 filelog: cmp: don't read data if hashes are identical (issue2273) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11540 diff changeset	178 return False
ab9fa7a85dd9 filelog: cmp: don't read data if hashes are identical (issue2273) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11540 diff changeset	179
22597 58ec36686f0e filelog: censored files compare against empty data, have 0 size Mike Edgar <adgar@google.com> parents: 22596 diff changeset	180 # censored files compare against the empty file
24118 76f6ae06ddf5 revlog: add "iscensored()" to revlog public API Mike Edgar <adgar@google.com> parents: 24117 diff changeset	181 if self.iscensored(self.rev(node)):
22597 58ec36686f0e filelog: censored files compare against empty data, have 0 size Mike Edgar <adgar@google.com> parents: 22596 diff changeset	182 return text != ''
58ec36686f0e filelog: censored files compare against empty data, have 0 size Mike Edgar <adgar@google.com> parents: 22596 diff changeset	183
11541 ab9fa7a85dd9 filelog: cmp: don't read data if hashes are identical (issue2273) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11540 diff changeset	184 # renaming a file produces a different hash, even if the data
ab9fa7a85dd9 filelog: cmp: don't read data if hashes are identical (issue2273) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11540 diff changeset	185 # remains unchanged. Check if it's the case (slow):
ab9fa7a85dd9 filelog: cmp: don't read data if hashes are identical (issue2273) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11540 diff changeset	186 if self.renamed(node):
2887 05257fd28591 filelog: add hash-based comparisons Matt Mackall <mpm@selenic.com> parents: 2859 diff changeset	187 t2 = self.read(node)
2895 21631c2c09a5 filelog.cmp: return 0 for equality Matt Mackall <mpm@selenic.com> parents: 2890 diff changeset	188 return t2 != text
2887 05257fd28591 filelog: add hash-based comparisons Matt Mackall <mpm@selenic.com> parents: 2859 diff changeset	189
11541 ab9fa7a85dd9 filelog: cmp: don't read data if hashes are identical (issue2273) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11540 diff changeset	190 return True
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	191
39847 97986c9c69d3 verify: start to abstract file verification Gregory Szorc <gregory.szorc@gmail.com> parents: 39801 diff changeset	192 def verifyintegrity(self, state):
97986c9c69d3 verify: start to abstract file verification Gregory Szorc <gregory.szorc@gmail.com> parents: 39801 diff changeset	193 return self._revlog.verifyintegrity(state)
97986c9c69d3 verify: start to abstract file verification Gregory Szorc <gregory.szorc@gmail.com> parents: 39801 diff changeset	194
39799 76f92d208f7a filelog: record what's using attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 39798 diff changeset	195 # TODO these aren't part of the interface and aren't internal methods.
76f92d208f7a filelog: record what's using attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 39798 diff changeset	196 # Callers should be fixed to not use them.
76f92d208f7a filelog: record what's using attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 39798 diff changeset	197
76f92d208f7a filelog: record what's using attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 39798 diff changeset	198 # Used by LFS.
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	199 @property
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	200 def filename(self):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	201 return self._revlog.filename
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	202
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	203 @filename.setter
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	204 def filename(self, value):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	205 self._revlog.filename = value
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	206
39799 76f92d208f7a filelog: record what's using attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 39798 diff changeset	207 # Used by bundlefilelog, unionfilelog.
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	208 @property
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	209 def indexfile(self):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	210 return self._revlog.indexfile
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	211
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	212 @indexfile.setter
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	213 def indexfile(self, value):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	214 self._revlog.indexfile = value
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	215
39799 76f92d208f7a filelog: record what's using attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 39798 diff changeset	216 # Used by LFS, repo upgrade.
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	217 @property
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	218 def opener(self):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	219 return self._revlog.opener
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	220
39799 76f92d208f7a filelog: record what's using attributes Gregory Szorc <gregory.szorc@gmail.com> parents: 39798 diff changeset	221 # Used by repo upgrade.
37497 1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	222 def clone(self, tr, destrevlog, **kwargs):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	223 if not isinstance(destrevlog, filelog):
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	224 raise error.ProgrammingError('expected filelog to clone()')
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	225
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	226 return self._revlog.clone(tr, destrevlog._revlog, **kwargs)
1541e1a8e87d filelog: wrap revlog instead of inheriting it (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 37443 diff changeset	227
39781 3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	228 class narrowfilelog(filelog):
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	229 """Filelog variation to be used with narrow stores."""
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	230
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	231 def __init__(self, opener, path, narrowmatch):
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	232 super(narrowfilelog, self).__init__(opener, path)
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	233 self._narrowmatch = narrowmatch
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	234
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	235 def renamed(self, node):
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	236 res = super(narrowfilelog, self).renamed(node)
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	237
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	238 # Renames that come from outside the narrowspec are problematic
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	239 # because we may lack the base text for the rename. This can result
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	240 # in code attempting to walk the ancestry or compute a diff
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	241 # encountering a missing revision. We address this by silently
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	242 # removing rename metadata if the source file is outside the
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	243 # narrow spec.
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	244 #
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	245 # A better solution would be to see if the base revision is available,
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	246 # rather than assuming it isn't.
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	247 #
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	248 # An even better solution would be to teach all consumers of rename
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	249 # metadata that the base revision may not be available.
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	250 #
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	251 # TODO consider better ways of doing this.
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	252 if res and not self._narrowmatch(res[0]):
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	253 return None
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	254
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	255 return res
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	256
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	257 def size(self, rev):
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	258 # Because we have a custom renamed() that may lie, we need to call
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	259 # the base renamed() to report accurate results.
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	260 node = self.node(rev)
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	261 if super(narrowfilelog, self).renamed(node):
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	262 return len(self.read(node))
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	263 else:
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	264 return super(narrowfilelog, self).size(rev)
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	265
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	266 def cmp(self, node, text):
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	267 different = super(narrowfilelog, self).cmp(node, text)
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	268
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	269 # Because renamed() may lie, we may get false positives for
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	270 # different content. Check for this by comparing against the original
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	271 # renamed() implementation.
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	272 if different:
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	273 if super(narrowfilelog, self).renamed(node):
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	274 t2 = self.read(node)
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	275 return t2 != text
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	276
3e801ffd7269 filelog: custom filelog to be used with narrow repos Gregory Szorc <gregory.szorc@gmail.com> parents: 39310 diff changeset	277 return different

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/filelog.py @ 39847:97986c9c69d3