mercurial-scm/hg: mercurial/manifest.py annotate

annotate mercurial/manifest.py @ 39314:7f5e6d3e9032

manifest: proxy to revlog instance instead of inheriting Previously, manifestrevlog inherited revlog.revlog and therefore exposed all its APIs. This inevitably resulted in consumers calling low-level revlog APIs. As part of abstracting storage, we want to formalize the interface for manifest storage. The revlog API is much too large to define as the interface. Like we did for filelog, this commit divorces the manifest class from revlog so that we can standardize on a smaller API surface. The way I went about this commit was I broke the inheritance, ran tests, and added proxies until all tests passed. Like filelog, there are a handful of attributes that don't belong on the interface. And like filelog, we'll tease these out in the future. As part of this, we formalize an interface for manifest storage and add checks that manifestrevlog conforms to the interface. Adding proxies will introduce some overhead due to extra attribute lookups and function calls. On the mozilla-unified repository: $ hg verify before: real 627.220 secs (user 525.870+0.000 sys 18.800+0.000) after: real 628.930 secs (user 532.050+0.000 sys 18.320+0.000) $ hg serve (for a clone) before: user 223.580+0.000 sys 14.270+0.000 after: user 227.720+0.000 sys 13.920+0.000 $ hg clone before: user 506.390+0.000 sys 29.720+0.000 after: user 513.080+0.000 sys 28.280+0.000 There appears to be some overhead here. But it appears to be 1-2%. I think that is an appropriate price to pay for storage abstraction, which will eventually let us have much nicer things. If the overhead is noticed in other operations (whose CPU time isn't likely dwarfed by fulltext resolution) or if we want to cut down on the overhead, we could dynamically build up a type whose methods are effectively aliased to a revlog instance's. I'm inclined to punt on that problem for now. We may have to do it for the changelog. At which point it could be implemented in a generic way and ported to filelog and manifestrevlog easily enough I would think. .. api:: manifest.manifestrevlog no longer inherits from revlog The manifestrevlog class now wraps a revlog instance instead of inheriting from revlog. Various attributes and methods on instances are no longer available. Differential Revision: https://phab.mercurial-scm.org/D4386

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Mon, 27 Aug 2018 10:15:15 -0700
parents	61700d525a3b
children	57c3864f3aad

rev	line source
1089 142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	1 # manifest.py - manifest revision 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: 4633 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: 8209 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: 9420 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
27502 2df7f5c09c34 manifest: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27466 diff changeset	8 from __future__ import absolute_import
2df7f5c09c34 manifest: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27466 diff changeset	9
2df7f5c09c34 manifest: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27466 diff changeset	10 import heapq
32536 aa333c1982ab manifest: use itertools.chain() instead of + for Python 3 compat Augie Fackler <raf@durin42.com> parents: 32535 diff changeset	11 import itertools
27502 2df7f5c09c34 manifest: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27466 diff changeset	12 import struct
38781 0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	13 import weakref
27502 2df7f5c09c34 manifest: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27466 diff changeset	14
2df7f5c09c34 manifest: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27466 diff changeset	15 from .i18n import _
31530 160e7ad941e9 manifest: use node.hex instead of .encode('hex') Augie Fackler <augie@google.com> parents: 31476 diff changeset	16 from .node import (
160e7ad941e9 manifest: use node.hex instead of .encode('hex') Augie Fackler <augie@google.com> parents: 31476 diff changeset	17 bin,
160e7ad941e9 manifest: use node.hex instead of .encode('hex') Augie Fackler <augie@google.com> parents: 31476 diff changeset	18 hex,
160e7ad941e9 manifest: use node.hex instead of .encode('hex') Augie Fackler <augie@google.com> parents: 31476 diff changeset	19 )
27502 2df7f5c09c34 manifest: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27466 diff changeset	20 from . import (
2df7f5c09c34 manifest: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27466 diff changeset	21 error,
2df7f5c09c34 manifest: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27466 diff changeset	22 mdiff,
32372 df448de7cf3b parsers: switch to policy importer Yuya Nishihara <yuya@tcha.org> parents: 32252 diff changeset	23 policy,
38331 cf59de802883 py3: remove b'' from error message of disallowed filename Yuya Nishihara <yuya@tcha.org> parents: 37374 diff changeset	24 pycompat,
38530 c82ea938efbb repository: define manifest interfaces Gregory Szorc <gregory.szorc@gmail.com> parents: 38510 diff changeset	25 repository,
27502 2df7f5c09c34 manifest: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27466 diff changeset	26 revlog,
2df7f5c09c34 manifest: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27466 diff changeset	27 util,
2df7f5c09c34 manifest: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27466 diff changeset	28 )
38530 c82ea938efbb repository: define manifest interfaces Gregory Szorc <gregory.szorc@gmail.com> parents: 38510 diff changeset	29 from .utils import (
c82ea938efbb repository: define manifest interfaces Gregory Szorc <gregory.szorc@gmail.com> parents: 38510 diff changeset	30 interfaceutil,
c82ea938efbb repository: define manifest interfaces Gregory Szorc <gregory.szorc@gmail.com> parents: 38510 diff changeset	31 )
79 837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	32
32372 df448de7cf3b parsers: switch to policy importer Yuya Nishihara <yuya@tcha.org> parents: 32252 diff changeset	33 parsers = policy.importmod(r'parsers')
24322 f263814c72ac manifest: add dirs() to manifestdict Drew Gottlieb <drgott@google.com> parents: 24298 diff changeset	34 propertycache = util.propertycache
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	35
36373 0147a4730420 cleanup: say goodbye to manifestv2 format Augie Fackler <augie@google.com> parents: 36301 diff changeset	36 def _parse(data):
24524 63b6031384fc manifest: extract method for parsing manifest Martin von Zweigbergk <martinvonz@google.com> parents: 24502 diff changeset	37 # This method does a little bit of excessive-looking
63b6031384fc manifest: extract method for parsing manifest Martin von Zweigbergk <martinvonz@google.com> parents: 24502 diff changeset	38 # precondition checking. This is so that the behavior of this
63b6031384fc manifest: extract method for parsing manifest Martin von Zweigbergk <martinvonz@google.com> parents: 24502 diff changeset	39 # class exactly matches its C counterpart to try and help
63b6031384fc manifest: extract method for parsing manifest Martin von Zweigbergk <martinvonz@google.com> parents: 24502 diff changeset	40 # prevent surprise breakage for anyone that develops against
63b6031384fc manifest: extract method for parsing manifest Martin von Zweigbergk <martinvonz@google.com> parents: 24502 diff changeset	41 # the pure version.
32535 260a6f715bd2 manifest: fix some pure-Python parser bits to work on Python 3 Augie Fackler <raf@durin42.com> parents: 32372 diff changeset	42 if data and data[-1:] != '\n':
24524 63b6031384fc manifest: extract method for parsing manifest Martin von Zweigbergk <martinvonz@google.com> parents: 24502 diff changeset	43 raise ValueError('Manifest did not end in a newline.')
63b6031384fc manifest: extract method for parsing manifest Martin von Zweigbergk <martinvonz@google.com> parents: 24502 diff changeset	44 prev = None
63b6031384fc manifest: extract method for parsing manifest Martin von Zweigbergk <martinvonz@google.com> parents: 24502 diff changeset	45 for l in data.splitlines():
63b6031384fc manifest: extract method for parsing manifest Martin von Zweigbergk <martinvonz@google.com> parents: 24502 diff changeset	46 if prev is not None and prev > l:
63b6031384fc manifest: extract method for parsing manifest Martin von Zweigbergk <martinvonz@google.com> parents: 24502 diff changeset	47 raise ValueError('Manifest lines not in sorted order.')
63b6031384fc manifest: extract method for parsing manifest Martin von Zweigbergk <martinvonz@google.com> parents: 24502 diff changeset	48 prev = l
63b6031384fc manifest: extract method for parsing manifest Martin von Zweigbergk <martinvonz@google.com> parents: 24502 diff changeset	49 f, n = l.split('\0')
63b6031384fc manifest: extract method for parsing manifest Martin von Zweigbergk <martinvonz@google.com> parents: 24502 diff changeset	50 if len(n) > 40:
31366 45347d4a4f07 manifest: now that node.bin is available, use it directly Augie Fackler <augie@google.com> parents: 31365 diff changeset	51 yield f, bin(n[:40]), n[40:]
24524 63b6031384fc manifest: extract method for parsing manifest Martin von Zweigbergk <martinvonz@google.com> parents: 24502 diff changeset	52 else:
31366 45347d4a4f07 manifest: now that node.bin is available, use it directly Augie Fackler <augie@google.com> parents: 31365 diff changeset	53 yield f, bin(n), ''
24524 63b6031384fc manifest: extract method for parsing manifest Martin von Zweigbergk <martinvonz@google.com> parents: 24502 diff changeset	54
36373 0147a4730420 cleanup: say goodbye to manifestv2 format Augie Fackler <augie@google.com> parents: 36301 diff changeset	55 def _text(it):
24525 e118f74d246f manifest: extract method for creating manifest text Martin von Zweigbergk <martinvonz@google.com> parents: 24524 diff changeset	56 files = []
e118f74d246f manifest: extract method for creating manifest text Martin von Zweigbergk <martinvonz@google.com> parents: 24524 diff changeset	57 lines = []
e118f74d246f manifest: extract method for creating manifest text Martin von Zweigbergk <martinvonz@google.com> parents: 24524 diff changeset	58 _hex = revlog.hex
e118f74d246f manifest: extract method for creating manifest text Martin von Zweigbergk <martinvonz@google.com> parents: 24524 diff changeset	59 for f, n, fl in it:
e118f74d246f manifest: extract method for creating manifest text Martin von Zweigbergk <martinvonz@google.com> parents: 24524 diff changeset	60 files.append(f)
e118f74d246f manifest: extract method for creating manifest text Martin von Zweigbergk <martinvonz@google.com> parents: 24524 diff changeset	61 # if this is changed to support newlines in filenames,
e118f74d246f manifest: extract method for creating manifest text Martin von Zweigbergk <martinvonz@google.com> parents: 24524 diff changeset	62 # be sure to check the templates/ dir again (especially *-raw.tmpl)
e118f74d246f manifest: extract method for creating manifest text Martin von Zweigbergk <martinvonz@google.com> parents: 24524 diff changeset	63 lines.append("%s\0%s%s\n" % (f, _hex(n), fl))
e118f74d246f manifest: extract method for creating manifest text Martin von Zweigbergk <martinvonz@google.com> parents: 24524 diff changeset	64
e118f74d246f manifest: extract method for creating manifest text Martin von Zweigbergk <martinvonz@google.com> parents: 24524 diff changeset	65 _checkforbidden(files)
e118f74d246f manifest: extract method for creating manifest text Martin von Zweigbergk <martinvonz@google.com> parents: 24524 diff changeset	66 return ''.join(lines)
e118f74d246f manifest: extract method for creating manifest text Martin von Zweigbergk <martinvonz@google.com> parents: 24524 diff changeset	67
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	68 class lazymanifestiter(object):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	69 def __init__(self, lm):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	70 self.pos = 0
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	71 self.lm = lm
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	72
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	73 def __iter__(self):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	74 return self
24223 b4df0d0c49e7 manifest: move parsing functions up in file Augie Fackler <augie@google.com> parents: 24215 diff changeset	75
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	76 def next(self):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	77 try:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	78 data, pos = self.lm._get(self.pos)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	79 except IndexError:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	80 raise StopIteration
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	81 if pos == -1:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	82 self.pos += 1
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	83 return data[0]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	84 self.pos += 1
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	85 zeropos = data.find('\x00', pos)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	86 return data[pos:zeropos]
24224 d71837d06597 manifest: do parsing inside manifestdict contstructor Augie Fackler <augie@google.com> parents: 24223 diff changeset	87
31364 91874c247d61 manifest: add __next__ methods for Python 3 Augie Fackler <augie@google.com> parents: 31352 diff changeset	88 __next__ = next
91874c247d61 manifest: add __next__ methods for Python 3 Augie Fackler <augie@google.com> parents: 31352 diff changeset	89
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	90 class lazymanifestiterentries(object):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	91 def __init__(self, lm):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	92 self.lm = lm
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	93 self.pos = 0
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	94
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	95 def __iter__(self):
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	96 return self
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	97
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	98 def next(self):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	99 try:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	100 data, pos = self.lm._get(self.pos)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	101 except IndexError:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	102 raise StopIteration
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	103 if pos == -1:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	104 self.pos += 1
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	105 return data
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	106 zeropos = data.find('\x00', pos)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	107 hashval = unhexlify(data, self.lm.extrainfo[self.pos],
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	108 zeropos + 1, 40)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	109 flags = self.lm._getflags(data, self.pos, zeropos)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	110 self.pos += 1
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	111 return (data[pos:zeropos], hashval, flags)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	112
31364 91874c247d61 manifest: add __next__ methods for Python 3 Augie Fackler <augie@google.com> parents: 31352 diff changeset	113 __next__ = next
91874c247d61 manifest: add __next__ methods for Python 3 Augie Fackler <augie@google.com> parents: 31352 diff changeset	114
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	115 def unhexlify(data, extra, pos, length):
31365 28e3471a21ef manifest: use node.bin instead of .decode('hex') Augie Fackler <augie@google.com> parents: 31364 diff changeset	116 s = bin(data[pos:pos + length])
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	117 if extra:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	118 s += chr(extra & 0xff)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	119 return s
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	120
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	121 def _cmp(a, b):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	122 return (a > b) - (a < b)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	123
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	124 class _lazymanifest(object):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	125 def __init__(self, data, positions=None, extrainfo=None, extradata=None):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	126 if positions is None:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	127 self.positions = self.findlines(data)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	128 self.extrainfo = [0] * len(self.positions)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	129 self.data = data
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	130 self.extradata = []
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	131 else:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	132 self.positions = positions[:]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	133 self.extrainfo = extrainfo[:]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	134 self.extradata = extradata[:]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	135 self.data = data
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	136
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	137 def findlines(self, data):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	138 if not data:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	139 return []
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	140 pos = data.find("\n")
31352 667e88568087 manifest: unbreak pure-python manifest parsing on Python 3 Augie Fackler <augie@google.com> parents: 31346 diff changeset	141 if pos == -1 or data[-1:] != '\n':
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	142 raise ValueError("Manifest did not end in a newline.")
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	143 positions = [0]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	144 prev = data[:data.find('\x00')]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	145 while pos < len(data) - 1 and pos != -1:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	146 positions.append(pos + 1)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	147 nexts = data[pos + 1:data.find('\x00', pos + 1)]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	148 if nexts < prev:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	149 raise ValueError("Manifest lines not in sorted order.")
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	150 prev = nexts
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	151 pos = data.find("\n", pos + 1)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	152 return positions
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	153
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	154 def _get(self, index):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	155 # get the position encoded in pos:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	156 # positive number is an index in 'data'
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	157 # negative number is in extrapieces
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	158 pos = self.positions[index]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	159 if pos >= 0:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	160 return self.data, pos
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	161 return self.extradata[-pos - 1], -1
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	162
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	163 def _getkey(self, pos):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	164 if pos >= 0:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	165 return self.data[pos:self.data.find('\x00', pos + 1)]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	166 return self.extradata[-pos - 1][0]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	167
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	168 def bsearch(self, key):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	169 first = 0
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	170 last = len(self.positions) - 1
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	171
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	172 while first <= last:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	173 midpoint = (first + last)//2
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	174 nextpos = self.positions[midpoint]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	175 candidate = self._getkey(nextpos)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	176 r = _cmp(key, candidate)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	177 if r == 0:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	178 return midpoint
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	179 else:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	180 if r < 0:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	181 last = midpoint - 1
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	182 else:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	183 first = midpoint + 1
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	184 return -1
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	185
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	186 def bsearch2(self, key):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	187 # same as the above, but will always return the position
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	188 # done for performance reasons
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	189 first = 0
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	190 last = len(self.positions) - 1
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	191
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	192 while first <= last:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	193 midpoint = (first + last)//2
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	194 nextpos = self.positions[midpoint]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	195 candidate = self._getkey(nextpos)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	196 r = _cmp(key, candidate)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	197 if r == 0:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	198 return (midpoint, True)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	199 else:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	200 if r < 0:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	201 last = midpoint - 1
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	202 else:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	203 first = midpoint + 1
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	204 return (first, False)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	205
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	206 def __contains__(self, key):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	207 return self.bsearch(key) != -1
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	208
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	209 def _getflags(self, data, needle, pos):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	210 start = pos + 41
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	211 end = data.find("\n", start)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	212 if end == -1:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	213 end = len(data) - 1
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	214 if start == end:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	215 return ''
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	216 return self.data[start:end]
24297 0178f500d61e lazymanifest: fix pure hg iterkeys() Martin von Zweigbergk <martinvonz@google.com> parents: 24295 diff changeset	217
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	218 def __getitem__(self, key):
31367 ef50b491c17d manifest: ensure paths are bytes (not str) in pure parser Augie Fackler <augie@google.com> parents: 31366 diff changeset	219 if not isinstance(key, bytes):
ef50b491c17d manifest: ensure paths are bytes (not str) in pure parser Augie Fackler <augie@google.com> parents: 31366 diff changeset	220 raise TypeError("getitem: manifest keys must be a bytes.")
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	221 needle = self.bsearch(key)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	222 if needle == -1:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	223 raise KeyError
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	224 data, pos = self._get(needle)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	225 if pos == -1:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	226 return (data[1], data[2])
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	227 zeropos = data.find('\x00', pos)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	228 assert 0 <= needle <= len(self.positions)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	229 assert len(self.extrainfo) == len(self.positions)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	230 hashval = unhexlify(data, self.extrainfo[needle], zeropos + 1, 40)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	231 flags = self._getflags(data, needle, zeropos)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	232 return (hashval, flags)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	233
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	234 def __delitem__(self, key):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	235 needle, found = self.bsearch2(key)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	236 if not found:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	237 raise KeyError
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	238 cur = self.positions[needle]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	239 self.positions = self.positions[:needle] + self.positions[needle + 1:]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	240 self.extrainfo = self.extrainfo[:needle] + self.extrainfo[needle + 1:]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	241 if cur >= 0:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	242 self.data = self.data[:cur] + '\x00' + self.data[cur + 1:]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	243
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	244 def __setitem__(self, key, value):
31531 326bca5477d0 manifest: refer to bytestrings as bytes, not str Augie Fackler <augie@google.com> parents: 31530 diff changeset	245 if not isinstance(key, bytes):
326bca5477d0 manifest: refer to bytestrings as bytes, not str Augie Fackler <augie@google.com> parents: 31530 diff changeset	246 raise TypeError("setitem: manifest keys must be a byte string.")
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	247 if not isinstance(value, tuple) or len(value) != 2:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	248 raise TypeError("Manifest values must be a tuple of (node, flags).")
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	249 hashval = value[0]
31531 326bca5477d0 manifest: refer to bytestrings as bytes, not str Augie Fackler <augie@google.com> parents: 31530 diff changeset	250 if not isinstance(hashval, bytes) or not 20 <= len(hashval) <= 22:
326bca5477d0 manifest: refer to bytestrings as bytes, not str Augie Fackler <augie@google.com> parents: 31530 diff changeset	251 raise TypeError("node must be a 20-byte byte string")
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	252 flags = value[1]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	253 if len(hashval) == 22:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	254 hashval = hashval[:-1]
31531 326bca5477d0 manifest: refer to bytestrings as bytes, not str Augie Fackler <augie@google.com> parents: 31530 diff changeset	255 if not isinstance(flags, bytes) or len(flags) > 1:
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	256 raise TypeError("flags must a 0 or 1 byte string, got %r", flags)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	257 needle, found = self.bsearch2(key)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	258 if found:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	259 # put the item
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	260 pos = self.positions[needle]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	261 if pos < 0:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	262 self.extradata[-pos - 1] = (key, hashval, value[1])
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	263 else:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	264 # just don't bother
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	265 self.extradata.append((key, hashval, value[1]))
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	266 self.positions[needle] = -len(self.extradata)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	267 else:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	268 # not found, put it in with extra positions
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	269 self.extradata.append((key, hashval, value[1]))
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	270 self.positions = (self.positions[:needle] + [-len(self.extradata)]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	271 + self.positions[needle:])
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	272 self.extrainfo = (self.extrainfo[:needle] + [0] +
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	273 self.extrainfo[needle:])
24298 49cd847fd69a lazymanifest: make __iter__ generate filenames, not 3-tuples Martin von Zweigbergk <martinvonz@google.com> parents: 24297 diff changeset	274
2831 0b50a580be36 Add manifestflags class Matt Mackall <mpm@selenic.com> parents: 2470 diff changeset	275 def copy(self):
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	276 # XXX call _compact like in C?
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	277 return _lazymanifest(self.data, self.positions, self.extrainfo,
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	278 self.extradata)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	279
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	280 def _compact(self):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	281 # hopefully not called TOO often
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	282 if len(self.extradata) == 0:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	283 return
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	284 l = []
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	285 last_cut = 0
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	286 i = 0
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	287 offset = 0
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	288 self.extrainfo = [0] * len(self.positions)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	289 while i < len(self.positions):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	290 if self.positions[i] >= 0:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	291 cur = self.positions[i]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	292 last_cut = cur
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	293 while True:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	294 self.positions[i] = offset
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	295 i += 1
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	296 if i == len(self.positions) or self.positions[i] < 0:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	297 break
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	298 offset += self.positions[i] - cur
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	299 cur = self.positions[i]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	300 end_cut = self.data.find('\n', cur)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	301 if end_cut != -1:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	302 end_cut += 1
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	303 offset += end_cut - cur
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	304 l.append(self.data[last_cut:end_cut])
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	305 else:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	306 while i < len(self.positions) and self.positions[i] < 0:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	307 cur = self.positions[i]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	308 t = self.extradata[-cur - 1]
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	309 l.append(self._pack(t))
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	310 self.positions[i] = offset
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	311 if len(t[1]) > 20:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	312 self.extrainfo[i] = ord(t[1][21])
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	313 offset += len(l[-1])
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	314 i += 1
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	315 self.data = ''.join(l)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	316 self.extradata = []
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	317
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	318 def _pack(self, d):
31530 160e7ad941e9 manifest: use node.hex instead of .encode('hex') Augie Fackler <augie@google.com> parents: 31476 diff changeset	319 return d[0] + '\x00' + hex(d[1][:20]) + d[2] + '\n'
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	320
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	321 def text(self):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	322 self._compact()
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	323 return self.data
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	324
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	325 def diff(self, m2, clean=False):
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	326 '''Finds changes between the current manifest and m2.'''
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	327 # XXX think whether efficiency matters here
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	328 diff = {}
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	329
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	330 for fn, e1, flags in self.iterentries():
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	331 if fn not in m2:
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	332 diff[fn] = (e1, flags), (None, '')
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	333 else:
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	334 e2 = m2[fn]
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	335 if (e1, flags) != e2:
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	336 diff[fn] = (e1, flags), e2
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	337 elif clean:
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	338 diff[fn] = None
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	339
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	340 for fn, e2, flags in m2.iterentries():
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	341 if fn not in self:
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	342 diff[fn] = (None, ''), (e2, flags)
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	343
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	344 return diff
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	345
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	346 def iterentries(self):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	347 return lazymanifestiterentries(self)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	348
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	349 def iterkeys(self):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	350 return lazymanifestiter(self)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	351
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	352 def __iter__(self):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	353 return lazymanifestiter(self)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	354
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	355 def __len__(self):
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	356 return len(self.positions)
d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	357
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	358 def filtercopy(self, filterfn):
30042 d24e03da24b5 lazymanifest: write a more efficient, pypy friendly version of lazymanifest Maciej Fijalkowski <fijall@gmail.com> parents: 29998 diff changeset	359 # XXX should be optimized
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	360 c = _lazymanifest('')
24298 49cd847fd69a lazymanifest: make __iter__ generate filenames, not 3-tuples Martin von Zweigbergk <martinvonz@google.com> parents: 24297 diff changeset	361 for f, n, fl in self.iterentries():
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	362 if filterfn(f):
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	363 c[f] = n, fl
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	364 return c
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	365
24226 b992769dd1be manifest: use custom C implementation of lazymanifest Augie Fackler <augie@google.com> parents: 24225 diff changeset	366 try:
b992769dd1be manifest: use custom C implementation of lazymanifest Augie Fackler <augie@google.com> parents: 24225 diff changeset	367 _lazymanifest = parsers.lazymanifest
b992769dd1be manifest: use custom C implementation of lazymanifest Augie Fackler <augie@google.com> parents: 24225 diff changeset	368 except AttributeError:
b992769dd1be manifest: use custom C implementation of lazymanifest Augie Fackler <augie@google.com> parents: 24225 diff changeset	369 pass
b992769dd1be manifest: use custom C implementation of lazymanifest Augie Fackler <augie@google.com> parents: 24225 diff changeset	370
38530 c82ea938efbb repository: define manifest interfaces Gregory Szorc <gregory.szorc@gmail.com> parents: 38510 diff changeset	371 @interfaceutil.implementer(repository.imanifestdict)
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	372 class manifestdict(object):
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	373 def __init__(self, data=''):
36373 0147a4730420 cleanup: say goodbye to manifestv2 format Augie Fackler <augie@google.com> parents: 36301 diff changeset	374 self._lm = _lazymanifest(data)
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	375
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	376 def __getitem__(self, key):
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	377 return self._lm[key][0]
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	378
24277 22d560fe1516 manifest: don't let find() look inside manifestdict Martin von Zweigbergk <martinvonz@google.com> parents: 24226 diff changeset	379 def find(self, key):
22d560fe1516 manifest: don't let find() look inside manifestdict Martin von Zweigbergk <martinvonz@google.com> parents: 24226 diff changeset	380 return self._lm[key]
22d560fe1516 manifest: don't let find() look inside manifestdict Martin von Zweigbergk <martinvonz@google.com> parents: 24226 diff changeset	381
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	382 def __len__(self):
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	383 return len(self._lm)
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	384
30331 b19291e5d506 manifest: add __nonzero__ method Durham Goode <durham@fb.com> parents: 30295 diff changeset	385 def __nonzero__(self):
b19291e5d506 manifest: add __nonzero__ method Durham Goode <durham@fb.com> parents: 30295 diff changeset	386 # nonzero is covered by the __len__ function, but implementing it here
b19291e5d506 manifest: add __nonzero__ method Durham Goode <durham@fb.com> parents: 30295 diff changeset	387 # makes it easier for extensions to override.
b19291e5d506 manifest: add __nonzero__ method Durham Goode <durham@fb.com> parents: 30295 diff changeset	388 return len(self._lm) != 0
b19291e5d506 manifest: add __nonzero__ method Durham Goode <durham@fb.com> parents: 30295 diff changeset	389
31476 413b44003462 py3: add __bool__ to every class defining __nonzero__ Gregory Szorc <gregory.szorc@gmail.com> parents: 31367 diff changeset	390 __bool__ = __nonzero__
413b44003462 py3: add __bool__ to every class defining __nonzero__ Gregory Szorc <gregory.szorc@gmail.com> parents: 31367 diff changeset	391
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	392 def __setitem__(self, key, node):
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	393 self._lm[key] = node, self.flags(key, '')
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	394
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	395 def __contains__(self, key):
34345 05167447f90d py3: return False early while checking whether None is a key in lazymanifest Pulkit Goyal <7895pulkit@gmail.com> parents: 34296 diff changeset	396 if key is None:
05167447f90d py3: return False early while checking whether None is a key in lazymanifest Pulkit Goyal <7895pulkit@gmail.com> parents: 34296 diff changeset	397 return False
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	398 return key in self._lm
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	399
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	400 def __delitem__(self, key):
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	401 del self._lm[key]
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	402
24295 2b7ab29627fd lazymanifest: add iterkeys() method Martin von Zweigbergk <martinvonz@google.com> parents: 24292 diff changeset	403 def __iter__(self):
24298 49cd847fd69a lazymanifest: make __iter__ generate filenames, not 3-tuples Martin von Zweigbergk <martinvonz@google.com> parents: 24297 diff changeset	404 return self._lm.__iter__()
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	405
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	406 def iterkeys(self):
24295 2b7ab29627fd lazymanifest: add iterkeys() method Martin von Zweigbergk <martinvonz@google.com> parents: 24292 diff changeset	407 return self._lm.iterkeys()
2b7ab29627fd lazymanifest: add iterkeys() method Martin von Zweigbergk <martinvonz@google.com> parents: 24292 diff changeset	408
2b7ab29627fd lazymanifest: add iterkeys() method Martin von Zweigbergk <martinvonz@google.com> parents: 24292 diff changeset	409 def keys(self):
2b7ab29627fd lazymanifest: add iterkeys() method Martin von Zweigbergk <martinvonz@google.com> parents: 24292 diff changeset	410 return list(self.iterkeys())
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	411
31255 959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	412 def filesnotin(self, m2, match=None):
24184 cd66080ef6d4 copies: move code into new manifestdict.filesnotin() method Martin von Zweigbergk <martinvonz@google.com> parents: 24147 diff changeset	413 '''Set of files in this manifest that are not in the other'''
31255 959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	414 if match:
959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	415 m1 = self.matches(match)
959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	416 m2 = m2.matches(match)
959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	417 return m1.filesnotin(m2)
29056 e2178f7d17c0 manifest: improve filesnotin performance by using lazymanifest diff Tony Tung <tonytung@merly.org> parents: 28240 diff changeset	418 diff = self.diff(m2)
e2178f7d17c0 manifest: improve filesnotin performance by using lazymanifest diff Tony Tung <tonytung@merly.org> parents: 28240 diff changeset	419 files = set(filepath
e2178f7d17c0 manifest: improve filesnotin performance by using lazymanifest diff Tony Tung <tonytung@merly.org> parents: 28240 diff changeset	420 for filepath, hashflags in diff.iteritems()
e2178f7d17c0 manifest: improve filesnotin performance by using lazymanifest diff Tony Tung <tonytung@merly.org> parents: 28240 diff changeset	421 if hashflags[1][0] is None)
24184 cd66080ef6d4 copies: move code into new manifestdict.filesnotin() method Martin von Zweigbergk <martinvonz@google.com> parents: 24147 diff changeset	422 return files
cd66080ef6d4 copies: move code into new manifestdict.filesnotin() method Martin von Zweigbergk <martinvonz@google.com> parents: 24147 diff changeset	423
24322 f263814c72ac manifest: add dirs() to manifestdict Drew Gottlieb <drgott@google.com> parents: 24298 diff changeset	424 @propertycache
f263814c72ac manifest: add dirs() to manifestdict Drew Gottlieb <drgott@google.com> parents: 24298 diff changeset	425 def _dirs(self):
24635 21e1ece30f8c util: move dirs() and finddirs() from scmutil to util Drew Gottlieb <drgott@google.com> parents: 24600 diff changeset	426 return util.dirs(self)
24322 f263814c72ac manifest: add dirs() to manifestdict Drew Gottlieb <drgott@google.com> parents: 24298 diff changeset	427
f263814c72ac manifest: add dirs() to manifestdict Drew Gottlieb <drgott@google.com> parents: 24298 diff changeset	428 def dirs(self):
f263814c72ac manifest: add dirs() to manifestdict Drew Gottlieb <drgott@google.com> parents: 24298 diff changeset	429 return self._dirs
f263814c72ac manifest: add dirs() to manifestdict Drew Gottlieb <drgott@google.com> parents: 24298 diff changeset	430
24324 149cc171e4a0 manifest: add manifestdict.hasdir() method Drew Gottlieb <drgott@google.com> parents: 24322 diff changeset	431 def hasdir(self, dir):
149cc171e4a0 manifest: add manifestdict.hasdir() method Drew Gottlieb <drgott@google.com> parents: 24322 diff changeset	432 return dir in self._dirs
149cc171e4a0 manifest: add manifestdict.hasdir() method Drew Gottlieb <drgott@google.com> parents: 24322 diff changeset	433
24685 b3d78d82d84c manifestdict: extract condition for _intersectfiles() and use for walk() Martin von Zweigbergk <martinvonz@google.com> parents: 24684 diff changeset	434 def _filesfastpath(self, match):
b3d78d82d84c manifestdict: extract condition for _intersectfiles() and use for walk() Martin von Zweigbergk <martinvonz@google.com> parents: 24684 diff changeset	435 '''Checks whether we can correctly and quickly iterate over matcher
b3d78d82d84c manifestdict: extract condition for _intersectfiles() and use for walk() Martin von Zweigbergk <martinvonz@google.com> parents: 24684 diff changeset	436 files instead of over manifest files.'''
b3d78d82d84c manifestdict: extract condition for _intersectfiles() and use for walk() Martin von Zweigbergk <martinvonz@google.com> parents: 24684 diff changeset	437 files = match.files()
b3d78d82d84c manifestdict: extract condition for _intersectfiles() and use for walk() Martin von Zweigbergk <martinvonz@google.com> parents: 24684 diff changeset	438 return (len(files) < 100 and (match.isexact() or
25276 c436ba9d6ac0 manifest: use match.prefix() instead of 'not match.anypats()' Martin von Zweigbergk <martinvonz@google.com> parents: 25222 diff changeset	439 (match.prefix() and all(fn in self for fn in files))))
24685 b3d78d82d84c manifestdict: extract condition for _intersectfiles() and use for walk() Martin von Zweigbergk <martinvonz@google.com> parents: 24684 diff changeset	440
24646 5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	441 def walk(self, match):
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	442 '''Generates matching file names.
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	443
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	444 Equivalent to manifest.matches(match).iterkeys(), but without creating
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	445 an entirely new manifest.
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	446
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	447 It also reports nonexistent files by marking them bad with match.bad().
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	448 '''
24683 4eaea0ed8dc1 manifest.walk: special-case match.always() for speed Martin von Zweigbergk <martinvonz@google.com> parents: 24682 diff changeset	449 if match.always():
4eaea0ed8dc1 manifest.walk: special-case match.always() for speed Martin von Zweigbergk <martinvonz@google.com> parents: 24682 diff changeset	450 for f in iter(self):
4eaea0ed8dc1 manifest.walk: special-case match.always() for speed Martin von Zweigbergk <martinvonz@google.com> parents: 24682 diff changeset	451 yield f
4eaea0ed8dc1 manifest.walk: special-case match.always() for speed Martin von Zweigbergk <martinvonz@google.com> parents: 24682 diff changeset	452 return
4eaea0ed8dc1 manifest.walk: special-case match.always() for speed Martin von Zweigbergk <martinvonz@google.com> parents: 24682 diff changeset	453
24646 5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	454 fset = set(match.files())
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	455
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	456 # avoid the entire walk if we're only looking for specific files
24685 b3d78d82d84c manifestdict: extract condition for _intersectfiles() and use for walk() Martin von Zweigbergk <martinvonz@google.com> parents: 24684 diff changeset	457 if self._filesfastpath(match):
24667 19c5b0913960 manifest.walk: join nested if-conditions Martin von Zweigbergk <martinvonz@google.com> parents: 24666 diff changeset	458 for fn in sorted(fset):
19c5b0913960 manifest.walk: join nested if-conditions Martin von Zweigbergk <martinvonz@google.com> parents: 24666 diff changeset	459 yield fn
24682 aef3d1469773 manifest.walk: use return instead of StopIteration in generator Martin von Zweigbergk <martinvonz@google.com> parents: 24670 diff changeset	460 return
24646 5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	461
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	462 for fn in self:
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	463 if fn in fset:
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	464 # specified pattern is the exact name
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	465 fset.remove(fn)
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	466 if match(fn):
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	467 yield fn
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	468
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	469 # for dirstate.walk, files=['.'] means "walk the whole tree".
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	470 # follow that here, too
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	471 fset.discard('.')
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	472
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	473 for fn in sorted(fset):
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	474 if not self.hasdir(fn):
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	475 match.bad(fn, None)
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	476
23305 0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	477 def matches(self, match):
0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	478 '''generate a new manifest filtered by the match argument'''
0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	479 if match.always():
0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	480 return self.copy()
0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	481
24685 b3d78d82d84c manifestdict: extract condition for _intersectfiles() and use for walk() Martin von Zweigbergk <martinvonz@google.com> parents: 24684 diff changeset	482 if self._filesfastpath(match):
24666 3092885b5b32 manifestdict: inline _intersectfiles() Martin von Zweigbergk <martinvonz@google.com> parents: 24665 diff changeset	483 m = manifestdict()
3092885b5b32 manifestdict: inline _intersectfiles() Martin von Zweigbergk <martinvonz@google.com> parents: 24665 diff changeset	484 lm = self._lm
3092885b5b32 manifestdict: inline _intersectfiles() Martin von Zweigbergk <martinvonz@google.com> parents: 24665 diff changeset	485 for fn in match.files():
3092885b5b32 manifestdict: inline _intersectfiles() Martin von Zweigbergk <martinvonz@google.com> parents: 24665 diff changeset	486 if fn in lm:
3092885b5b32 manifestdict: inline _intersectfiles() Martin von Zweigbergk <martinvonz@google.com> parents: 24665 diff changeset	487 m._lm[fn] = lm[fn]
3092885b5b32 manifestdict: inline _intersectfiles() Martin von Zweigbergk <martinvonz@google.com> parents: 24665 diff changeset	488 return m
23305 0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	489
24700 32b268cbff00 manifestdict: drop empty-string argument when creating empty manifest Martin von Zweigbergk <martinvonz@google.com> parents: 24685 diff changeset	490 m = manifestdict()
24664 ea4a7c8909ae manifestdict.matches: avoid name 'lm' for a not-lazymanifest Martin von Zweigbergk <martinvonz@google.com> parents: 24647 diff changeset	491 m._lm = self._lm.filtercopy(match)
ea4a7c8909ae manifestdict.matches: avoid name 'lm' for a not-lazymanifest Martin von Zweigbergk <martinvonz@google.com> parents: 24647 diff changeset	492 return m
23305 0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	493
31255 959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	494 def diff(self, m2, match=None, clean=False):
23756 829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	495 '''Finds changes between the current manifest and m2.
829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	496
829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	497 Args:
829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	498 m2: the manifest to which this manifest should be compared.
829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	499 clean: if true, include files unchanged between these manifests
829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	500 with a None value in the returned dictionary.
829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	501
829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	502 The result is returned as a dict with filename as key and
829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	503 values of the form ((n1,fl1),(n2,fl2)), where n1/n2 is the
829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	504 nodeid in the current/other manifest and fl1/fl2 is the flag
829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	505 in the current/other manifest. Where the file does not exist,
829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	506 the nodeid will be None and the flags will be the empty
829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	507 string.
829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	508 '''
31255 959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	509 if match:
959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	510 m1 = self.matches(match)
959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	511 m2 = m2.matches(match)
959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	512 return m1.diff(m2, clean=clean)
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	513 return self._lm.diff(m2._lm, clean)
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	514
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	515 def setflag(self, key, flag):
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	516 self._lm[key] = self[key], flag
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	517
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	518 def get(self, key, default=None):
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	519 try:
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	520 return self._lm[key][0]
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	521 except KeyError:
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	522 return default
22965 b697fa74b475 manifest: for diff(), only iterate over files, not flags Martin von Zweigbergk <martinvonz@gmail.com> parents: 22964 diff changeset	523
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	524 def flags(self, key, default=''):
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	525 try:
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	526 return self._lm[key][1]
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	527 except KeyError:
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	528 return default
22965 b697fa74b475 manifest: for diff(), only iterate over files, not flags Martin von Zweigbergk <martinvonz@gmail.com> parents: 22964 diff changeset	529
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	530 def copy(self):
24700 32b268cbff00 manifestdict: drop empty-string argument when creating empty manifest Martin von Zweigbergk <martinvonz@google.com> parents: 24685 diff changeset	531 c = manifestdict()
24225 3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	532 c._lm = self._lm.copy()
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	533 return c
3e5c4af69808 manifest: split manifestdict into high-level and low-level logic Augie Fackler <augie@google.com> parents: 24224 diff changeset	534
32550 b98199a5c3e1 cleanup: rename all iteritems methods to items and add iteritems alias Augie Fackler <raf@durin42.com> parents: 32536 diff changeset	535 def items(self):
24298 49cd847fd69a lazymanifest: make __iter__ generate filenames, not 3-tuples Martin von Zweigbergk <martinvonz@google.com> parents: 24297 diff changeset	536 return (x[:2] for x in self._lm.iterentries())
2831 0b50a580be36 Add manifestflags class Matt Mackall <mpm@selenic.com> parents: 2470 diff changeset	537
38657 28c9d67d88ab manifest: just duplicate the definition of items as iteritems Augie Fackler <augie@google.com> parents: 38556 diff changeset	538 def iteritems(self):
28c9d67d88ab manifest: just duplicate the definition of items as iteritems Augie Fackler <augie@google.com> parents: 38556 diff changeset	539 return (x[:2] for x in self._lm.iterentries())
32550 b98199a5c3e1 cleanup: rename all iteritems methods to items and add iteritems alias Augie Fackler <raf@durin42.com> parents: 32536 diff changeset	540
28203 7297e9e13a8a verify: check directory manifests Martin von Zweigbergk <martinvonz@google.com> parents: 27502 diff changeset	541 def iterentries(self):
7297e9e13a8a verify: check directory manifests Martin von Zweigbergk <martinvonz@google.com> parents: 27502 diff changeset	542 return self._lm.iterentries()
7297e9e13a8a verify: check directory manifests Martin von Zweigbergk <martinvonz@google.com> parents: 27502 diff changeset	543
36373 0147a4730420 cleanup: say goodbye to manifestv2 format Augie Fackler <augie@google.com> parents: 36301 diff changeset	544 def text(self):
0147a4730420 cleanup: say goodbye to manifestv2 format Augie Fackler <augie@google.com> parents: 36301 diff changeset	545 # most likely uses native version
0147a4730420 cleanup: say goodbye to manifestv2 format Augie Fackler <augie@google.com> parents: 36301 diff changeset	546 return self._lm.text()
22408 dc97e04c12ad manifest: move checkforbidden to module-level Augie Fackler <raf@durin42.com> parents: 21879 diff changeset	547
22931 48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	548 def fastdelta(self, base, changes):
31787 6bfea18df609 manifest: update comment to be about bytearray Martin von Zweigbergk <martinvonz@google.com> parents: 31650 diff changeset	549 """Given a base manifest text as a bytearray and a list of changes
22931 48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	550 relative to that text, compute a delta that can be used by revlog.
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	551 """
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	552 delta = []
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	553 dstart = None
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	554 dend = None
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	555 dline = [""]
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	556 start = 0
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	557 # zero copy representation of base as a buffer
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	558 addbuf = util.buffer(base)
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	559
26871 1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	560 changes = list(changes)
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	561 if len(changes) < 1000:
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	562 # start with a readonly loop that finds the offset of
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	563 # each line and creates the deltas
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	564 for f, todelete in changes:
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	565 # bs will either be the index of the item or the insert point
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	566 start, end = _msearch(addbuf, f, start)
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	567 if not todelete:
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	568 h, fl = self._lm[f]
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	569 l = "%s\0%s%s\n" % (f, revlog.hex(h), fl)
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	570 else:
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	571 if start == end:
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	572 # item we want to delete was not found, error out
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	573 raise AssertionError(
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	574 _("failed to remove %s from manifest") % f)
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	575 l = ""
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	576 if dstart is not None and dstart <= start and dend >= start:
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	577 if dend < end:
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	578 dend = end
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	579 if l:
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	580 dline.append(l)
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	581 else:
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	582 if dstart is not None:
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	583 delta.append([dstart, dend, "".join(dline)])
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	584 dstart = start
22931 48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	585 dend = end
26871 1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	586 dline = [l]
22931 48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	587
26871 1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	588 if dstart is not None:
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	589 delta.append([dstart, dend, "".join(dline)])
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	590 # apply the delta to the base, and get a delta for addrevision
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	591 deltatext, arraytext = _addlistdelta(base, delta)
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	592 else:
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	593 # For large changes, it's much cheaper to just build the text and
1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	594 # diff it.
31346 2a18e9e6ca43 py3: use bytearray() instead of array('c', ...) constructions Augie Fackler <augie@google.com> parents: 31294 diff changeset	595 arraytext = bytearray(self.text())
2a18e9e6ca43 py3: use bytearray() instead of array('c', ...) constructions Augie Fackler <augie@google.com> parents: 31294 diff changeset	596 deltatext = mdiff.textdiff(
2a18e9e6ca43 py3: use bytearray() instead of array('c', ...) constructions Augie Fackler <augie@google.com> parents: 31294 diff changeset	597 util.buffer(base), util.buffer(arraytext))
26871 1cbf144fd8a1 manifest: skip fastdelta if the change is large Durham Goode <durham@fb.com> parents: 26402 diff changeset	598
22931 48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	599 return arraytext, deltatext
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	600
22930 1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	601 def _msearch(m, s, lo=0, hi=None):
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	602 '''return a tuple (start, end) that says where to find s within m.
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	603
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	604 If the string is found m[start:end] are the line containing
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	605 that string. If start == end the string was not found and
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	606 they indicate the proper sorted insertion point.
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	607
31650 23391acfc421 py3: fix manifestdict.fastdelta() to be compatible with memoryview Yuya Nishihara <yuya@tcha.org> parents: 31531 diff changeset	608 m should be a buffer, a memoryview or a byte string.
23391acfc421 py3: fix manifestdict.fastdelta() to be compatible with memoryview Yuya Nishihara <yuya@tcha.org> parents: 31531 diff changeset	609 s is a byte string'''
22930 1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	610 def advance(i, c):
31650 23391acfc421 py3: fix manifestdict.fastdelta() to be compatible with memoryview Yuya Nishihara <yuya@tcha.org> parents: 31531 diff changeset	611 while i < lenm and m[i:i + 1] != c:
22930 1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	612 i += 1
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	613 return i
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	614 if not s:
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	615 return (lo, lo)
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	616 lenm = len(m)
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	617 if not hi:
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	618 hi = lenm
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	619 while lo < hi:
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	620 mid = (lo + hi) // 2
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	621 start = mid
31650 23391acfc421 py3: fix manifestdict.fastdelta() to be compatible with memoryview Yuya Nishihara <yuya@tcha.org> parents: 31531 diff changeset	622 while start > 0 and m[start - 1:start] != '\n':
22930 1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	623 start -= 1
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	624 end = advance(start, '\0')
31650 23391acfc421 py3: fix manifestdict.fastdelta() to be compatible with memoryview Yuya Nishihara <yuya@tcha.org> parents: 31531 diff changeset	625 if bytes(m[start:end]) < s:
22930 1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	626 # we know that after the null there are 40 bytes of sha1
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	627 # this translates to the bisect lo = mid + 1
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	628 lo = advance(end + 40, '\n') + 1
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	629 else:
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	630 # this translates to the bisect hi = mid
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	631 hi = start
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	632 end = advance(lo, '\0')
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	633 found = m[lo:end]
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	634 if s == found:
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	635 # we know that after the null there are 40 bytes of sha1
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	636 end = advance(end + 40, '\n')
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	637 return (lo, end + 1)
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	638 else:
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	639 return (lo, lo)
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	640
22415 65ec6c5c0fb3 manifest: mark addlistdelta and checkforbidden as module-private Augie Fackler <raf@durin42.com> parents: 22409 diff changeset	641 def _checkforbidden(l):
22408 dc97e04c12ad manifest: move checkforbidden to module-level Augie Fackler <raf@durin42.com> parents: 21879 diff changeset	642 """Check filenames for illegal characters."""
dc97e04c12ad manifest: move checkforbidden to module-level Augie Fackler <raf@durin42.com> parents: 21879 diff changeset	643 for f in l:
dc97e04c12ad manifest: move checkforbidden to module-level Augie Fackler <raf@durin42.com> parents: 21879 diff changeset	644 if '\n' in f or '\r' in f:
dc97e04c12ad manifest: move checkforbidden to module-level Augie Fackler <raf@durin42.com> parents: 21879 diff changeset	645 raise error.RevlogError(
38331 cf59de802883 py3: remove b'' from error message of disallowed filename Yuya Nishihara <yuya@tcha.org> parents: 37374 diff changeset	646 _("'\\n' and '\\r' disallowed in filenames: %r")
cf59de802883 py3: remove b'' from error message of disallowed filename Yuya Nishihara <yuya@tcha.org> parents: 37374 diff changeset	647 % pycompat.bytestr(f))
22408 dc97e04c12ad manifest: move checkforbidden to module-level Augie Fackler <raf@durin42.com> parents: 21879 diff changeset	648
dc97e04c12ad manifest: move checkforbidden to module-level Augie Fackler <raf@durin42.com> parents: 21879 diff changeset	649
22409 8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	650 # apply the changes collected during the bisect loop to our addlist
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	651 # return a delta suitable for addrevision
22415 65ec6c5c0fb3 manifest: mark addlistdelta and checkforbidden as module-private Augie Fackler <raf@durin42.com> parents: 22409 diff changeset	652 def _addlistdelta(addlist, x):
22409 8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	653 # for large addlist arrays, building a new array is cheaper
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	654 # than repeatedly modifying the existing one
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	655 currentposition = 0
31346 2a18e9e6ca43 py3: use bytearray() instead of array('c', ...) constructions Augie Fackler <augie@google.com> parents: 31294 diff changeset	656 newaddlist = bytearray()
22409 8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	657
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	658 for start, end, content in x:
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	659 newaddlist += addlist[currentposition:start]
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	660 if content:
31346 2a18e9e6ca43 py3: use bytearray() instead of array('c', ...) constructions Augie Fackler <augie@google.com> parents: 31294 diff changeset	661 newaddlist += bytearray(content)
22409 8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	662
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	663 currentposition = end
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	664
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	665 newaddlist += addlist[currentposition:]
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	666
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	667 deltatext = "".join(struct.pack(">lll", start, end, len(content))
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	668 + content for start, end, content in x)
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	669 return deltatext, newaddlist
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	670
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	671 def _splittopdir(f):
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	672 if '/' in f:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	673 dir, subpath = f.split('/', 1)
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	674 return dir + '/', subpath
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	675 else:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	676 return '', f
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	677
26402 05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	678 _noop = lambda s: None
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	679
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	680 class treemanifest(object):
24403 0e23faa1511c treemanifest: store directory path in treemanifest nodes Martin von Zweigbergk <martinvonz@google.com> parents: 24402 diff changeset	681 def __init__(self, dir='', text=''):
0e23faa1511c treemanifest: store directory path in treemanifest nodes Martin von Zweigbergk <martinvonz@google.com> parents: 24402 diff changeset	682 self._dir = dir
25091 b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	683 self._node = revlog.nullid
26402 05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	684 self._loadfunc = _noop
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	685 self._copyfunc = _noop
25220 f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	686 self._dirty = False
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	687 self._dirs = {}
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	688 # Using _lazymanifest here is a little slower than plain old dicts
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	689 self._files = {}
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	690 self._flags = {}
25220 f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	691 if text:
f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	692 def readsubtree(subdir, subm):
f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	693 raise AssertionError('treemanifest constructor only accepts '
f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	694 'flat manifests')
f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	695 self.parse(text, readsubtree)
f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	696 self._dirty = True # Mark flat manifest dirty after parsing
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	697
24403 0e23faa1511c treemanifest: store directory path in treemanifest nodes Martin von Zweigbergk <martinvonz@google.com> parents: 24402 diff changeset	698 def _subpath(self, path):
0e23faa1511c treemanifest: store directory path in treemanifest nodes Martin von Zweigbergk <martinvonz@google.com> parents: 24402 diff changeset	699 return self._dir + path
0e23faa1511c treemanifest: store directory path in treemanifest nodes Martin von Zweigbergk <martinvonz@google.com> parents: 24402 diff changeset	700
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	701 def __len__(self):
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	702 self._load()
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	703 size = len(self._files)
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	704 for m in self._dirs.values():
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	705 size += m.__len__()
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	706 return size
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	707
36174 b42c47b8c9d4 treemanifest: add an optimized __nonzero__() Martin von Zweigbergk <martinvonz@google.com> parents: 36095 diff changeset	708 def __nonzero__(self):
b42c47b8c9d4 treemanifest: add an optimized __nonzero__() Martin von Zweigbergk <martinvonz@google.com> parents: 36095 diff changeset	709 # Faster than "__len() != 0" since it avoids loading sub-manifests
b42c47b8c9d4 treemanifest: add an optimized __nonzero__() Martin von Zweigbergk <martinvonz@google.com> parents: 36095 diff changeset	710 return not self._isempty()
b42c47b8c9d4 treemanifest: add an optimized __nonzero__() Martin von Zweigbergk <martinvonz@google.com> parents: 36095 diff changeset	711
b42c47b8c9d4 treemanifest: add an optimized __nonzero__() Martin von Zweigbergk <martinvonz@google.com> parents: 36095 diff changeset	712 __bool__ = __nonzero__
b42c47b8c9d4 treemanifest: add an optimized __nonzero__() Martin von Zweigbergk <martinvonz@google.com> parents: 36095 diff changeset	713
24551 4fdf5eac5b39 treemanifest: add treemanifest._isempty() Drew Gottlieb <drgott@google.com> parents: 24550 diff changeset	714 def _isempty(self):
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	715 self._load() # for consistency; already loaded by all callers
24551 4fdf5eac5b39 treemanifest: add treemanifest._isempty() Drew Gottlieb <drgott@google.com> parents: 24550 diff changeset	716 return (not self._files and (not self._dirs or
25151 6eb4bdad198f cleanup: use __builtins__.all instead of util.all Augie Fackler <augie@google.com> parents: 25119 diff changeset	717 all(m._isempty() for m in self._dirs.values())))
24551 4fdf5eac5b39 treemanifest: add treemanifest._isempty() Drew Gottlieb <drgott@google.com> parents: 24550 diff changeset	718
26400 6f9d9e2a661f manifest: add id(self) to treemanifest __repr__ Augie Fackler <augie@google.com> parents: 26199 diff changeset	719 def __repr__(self):
6f9d9e2a661f manifest: add id(self) to treemanifest __repr__ Augie Fackler <augie@google.com> parents: 26199 diff changeset	720 return ('<treemanifest dir=%s, node=%s, loaded=%s, dirty=%s at 0x%x>' %
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	721 (self._dir, revlog.hex(self._node),
26402 05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	722 bool(self._loadfunc is _noop),
26400 6f9d9e2a661f manifest: add id(self) to treemanifest __repr__ Augie Fackler <augie@google.com> parents: 26199 diff changeset	723 self._dirty, id(self)))
25091 b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	724
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	725 def dir(self):
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	726 '''The directory that this tree manifest represents, including a
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	727 trailing '/'. Empty string for the repo root directory.'''
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	728 return self._dir
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	729
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	730 def node(self):
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	731 '''This node of this instance. nullid for unsaved instances. Should
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	732 be updated when the instance is read or written from a revlog.
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	733 '''
25220 f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	734 assert not self._dirty
25091 b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	735 return self._node
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	736
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	737 def setnode(self, node):
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	738 self._node = node
25220 f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	739 self._dirty = False
24403 0e23faa1511c treemanifest: store directory path in treemanifest nodes Martin von Zweigbergk <martinvonz@google.com> parents: 24402 diff changeset	740
28206 8ab91d9290ce treemanifest: implement iterentries() Martin von Zweigbergk <martinvonz@google.com> parents: 28203 diff changeset	741 def iterentries(self):
8ab91d9290ce treemanifest: implement iterentries() Martin von Zweigbergk <martinvonz@google.com> parents: 28203 diff changeset	742 self._load()
32536 aa333c1982ab manifest: use itertools.chain() instead of + for Python 3 compat Augie Fackler <raf@durin42.com> parents: 32535 diff changeset	743 for p, n in sorted(itertools.chain(self._dirs.items(),
aa333c1982ab manifest: use itertools.chain() instead of + for Python 3 compat Augie Fackler <raf@durin42.com> parents: 32535 diff changeset	744 self._files.items())):
28206 8ab91d9290ce treemanifest: implement iterentries() Martin von Zweigbergk <martinvonz@google.com> parents: 28203 diff changeset	745 if p in self._files:
8ab91d9290ce treemanifest: implement iterentries() Martin von Zweigbergk <martinvonz@google.com> parents: 28203 diff changeset	746 yield self._subpath(p), n, self._flags.get(p, '')
8ab91d9290ce treemanifest: implement iterentries() Martin von Zweigbergk <martinvonz@google.com> parents: 28203 diff changeset	747 else:
8ab91d9290ce treemanifest: implement iterentries() Martin von Zweigbergk <martinvonz@google.com> parents: 28203 diff changeset	748 for x in n.iterentries():
8ab91d9290ce treemanifest: implement iterentries() Martin von Zweigbergk <martinvonz@google.com> parents: 28203 diff changeset	749 yield x
8ab91d9290ce treemanifest: implement iterentries() Martin von Zweigbergk <martinvonz@google.com> parents: 28203 diff changeset	750
32550 b98199a5c3e1 cleanup: rename all iteritems methods to items and add iteritems alias Augie Fackler <raf@durin42.com> parents: 32536 diff changeset	751 def items(self):
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	752 self._load()
32536 aa333c1982ab manifest: use itertools.chain() instead of + for Python 3 compat Augie Fackler <raf@durin42.com> parents: 32535 diff changeset	753 for p, n in sorted(itertools.chain(self._dirs.items(),
aa333c1982ab manifest: use itertools.chain() instead of + for Python 3 compat Augie Fackler <raf@durin42.com> parents: 32535 diff changeset	754 self._files.items())):
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	755 if p in self._files:
24403 0e23faa1511c treemanifest: store directory path in treemanifest nodes Martin von Zweigbergk <martinvonz@google.com> parents: 24402 diff changeset	756 yield self._subpath(p), n
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	757 else:
24403 0e23faa1511c treemanifest: store directory path in treemanifest nodes Martin von Zweigbergk <martinvonz@google.com> parents: 24402 diff changeset	758 for f, sn in n.iteritems():
0e23faa1511c treemanifest: store directory path in treemanifest nodes Martin von Zweigbergk <martinvonz@google.com> parents: 24402 diff changeset	759 yield f, sn
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	760
32550 b98199a5c3e1 cleanup: rename all iteritems methods to items and add iteritems alias Augie Fackler <raf@durin42.com> parents: 32536 diff changeset	761 iteritems = items
b98199a5c3e1 cleanup: rename all iteritems methods to items and add iteritems alias Augie Fackler <raf@durin42.com> parents: 32536 diff changeset	762
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	763 def iterkeys(self):
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	764 self._load()
32536 aa333c1982ab manifest: use itertools.chain() instead of + for Python 3 compat Augie Fackler <raf@durin42.com> parents: 32535 diff changeset	765 for p in sorted(itertools.chain(self._dirs, self._files)):
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	766 if p in self._files:
24403 0e23faa1511c treemanifest: store directory path in treemanifest nodes Martin von Zweigbergk <martinvonz@google.com> parents: 24402 diff changeset	767 yield self._subpath(p)
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	768 else:
35586 fbf1a5d680ea py3: don't use dict.iterkeys() Pulkit Goyal <7895pulkit@gmail.com> parents: 34345 diff changeset	769 for f in self._dirs[p]:
24403 0e23faa1511c treemanifest: store directory path in treemanifest nodes Martin von Zweigbergk <martinvonz@google.com> parents: 24402 diff changeset	770 yield f
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	771
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	772 def keys(self):
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	773 return list(self.iterkeys())
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	774
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	775 def __iter__(self):
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	776 return self.iterkeys()
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	777
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	778 def __contains__(self, f):
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	779 if f is None:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	780 return False
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	781 self._load()
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	782 dir, subpath = _splittopdir(f)
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	783 if dir:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	784 if dir not in self._dirs:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	785 return False
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	786 return self._dirs[dir].__contains__(subpath)
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	787 else:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	788 return f in self._files
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	789
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	790 def get(self, f, default=None):
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	791 self._load()
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	792 dir, subpath = _splittopdir(f)
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	793 if dir:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	794 if dir not in self._dirs:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	795 return default
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	796 return self._dirs[dir].get(subpath, default)
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	797 else:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	798 return self._files.get(f, default)
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	799
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	800 def __getitem__(self, f):
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	801 self._load()
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	802 dir, subpath = _splittopdir(f)
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	803 if dir:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	804 return self._dirs[dir].__getitem__(subpath)
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	805 else:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	806 return self._files[f]
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	807
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	808 def flags(self, f):
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	809 self._load()
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	810 dir, subpath = _splittopdir(f)
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	811 if dir:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	812 if dir not in self._dirs:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	813 return ''
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	814 return self._dirs[dir].flags(subpath)
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	815 else:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	816 if f in self._dirs:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	817 return ''
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	818 return self._flags.get(f, '')
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	819
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	820 def find(self, f):
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	821 self._load()
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	822 dir, subpath = _splittopdir(f)
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	823 if dir:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	824 return self._dirs[dir].find(subpath)
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	825 else:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	826 return self._files[f], self._flags.get(f, '')
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	827
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	828 def __delitem__(self, f):
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	829 self._load()
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	830 dir, subpath = _splittopdir(f)
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	831 if dir:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	832 self._dirs[dir].__delitem__(subpath)
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	833 # If the directory is now empty, remove it
24551 4fdf5eac5b39 treemanifest: add treemanifest._isempty() Drew Gottlieb <drgott@google.com> parents: 24550 diff changeset	834 if self._dirs[dir]._isempty():
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	835 del self._dirs[dir]
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	836 else:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	837 del self._files[f]
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	838 if f in self._flags:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	839 del self._flags[f]
25220 f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	840 self._dirty = True
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	841
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	842 def __setitem__(self, f, n):
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	843 assert n is not None
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	844 self._load()
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	845 dir, subpath = _splittopdir(f)
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	846 if dir:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	847 if dir not in self._dirs:
24403 0e23faa1511c treemanifest: store directory path in treemanifest nodes Martin von Zweigbergk <martinvonz@google.com> parents: 24402 diff changeset	848 self._dirs[dir] = treemanifest(self._subpath(dir))
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	849 self._dirs[dir].__setitem__(subpath, n)
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	850 else:
24467 bfb754050ccd treemanifest: drop 22nd byte for consistency with manifestdict Martin von Zweigbergk <martinvonz@google.com> parents: 24448 diff changeset	851 self._files[f] = n[:21] # to match manifestdict's behavior
25220 f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	852 self._dirty = True
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	853
26402 05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	854 def _load(self):
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	855 if self._loadfunc is not _noop:
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	856 lf, self._loadfunc = self._loadfunc, _noop
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	857 lf(self)
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	858 elif self._copyfunc is not _noop:
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	859 cf, self._copyfunc = self._copyfunc, _noop
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	860 cf(self)
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	861
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	862 def setflag(self, f, flags):
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	863 """Set the flags (symlink, executable) for path f."""
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	864 self._load()
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	865 dir, subpath = _splittopdir(f)
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	866 if dir:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	867 if dir not in self._dirs:
24403 0e23faa1511c treemanifest: store directory path in treemanifest nodes Martin von Zweigbergk <martinvonz@google.com> parents: 24402 diff changeset	868 self._dirs[dir] = treemanifest(self._subpath(dir))
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	869 self._dirs[dir].setflag(subpath, flags)
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	870 else:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	871 self._flags[f] = flags
25220 f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	872 self._dirty = True
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	873
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	874 def copy(self):
24403 0e23faa1511c treemanifest: store directory path in treemanifest nodes Martin von Zweigbergk <martinvonz@google.com> parents: 24402 diff changeset	875 copy = treemanifest(self._dir)
25091 b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	876 copy._node = self._node
25220 f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	877 copy._dirty = self._dirty
26402 05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	878 if self._copyfunc is _noop:
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	879 def _copyfunc(s):
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	880 self._load()
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	881 for d in self._dirs:
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	882 s._dirs[d] = self._dirs[d].copy()
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	883 s._files = dict.copy(self._files)
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	884 s._flags = dict.copy(self._flags)
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	885 if self._loadfunc is _noop:
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	886 _copyfunc(copy)
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	887 else:
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	888 copy._copyfunc = _copyfunc
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	889 else:
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	890 copy._copyfunc = self._copyfunc
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	891 return copy
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	892
31255 959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	893 def filesnotin(self, m2, match=None):
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	894 '''Set of files in this manifest that are not in the other'''
31255 959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	895 if match:
959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	896 m1 = self.matches(match)
959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	897 m2 = m2.matches(match)
959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	898 return m1.filesnotin(m2)
959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	899
24405 cbe9d50d9e65 treemanifest: make filesnotin() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24404 diff changeset	900 files = set()
cbe9d50d9e65 treemanifest: make filesnotin() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24404 diff changeset	901 def _filesnotin(t1, t2):
25220 f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	902 if t1._node == t2._node and not t1._dirty and not t2._dirty:
f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	903 return
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	904 t1._load()
0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	905 t2._load()
24405 cbe9d50d9e65 treemanifest: make filesnotin() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24404 diff changeset	906 for d, m1 in t1._dirs.iteritems():
cbe9d50d9e65 treemanifest: make filesnotin() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24404 diff changeset	907 if d in t2._dirs:
cbe9d50d9e65 treemanifest: make filesnotin() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24404 diff changeset	908 m2 = t2._dirs[d]
cbe9d50d9e65 treemanifest: make filesnotin() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24404 diff changeset	909 _filesnotin(m1, m2)
cbe9d50d9e65 treemanifest: make filesnotin() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24404 diff changeset	910 else:
cbe9d50d9e65 treemanifest: make filesnotin() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24404 diff changeset	911 files.update(m1.iterkeys())
cbe9d50d9e65 treemanifest: make filesnotin() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24404 diff changeset	912
36300 413c179cf7d5 manifest: correct the one use of iterkeys() on a dict Augie Fackler <augie@google.com> parents: 36174 diff changeset	913 for fn in t1._files:
24405 cbe9d50d9e65 treemanifest: make filesnotin() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24404 diff changeset	914 if fn not in t2._files:
cbe9d50d9e65 treemanifest: make filesnotin() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24404 diff changeset	915 files.add(t1._subpath(fn))
cbe9d50d9e65 treemanifest: make filesnotin() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24404 diff changeset	916
cbe9d50d9e65 treemanifest: make filesnotin() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24404 diff changeset	917 _filesnotin(self, m2)
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	918 return files
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	919
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	920 @propertycache
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	921 def _alldirs(self):
24635 21e1ece30f8c util: move dirs() and finddirs() from scmutil to util Drew Gottlieb <drgott@google.com> parents: 24600 diff changeset	922 return util.dirs(self)
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	923
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	924 def dirs(self):
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	925 return self._alldirs
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	926
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	927 def hasdir(self, dir):
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	928 self._load()
24406 1297480ed347 treemanifest: make hasdir() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24405 diff changeset	929 topdir, subdir = _splittopdir(dir)
1297480ed347 treemanifest: make hasdir() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24405 diff changeset	930 if topdir:
1297480ed347 treemanifest: make hasdir() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24405 diff changeset	931 if topdir in self._dirs:
1297480ed347 treemanifest: make hasdir() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24405 diff changeset	932 return self._dirs[topdir].hasdir(subdir)
1297480ed347 treemanifest: make hasdir() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24405 diff changeset	933 return False
1297480ed347 treemanifest: make hasdir() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24405 diff changeset	934 return (dir + '/') in self._dirs
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	935
24646 5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	936 def walk(self, match):
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	937 '''Generates matching file names.
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	938
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	939 Equivalent to manifest.matches(match).iterkeys(), but without creating
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	940 an entirely new manifest.
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	941
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	942 It also reports nonexistent files by marking them bad with match.bad().
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	943 '''
24683 4eaea0ed8dc1 manifest.walk: special-case match.always() for speed Martin von Zweigbergk <martinvonz@google.com> parents: 24682 diff changeset	944 if match.always():
4eaea0ed8dc1 manifest.walk: special-case match.always() for speed Martin von Zweigbergk <martinvonz@google.com> parents: 24682 diff changeset	945 for f in iter(self):
4eaea0ed8dc1 manifest.walk: special-case match.always() for speed Martin von Zweigbergk <martinvonz@google.com> parents: 24682 diff changeset	946 yield f
4eaea0ed8dc1 manifest.walk: special-case match.always() for speed Martin von Zweigbergk <martinvonz@google.com> parents: 24682 diff changeset	947 return
4eaea0ed8dc1 manifest.walk: special-case match.always() for speed Martin von Zweigbergk <martinvonz@google.com> parents: 24682 diff changeset	948
24646 5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	949 fset = set(match.files())
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	950
24647 fb446c57f8f9 treemanifest: refactor treemanifest.walk() Drew Gottlieb <drgott@google.com> parents: 24646 diff changeset	951 for fn in self._walk(match):
24646 5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	952 if fn in fset:
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	953 # specified pattern is the exact name
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	954 fset.remove(fn)
24647 fb446c57f8f9 treemanifest: refactor treemanifest.walk() Drew Gottlieb <drgott@google.com> parents: 24646 diff changeset	955 yield fn
24646 5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	956
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	957 # for dirstate.walk, files=['.'] means "walk the whole tree".
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	958 # follow that here, too
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	959 fset.discard('.')
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	960
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	961 for fn in sorted(fset):
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	962 if not self.hasdir(fn):
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	963 match.bad(fn, None)
5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24636 diff changeset	964
25188 2773540c3650 match: remove unnecessary optimization where visitdir() returns 'all' Drew Gottlieb <drgott@google.com> parents: 25185 diff changeset	965 def _walk(self, match):
2773540c3650 match: remove unnecessary optimization where visitdir() returns 'all' Drew Gottlieb <drgott@google.com> parents: 25185 diff changeset	966 '''Recursively generates matching file names for walk().'''
2773540c3650 match: remove unnecessary optimization where visitdir() returns 'all' Drew Gottlieb <drgott@google.com> parents: 25185 diff changeset	967 if not match.visitdir(self._dir[:-1] or '.'):
2773540c3650 match: remove unnecessary optimization where visitdir() returns 'all' Drew Gottlieb <drgott@google.com> parents: 25185 diff changeset	968 return
24647 fb446c57f8f9 treemanifest: refactor treemanifest.walk() Drew Gottlieb <drgott@google.com> parents: 24646 diff changeset	969
fb446c57f8f9 treemanifest: refactor treemanifest.walk() Drew Gottlieb <drgott@google.com> parents: 24646 diff changeset	970 # yield this dir's files and walk its submanifests
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	971 self._load()
36301 5245bac09e6a manifest: use list(dict) instead of dict.keys() to get a list of keys Augie Fackler <augie@google.com> parents: 36300 diff changeset	972 for p in sorted(list(self._dirs) + list(self._files)):
24647 fb446c57f8f9 treemanifest: refactor treemanifest.walk() Drew Gottlieb <drgott@google.com> parents: 24646 diff changeset	973 if p in self._files:
fb446c57f8f9 treemanifest: refactor treemanifest.walk() Drew Gottlieb <drgott@google.com> parents: 24646 diff changeset	974 fullp = self._subpath(p)
fb446c57f8f9 treemanifest: refactor treemanifest.walk() Drew Gottlieb <drgott@google.com> parents: 24646 diff changeset	975 if match(fullp):
fb446c57f8f9 treemanifest: refactor treemanifest.walk() Drew Gottlieb <drgott@google.com> parents: 24646 diff changeset	976 yield fullp
fb446c57f8f9 treemanifest: refactor treemanifest.walk() Drew Gottlieb <drgott@google.com> parents: 24646 diff changeset	977 else:
25188 2773540c3650 match: remove unnecessary optimization where visitdir() returns 'all' Drew Gottlieb <drgott@google.com> parents: 25185 diff changeset	978 for f in self._dirs[p]._walk(match):
24647 fb446c57f8f9 treemanifest: refactor treemanifest.walk() Drew Gottlieb <drgott@google.com> parents: 24646 diff changeset	979 yield f
fb446c57f8f9 treemanifest: refactor treemanifest.walk() Drew Gottlieb <drgott@google.com> parents: 24646 diff changeset	980
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	981 def matches(self, match):
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	982 '''generate a new manifest filtered by the match argument'''
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	983 if match.always():
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	984 return self.copy()
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	985
24552 a2292da6d821 treemanifest: make treemanifest.matches() faster Drew Gottlieb <drgott@google.com> parents: 24551 diff changeset	986 return self._matches(match)
a2292da6d821 treemanifest: make treemanifest.matches() faster Drew Gottlieb <drgott@google.com> parents: 24551 diff changeset	987
25188 2773540c3650 match: remove unnecessary optimization where visitdir() returns 'all' Drew Gottlieb <drgott@google.com> parents: 25185 diff changeset	988 def _matches(self, match):
24552 a2292da6d821 treemanifest: make treemanifest.matches() faster Drew Gottlieb <drgott@google.com> parents: 24551 diff changeset	989 '''recursively generate a new manifest filtered by the match argument.
25188 2773540c3650 match: remove unnecessary optimization where visitdir() returns 'all' Drew Gottlieb <drgott@google.com> parents: 25185 diff changeset	990 '''
27343 c59647c6694d treemanifest: don't iterate entire matching submanifests on match() Martin von Zweigbergk <martinvonz@google.com> parents: 27271 diff changeset	991
c59647c6694d treemanifest: don't iterate entire matching submanifests on match() Martin von Zweigbergk <martinvonz@google.com> parents: 27271 diff changeset	992 visit = match.visitdir(self._dir[:-1] or '.')
c59647c6694d treemanifest: don't iterate entire matching submanifests on match() Martin von Zweigbergk <martinvonz@google.com> parents: 27271 diff changeset	993 if visit == 'all':
c59647c6694d treemanifest: don't iterate entire matching submanifests on match() Martin von Zweigbergk <martinvonz@google.com> parents: 27271 diff changeset	994 return self.copy()
24552 a2292da6d821 treemanifest: make treemanifest.matches() faster Drew Gottlieb <drgott@google.com> parents: 24551 diff changeset	995 ret = treemanifest(self._dir)
27343 c59647c6694d treemanifest: don't iterate entire matching submanifests on match() Martin von Zweigbergk <martinvonz@google.com> parents: 27271 diff changeset	996 if not visit:
25188 2773540c3650 match: remove unnecessary optimization where visitdir() returns 'all' Drew Gottlieb <drgott@google.com> parents: 25185 diff changeset	997 return ret
24552 a2292da6d821 treemanifest: make treemanifest.matches() faster Drew Gottlieb <drgott@google.com> parents: 24551 diff changeset	998
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	999 self._load()
24552 a2292da6d821 treemanifest: make treemanifest.matches() faster Drew Gottlieb <drgott@google.com> parents: 24551 diff changeset	1000 for fn in self._files:
a2292da6d821 treemanifest: make treemanifest.matches() faster Drew Gottlieb <drgott@google.com> parents: 24551 diff changeset	1001 fullp = self._subpath(fn)
a2292da6d821 treemanifest: make treemanifest.matches() faster Drew Gottlieb <drgott@google.com> parents: 24551 diff changeset	1002 if not match(fullp):
a2292da6d821 treemanifest: make treemanifest.matches() faster Drew Gottlieb <drgott@google.com> parents: 24551 diff changeset	1003 continue
a2292da6d821 treemanifest: make treemanifest.matches() faster Drew Gottlieb <drgott@google.com> parents: 24551 diff changeset	1004 ret._files[fn] = self._files[fn]
a2292da6d821 treemanifest: make treemanifest.matches() faster Drew Gottlieb <drgott@google.com> parents: 24551 diff changeset	1005 if fn in self._flags:
a2292da6d821 treemanifest: make treemanifest.matches() faster Drew Gottlieb <drgott@google.com> parents: 24551 diff changeset	1006 ret._flags[fn] = self._flags[fn]
a2292da6d821 treemanifest: make treemanifest.matches() faster Drew Gottlieb <drgott@google.com> parents: 24551 diff changeset	1007
a2292da6d821 treemanifest: make treemanifest.matches() faster Drew Gottlieb <drgott@google.com> parents: 24551 diff changeset	1008 for dir, subm in self._dirs.iteritems():
25188 2773540c3650 match: remove unnecessary optimization where visitdir() returns 'all' Drew Gottlieb <drgott@google.com> parents: 25185 diff changeset	1009 m = subm._matches(match)
24552 a2292da6d821 treemanifest: make treemanifest.matches() faster Drew Gottlieb <drgott@google.com> parents: 24551 diff changeset	1010 if not m._isempty():
a2292da6d821 treemanifest: make treemanifest.matches() faster Drew Gottlieb <drgott@google.com> parents: 24551 diff changeset	1011 ret._dirs[dir] = m
a2292da6d821 treemanifest: make treemanifest.matches() faster Drew Gottlieb <drgott@google.com> parents: 24551 diff changeset	1012
25220 f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	1013 if not ret._isempty():
f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	1014 ret._dirty = True
24552 a2292da6d821 treemanifest: make treemanifest.matches() faster Drew Gottlieb <drgott@google.com> parents: 24551 diff changeset	1015 return ret
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1016
31255 959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	1017 def diff(self, m2, match=None, clean=False):
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1018 '''Finds changes between the current manifest and m2.
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1019
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1020 Args:
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1021 m2: the manifest to which this manifest should be compared.
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1022 clean: if true, include files unchanged between these manifests
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1023 with a None value in the returned dictionary.
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1024
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1025 The result is returned as a dict with filename as key and
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1026 values of the form ((n1,fl1),(n2,fl2)), where n1/n2 is the
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1027 nodeid in the current/other manifest and fl1/fl2 is the flag
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1028 in the current/other manifest. Where the file does not exist,
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1029 the nodeid will be None and the flags will be the empty
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1030 string.
e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1031 '''
31255 959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	1032 if match:
959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	1033 m1 = self.matches(match)
959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	1034 m2 = m2.matches(match)
959ebff3505a manifest: add match argument to diff and filesnotin Durham Goode <durham@fb.com> parents: 31153 diff changeset	1035 return m1.diff(m2, clean=clean)
24404 96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1036 result = {}
96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1037 emptytree = treemanifest()
96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1038 def _diff(t1, t2):
25220 f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	1039 if t1._node == t2._node and not t1._dirty and not t2._dirty:
f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	1040 return
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	1041 t1._load()
0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	1042 t2._load()
24404 96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1043 for d, m1 in t1._dirs.iteritems():
96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1044 m2 = t2._dirs.get(d, emptytree)
96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1045 _diff(m1, m2)
96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1046
96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1047 for d, m2 in t2._dirs.iteritems():
96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1048 if d not in t1._dirs:
96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1049 _diff(emptytree, m2)
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1050
24404 96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1051 for fn, n1 in t1._files.iteritems():
96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1052 fl1 = t1._flags.get(fn, '')
96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1053 n2 = t2._files.get(fn, None)
96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1054 fl2 = t2._flags.get(fn, '')
96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1055 if n1 != n2 or fl1 != fl2:
96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1056 result[t1._subpath(fn)] = ((n1, fl1), (n2, fl2))
96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1057 elif clean:
96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1058 result[t1._subpath(fn)] = None
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1059
24404 96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1060 for fn, n2 in t2._files.iteritems():
96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1061 if fn not in t1._files:
96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1062 fl2 = t2._flags.get(fn, '')
96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1063 result[t2._subpath(fn)] = ((None, ''), (n2, fl2))
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1064
24404 96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1065 _diff(self, m2)
96cccf1e3257 treemanifest: make diff() faster Martin von Zweigbergk <martinvonz@google.com> parents: 24403 diff changeset	1066 return result
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1067
25221 eafa06e9edde treemanifest: speed up commit using dirty flag Martin von Zweigbergk <martinvonz@google.com> parents: 25220 diff changeset	1068 def unmodifiedsince(self, m2):
eafa06e9edde treemanifest: speed up commit using dirty flag Martin von Zweigbergk <martinvonz@google.com> parents: 25220 diff changeset	1069 return not self._dirty and not m2._dirty and self._node == m2._node
eafa06e9edde treemanifest: speed up commit using dirty flag Martin von Zweigbergk <martinvonz@google.com> parents: 25220 diff changeset	1070
25091 b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1071 def parse(self, text, readsubtree):
24781 055b3cbe6c57 treemanifest: extract parse method from constructor Martin von Zweigbergk <martinvonz@google.com> parents: 24780 diff changeset	1072 for f, n, fl in _parse(text):
27271 2a31433a59ba manifest: use 't' for tree manifest flag Martin von Zweigbergk <martinvonz@google.com> parents: 26871 diff changeset	1073 if fl == 't':
25091 b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1074 f = f + '/'
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1075 self._dirs[f] = readsubtree(self._subpath(f), n)
25220 f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	1076 elif '/' in f:
f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	1077 # This is a flat manifest, so use __setitem__ and setflag rather
f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	1078 # than assigning directly to _files and _flags, so we can
f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	1079 # assign a path in a subdirectory, and to mark dirty (compared
f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	1080 # to nullid).
25091 b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1081 self[f] = n
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1082 if fl:
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1083 self.setflag(f, fl)
25220 f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	1084 else:
f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	1085 # Assigning to _files and _flags avoids marking as dirty,
f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	1086 # and should be a little faster.
f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	1087 self._files[f] = n
f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	1088 if fl:
f0fbd88b21fb treemanifest: speed up diff by keeping track of dirty nodes Martin von Zweigbergk <martinvonz@google.com> parents: 25188 diff changeset	1089 self._flags[f] = fl
24781 055b3cbe6c57 treemanifest: extract parse method from constructor Martin von Zweigbergk <martinvonz@google.com> parents: 24780 diff changeset	1090
36373 0147a4730420 cleanup: say goodbye to manifestv2 format Augie Fackler <augie@google.com> parents: 36301 diff changeset	1091 def text(self):
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1092 """Get the full data of this manifest as a bytestring."""
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	1093 self._load()
36373 0147a4730420 cleanup: say goodbye to manifestv2 format Augie Fackler <augie@google.com> parents: 36301 diff changeset	1094 return _text(self.iterentries())
24401 e6e023d57e94 treemanifest: create treemanifest class Martin von Zweigbergk <martinvonz@google.com> parents: 24396 diff changeset	1095
36373 0147a4730420 cleanup: say goodbye to manifestv2 format Augie Fackler <augie@google.com> parents: 36301 diff changeset	1096 def dirtext(self):
25091 b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1097 """Get the full data of this directory as a bytestring. Make sure that
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1098 any submanifests have been written first, so their nodeids are correct.
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1099 """
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	1100 self._load()
25091 b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1101 flags = self.flags
27271 2a31433a59ba manifest: use 't' for tree manifest flag Martin von Zweigbergk <martinvonz@google.com> parents: 26871 diff changeset	1102 dirs = [(d[:-1], self._dirs[d]._node, 't') for d in self._dirs]
25091 b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1103 files = [(f, self._files[f], flags(f)) for f in self._files]
36373 0147a4730420 cleanup: say goodbye to manifestv2 format Augie Fackler <augie@google.com> parents: 36301 diff changeset	1104 return _text(sorted(dirs + files))
25091 b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1105
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	1106 def read(self, gettext, readsubtree):
26402 05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	1107 def _load_for_read(s):
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	1108 s.parse(gettext(), readsubtree)
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	1109 s._dirty = False
05871262acd5 treemanifest: rework lazy-copying code (issue4840) Augie Fackler <augie@google.com> parents: 26401 diff changeset	1110 self._loadfunc = _load_for_read
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	1111
25091 b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1112 def writesubtrees(self, m1, m2, writesubtree):
25222 0de132d5328a treemanifest: lazily load manifests Martin von Zweigbergk <martinvonz@google.com> parents: 25221 diff changeset	1113 self._load() # for consistency; should never have any effect here
29888 8a84347b9907 manifest: call m1.load and m2.load before writing a subtree Durham Goode <durham@fb.com> parents: 29826 diff changeset	1114 m1._load()
8a84347b9907 manifest: call m1.load and m2.load before writing a subtree Durham Goode <durham@fb.com> parents: 29826 diff changeset	1115 m2._load()
25091 b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1116 emptytree = treemanifest()
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1117 for d, subm in self._dirs.iteritems():
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1118 subp1 = m1._dirs.get(d, emptytree)._node
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1119 subp2 = m2._dirs.get(d, emptytree)._node
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1120 if subp1 == revlog.nullid:
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1121 subp1, subp2 = subp2, subp1
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1122 writesubtree(subm, subp1, subp2)
b5052fc73300 treemanifest: store submanifest revlog per directory Martin von Zweigbergk <martinvonz@google.com> parents: 24956 diff changeset	1123
31876 94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31787 diff changeset	1124 def walksubtrees(self, matcher=None):
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31787 diff changeset	1125 """Returns an iterator of the subtrees of this manifest, including this
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31787 diff changeset	1126 manifest itself.
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31787 diff changeset	1127
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31787 diff changeset	1128 If `matcher` is provided, it only returns subtrees that match.
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31787 diff changeset	1129 """
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31787 diff changeset	1130 if matcher and not matcher.visitdir(self._dir[:-1] or '.'):
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31787 diff changeset	1131 return
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31787 diff changeset	1132 if not matcher or matcher(self._dir[:-1]):
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31787 diff changeset	1133 yield self
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31787 diff changeset	1134
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31787 diff changeset	1135 self._load()
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31787 diff changeset	1136 for d, subm in self._dirs.iteritems():
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31787 diff changeset	1137 for subtree in subm.walksubtrees(matcher=matcher):
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31787 diff changeset	1138 yield subtree
94c1d3c1aea2 treemanifest: add walksubtrees api Durham Goode <durham@fb.com> parents: 31787 diff changeset	1139
38781 0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1140 class manifestfulltextcache(util.lrucachedict):
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1141 """File-backed LRU cache for the manifest cache
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1142
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1143 File consists of entries, up to EOF:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1144
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1145 - 20 bytes node, 4 bytes length, <length> manifest data
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1146
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1147 These are written in reverse cache order (oldest to newest).
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1148
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1149 """
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1150 def __init__(self, max):
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1151 super(manifestfulltextcache, self).__init__(max)
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1152 self._dirty = False
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1153 self._read = False
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1154 self._opener = None
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1155
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1156 def read(self):
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1157 if self._read or self._opener is None:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1158 return
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1159
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1160 try:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1161 with self._opener('manifestfulltextcache') as fp:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1162 set = super(manifestfulltextcache, self).__setitem__
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1163 # ignore trailing data, this is a cache, corruption is skipped
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1164 while True:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1165 node = fp.read(20)
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1166 if len(node) < 20:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1167 break
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1168 try:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1169 size = struct.unpack('>L', fp.read(4))[0]
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1170 except struct.error:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1171 break
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1172 value = bytearray(fp.read(size))
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1173 if len(value) != size:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1174 break
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1175 set(node, value)
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1176 except IOError:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1177 # the file is allowed to be missing
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1178 pass
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1179
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1180 self._read = True
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1181 self._dirty = False
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1182
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1183 def write(self):
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1184 if not self._dirty or self._opener is None:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1185 return
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1186 # rotate backwards to the first used node
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1187 with self._opener(
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1188 'manifestfulltextcache', 'w', atomictemp=True, checkambig=True
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1189 ) as fp:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1190 node = self._head.prev
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1191 while True:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1192 if node.key in self._cache:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1193 fp.write(node.key)
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1194 fp.write(struct.pack('>L', len(node.value)))
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1195 fp.write(node.value)
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1196 if node is self._head:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1197 break
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1198 node = node.prev
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1199
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1200 def __len__(self):
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1201 if not self._read:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1202 self.read()
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1203 return super(manifestfulltextcache, self).__len__()
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1204
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1205 def __contains__(self, k):
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1206 if not self._read:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1207 self.read()
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1208 return super(manifestfulltextcache, self).__contains__(k)
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1209
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1210 def __iter__(self):
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1211 if not self._read:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1212 self.read()
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1213 return super(manifestfulltextcache, self).__iter__()
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1214
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1215 def __getitem__(self, k):
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1216 if not self._read:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1217 self.read()
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1218 # the cache lru order can change on read
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1219 setdirty = self._cache.get(k) is not self._head
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1220 value = super(manifestfulltextcache, self).__getitem__(k)
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1221 if setdirty:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1222 self._dirty = True
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1223 return value
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1224
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1225 def __setitem__(self, k, v):
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1226 if not self._read:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1227 self.read()
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1228 super(manifestfulltextcache, self).__setitem__(k, v)
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1229 self._dirty = True
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1230
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1231 def __delitem__(self, k):
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1232 if not self._read:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1233 self.read()
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1234 super(manifestfulltextcache, self).__delitem__(k)
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1235 self._dirty = True
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1236
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1237 def get(self, k, default=None):
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1238 if not self._read:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1239 self.read()
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1240 return super(manifestfulltextcache, self).get(k, default=default)
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1241
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1242 def clear(self, clear_persisted_data=False):
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1243 super(manifestfulltextcache, self).clear()
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1244 if clear_persisted_data:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1245 self._dirty = True
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1246 self.write()
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1247 self._read = False
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1248
39314 7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1249 @interfaceutil.implementer(repository.imanifeststorage)
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1250 class manifestrevlog(object):
29824 58d4ecdc531e manifest: make manifest derive from manifestrevlog Durham Goode <durham@fb.com> parents: 29823 diff changeset	1251 '''A revlog that stores manifest texts. This is responsible for caching the
58d4ecdc531e manifest: make manifest derive from manifestrevlog Durham Goode <durham@fb.com> parents: 29823 diff changeset	1252 full-text manifest contents.
58d4ecdc531e manifest: make manifest derive from manifestrevlog Durham Goode <durham@fb.com> parents: 29823 diff changeset	1253 '''
39243 0d97530eb535 manifest: rename dir argument and attribute to tree Gregory Szorc <gregory.szorc@gmail.com> parents: 39242 diff changeset	1254 def __init__(self, opener, tree='', dirlogcache=None, indexfile=None,
32252 d67991c4fefe treemanifest: allow manifestrevlog to take an explicit treemanifest arg Durham Goode <durham@fb.com> parents: 32195 diff changeset	1255 treemanifest=False):
31151 6d9f8bc2b5ea manifest: allow specifying the revlog filename Durham Goode <durham@fb.com> parents: 31097 diff changeset	1256 """Constructs a new manifest revlog
6d9f8bc2b5ea manifest: allow specifying the revlog filename Durham Goode <durham@fb.com> parents: 31097 diff changeset	1257
6d9f8bc2b5ea manifest: allow specifying the revlog filename Durham Goode <durham@fb.com> parents: 31097 diff changeset	1258 `indexfile` - used by extensions to have two manifests at once, like
6d9f8bc2b5ea manifest: allow specifying the revlog filename Durham Goode <durham@fb.com> parents: 31097 diff changeset	1259 when transitioning between flatmanifeset and treemanifests.
32252 d67991c4fefe treemanifest: allow manifestrevlog to take an explicit treemanifest arg Durham Goode <durham@fb.com> parents: 32195 diff changeset	1260
d67991c4fefe treemanifest: allow manifestrevlog to take an explicit treemanifest arg Durham Goode <durham@fb.com> parents: 32195 diff changeset	1261 `treemanifest` - used to indicate this is a tree manifest revlog. Opener
d67991c4fefe treemanifest: allow manifestrevlog to take an explicit treemanifest arg Durham Goode <durham@fb.com> parents: 32195 diff changeset	1262 options can also be used to make this a tree manifest revlog. The opener
d67991c4fefe treemanifest: allow manifestrevlog to take an explicit treemanifest arg Durham Goode <durham@fb.com> parents: 32195 diff changeset	1263 option takes precedence, so if it is set to True, we ignore whatever
d67991c4fefe treemanifest: allow manifestrevlog to take an explicit treemanifest arg Durham Goode <durham@fb.com> parents: 32195 diff changeset	1264 value is passed in to the constructor.
31151 6d9f8bc2b5ea manifest: allow specifying the revlog filename Durham Goode <durham@fb.com> parents: 31097 diff changeset	1265 """
29824 58d4ecdc531e manifest: make manifest derive from manifestrevlog Durham Goode <durham@fb.com> parents: 29823 diff changeset	1266 # During normal operations, we expect to deal with not more than four
58d4ecdc531e manifest: make manifest derive from manifestrevlog Durham Goode <durham@fb.com> parents: 29823 diff changeset	1267 # revs at a time (such as during commit --amend). When rebasing large
58d4ecdc531e manifest: make manifest derive from manifestrevlog Durham Goode <durham@fb.com> parents: 29823 diff changeset	1268 # stacks of commits, the number can go up, hence the config knob below.
58d4ecdc531e manifest: make manifest derive from manifestrevlog Durham Goode <durham@fb.com> parents: 29823 diff changeset	1269 cachesize = 4
32252 d67991c4fefe treemanifest: allow manifestrevlog to take an explicit treemanifest arg Durham Goode <durham@fb.com> parents: 32195 diff changeset	1270 optiontreemanifest = False
29824 58d4ecdc531e manifest: make manifest derive from manifestrevlog Durham Goode <durham@fb.com> parents: 29823 diff changeset	1271 opts = getattr(opener, 'options', None)
58d4ecdc531e manifest: make manifest derive from manifestrevlog Durham Goode <durham@fb.com> parents: 29823 diff changeset	1272 if opts is not None:
58d4ecdc531e manifest: make manifest derive from manifestrevlog Durham Goode <durham@fb.com> parents: 29823 diff changeset	1273 cachesize = opts.get('manifestcachesize', cachesize)
32252 d67991c4fefe treemanifest: allow manifestrevlog to take an explicit treemanifest arg Durham Goode <durham@fb.com> parents: 32195 diff changeset	1274 optiontreemanifest = opts.get('treemanifest', False)
29940 fa145a205a7f manifest: move revlog specific options from manifest to manifestrevlog Durham Goode <durham@fb.com> parents: 29939 diff changeset	1275
32252 d67991c4fefe treemanifest: allow manifestrevlog to take an explicit treemanifest arg Durham Goode <durham@fb.com> parents: 32195 diff changeset	1276 self._treeondisk = optiontreemanifest or treemanifest
29940 fa145a205a7f manifest: move revlog specific options from manifest to manifestrevlog Durham Goode <durham@fb.com> parents: 29939 diff changeset	1277
38781 0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1278 self._fulltextcache = manifestfulltextcache(cachesize)
29824 58d4ecdc531e manifest: make manifest derive from manifestrevlog Durham Goode <durham@fb.com> parents: 29823 diff changeset	1279
39243 0d97530eb535 manifest: rename dir argument and attribute to tree Gregory Szorc <gregory.szorc@gmail.com> parents: 39242 diff changeset	1280 if tree:
29940 fa145a205a7f manifest: move revlog specific options from manifest to manifestrevlog Durham Goode <durham@fb.com> parents: 29939 diff changeset	1281 assert self._treeondisk, 'opts is %r' % opts
31151 6d9f8bc2b5ea manifest: allow specifying the revlog filename Durham Goode <durham@fb.com> parents: 31097 diff changeset	1282
6d9f8bc2b5ea manifest: allow specifying the revlog filename Durham Goode <durham@fb.com> parents: 31097 diff changeset	1283 if indexfile is None:
6d9f8bc2b5ea manifest: allow specifying the revlog filename Durham Goode <durham@fb.com> parents: 31097 diff changeset	1284 indexfile = '00manifest.i'
39243 0d97530eb535 manifest: rename dir argument and attribute to tree Gregory Szorc <gregory.szorc@gmail.com> parents: 39242 diff changeset	1285 if tree:
0d97530eb535 manifest: rename dir argument and attribute to tree Gregory Szorc <gregory.szorc@gmail.com> parents: 39242 diff changeset	1286 indexfile = "meta/" + tree + indexfile
31151 6d9f8bc2b5ea manifest: allow specifying the revlog filename Durham Goode <durham@fb.com> parents: 31097 diff changeset	1287
39243 0d97530eb535 manifest: rename dir argument and attribute to tree Gregory Szorc <gregory.szorc@gmail.com> parents: 39242 diff changeset	1288 self._tree = tree
29941 1cc93a154723 manifest: move dirlog up to manifestrevlog Durham Goode <durham@fb.com> parents: 29940 diff changeset	1289 # The dirlogcache is kept on the root manifest log
39243 0d97530eb535 manifest: rename dir argument and attribute to tree Gregory Szorc <gregory.szorc@gmail.com> parents: 39242 diff changeset	1290 if tree:
29941 1cc93a154723 manifest: move dirlog up to manifestrevlog Durham Goode <durham@fb.com> parents: 29940 diff changeset	1291 self._dirlogcache = dirlogcache
1cc93a154723 manifest: move dirlog up to manifestrevlog Durham Goode <durham@fb.com> parents: 29940 diff changeset	1292 else:
1cc93a154723 manifest: move dirlog up to manifestrevlog Durham Goode <durham@fb.com> parents: 29940 diff changeset	1293 self._dirlogcache = {'': self}
29940 fa145a205a7f manifest: move revlog specific options from manifest to manifestrevlog Durham Goode <durham@fb.com> parents: 29939 diff changeset	1294
39314 7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1295 self._revlog = revlog.revlog(opener, indexfile,
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1296 # only root indexfile is cached
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1297 checkambig=not bool(tree),
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1298 mmaplargeindex=True)
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1299
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1300 self.index = self._revlog.index
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1301 self.version = self._revlog.version
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1302 self._generaldelta = self._revlog._generaldelta
29940 fa145a205a7f manifest: move revlog specific options from manifest to manifestrevlog Durham Goode <durham@fb.com> parents: 29939 diff changeset	1303
38781 0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1304 def _setupmanifestcachehooks(self, repo):
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1305 """Persist the manifestfulltextcache on lock release"""
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1306 if not util.safehasattr(repo, '_lockref'):
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1307 return
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1308
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1309 self._fulltextcache._opener = repo.cachevfs
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1310 reporef = weakref.ref(repo)
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1311 manifestrevlogref = weakref.ref(self)
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1312
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1313 def persistmanifestcache():
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1314 repo = reporef()
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1315 self = manifestrevlogref()
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1316 if repo is None or self is None:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1317 return
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1318 if repo.manifestlog._revlog is not self:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1319 # there's a different manifest in play now, abort
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1320 return
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1321 self._fulltextcache.write()
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1322
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1323 if repo._currentlock(repo._lockref) is not None:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1324 repo._afterlock(persistmanifestcache)
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1325
29824 58d4ecdc531e manifest: make manifest derive from manifestrevlog Durham Goode <durham@fb.com> parents: 29823 diff changeset	1326 @property
58d4ecdc531e manifest: make manifest derive from manifestrevlog Durham Goode <durham@fb.com> parents: 29823 diff changeset	1327 def fulltextcache(self):
58d4ecdc531e manifest: make manifest derive from manifestrevlog Durham Goode <durham@fb.com> parents: 29823 diff changeset	1328 return self._fulltextcache
58d4ecdc531e manifest: make manifest derive from manifestrevlog Durham Goode <durham@fb.com> parents: 29823 diff changeset	1329
38781 0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1330 def clearcaches(self, clear_persisted_data=False):
39314 7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1331 self._revlog.clearcaches()
38781 0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1332 self._fulltextcache.clear(clear_persisted_data=clear_persisted_data)
39243 0d97530eb535 manifest: rename dir argument and attribute to tree Gregory Szorc <gregory.szorc@gmail.com> parents: 39242 diff changeset	1333 self._dirlogcache = {self._tree: self}
29941 1cc93a154723 manifest: move dirlog up to manifestrevlog Durham Goode <durham@fb.com> parents: 29940 diff changeset	1334
36095 59adb3051718 manifest: clean up dirlog() to take a d parameter to avoid shadowing dir() Augie Fackler <augie@google.com> parents: 35586 diff changeset	1335 def dirlog(self, d):
59adb3051718 manifest: clean up dirlog() to take a d parameter to avoid shadowing dir() Augie Fackler <augie@google.com> parents: 35586 diff changeset	1336 if d:
29941 1cc93a154723 manifest: move dirlog up to manifestrevlog Durham Goode <durham@fb.com> parents: 29940 diff changeset	1337 assert self._treeondisk
36095 59adb3051718 manifest: clean up dirlog() to take a d parameter to avoid shadowing dir() Augie Fackler <augie@google.com> parents: 35586 diff changeset	1338 if d not in self._dirlogcache:
59adb3051718 manifest: clean up dirlog() to take a d parameter to avoid shadowing dir() Augie Fackler <augie@google.com> parents: 35586 diff changeset	1339 mfrevlog = manifestrevlog(self.opener, d,
32252 d67991c4fefe treemanifest: allow manifestrevlog to take an explicit treemanifest arg Durham Goode <durham@fb.com> parents: 32195 diff changeset	1340 self._dirlogcache,
d67991c4fefe treemanifest: allow manifestrevlog to take an explicit treemanifest arg Durham Goode <durham@fb.com> parents: 32195 diff changeset	1341 treemanifest=self._treeondisk)
36095 59adb3051718 manifest: clean up dirlog() to take a d parameter to avoid shadowing dir() Augie Fackler <augie@google.com> parents: 35586 diff changeset	1342 self._dirlogcache[d] = mfrevlog
59adb3051718 manifest: clean up dirlog() to take a d parameter to avoid shadowing dir() Augie Fackler <augie@google.com> parents: 35586 diff changeset	1343 return self._dirlogcache[d]
29824 58d4ecdc531e manifest: make manifest derive from manifestrevlog Durham Goode <durham@fb.com> parents: 29823 diff changeset	1344
30368 ed45283a0ca7 manifest: remove dependency on manifestrevlog being able to create trees Durham Goode <durham@fb.com> parents: 30345 diff changeset	1345 def add(self, m, transaction, link, p1, p2, added, removed, readtree=None):
36373 0147a4730420 cleanup: say goodbye to manifestv2 format Augie Fackler <augie@google.com> parents: 36301 diff changeset	1346 if p1 in self.fulltextcache and util.safehasattr(m, 'fastdelta'):
29961 774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1347 # If our first parent is in the manifest cache, we can
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1348 # compute a delta here using properties we know about the
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1349 # manifest up-front, which may save time later for the
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1350 # revlog layer.
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1351
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1352 _checkforbidden(added)
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1353 # combine the changed lists into one sorted iterator
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1354 work = heapq.merge([(x, False) for x in added],
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1355 [(x, True) for x in removed])
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1356
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1357 arraytext, deltatext = m.fastdelta(self.fulltextcache[p1], work)
39314 7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1358 cachedelta = self._revlog.rev(p1), deltatext
29961 774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1359 text = util.buffer(arraytext)
39314 7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1360 n = self._revlog.addrevision(text, transaction, link, p1, p2,
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1361 cachedelta)
29961 774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1362 else:
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1363 # The first parent manifest isn't already loaded, so we'll
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1364 # just encode a fulltext of the manifest and pass that
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1365 # through to the revlog layer, and let it handle the delta
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1366 # process.
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1367 if self._treeondisk:
30368 ed45283a0ca7 manifest: remove dependency on manifestrevlog being able to create trees Durham Goode <durham@fb.com> parents: 30345 diff changeset	1368 assert readtree, "readtree must be set for treemanifest writes"
39243 0d97530eb535 manifest: rename dir argument and attribute to tree Gregory Szorc <gregory.szorc@gmail.com> parents: 39242 diff changeset	1369 m1 = readtree(self._tree, p1)
0d97530eb535 manifest: rename dir argument and attribute to tree Gregory Szorc <gregory.szorc@gmail.com> parents: 39242 diff changeset	1370 m2 = readtree(self._tree, p2)
30368 ed45283a0ca7 manifest: remove dependency on manifestrevlog being able to create trees Durham Goode <durham@fb.com> parents: 30345 diff changeset	1371 n = self._addtree(m, transaction, link, m1, m2, readtree)
29961 774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1372 arraytext = None
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1373 else:
36373 0147a4730420 cleanup: say goodbye to manifestv2 format Augie Fackler <augie@google.com> parents: 36301 diff changeset	1374 text = m.text()
39314 7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1375 n = self._revlog.addrevision(text, transaction, link, p1, p2)
31346 2a18e9e6ca43 py3: use bytearray() instead of array('c', ...) constructions Augie Fackler <augie@google.com> parents: 31294 diff changeset	1376 arraytext = bytearray(text)
29961 774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1377
30209 9d06b65c5df2 manifest: don't store None in fulltextcache Martin von Zweigbergk <martinvonz@google.com> parents: 30207 diff changeset	1378 if arraytext is not None:
9d06b65c5df2 manifest: don't store None in fulltextcache Martin von Zweigbergk <martinvonz@google.com> parents: 30207 diff changeset	1379 self.fulltextcache[n] = arraytext
29961 774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1380
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1381 return n
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1382
30368 ed45283a0ca7 manifest: remove dependency on manifestrevlog being able to create trees Durham Goode <durham@fb.com> parents: 30345 diff changeset	1383 def _addtree(self, m, transaction, link, m1, m2, readtree):
29961 774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1384 # If the manifest is unchanged compared to one parent,
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1385 # don't write a new revision
39243 0d97530eb535 manifest: rename dir argument and attribute to tree Gregory Szorc <gregory.szorc@gmail.com> parents: 39242 diff changeset	1386 if self._tree != '' and (m.unmodifiedsince(m1) or m.unmodifiedsince(
0d97530eb535 manifest: rename dir argument and attribute to tree Gregory Szorc <gregory.szorc@gmail.com> parents: 39242 diff changeset	1387 m2)):
29961 774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1388 return m.node()
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1389 def writesubtree(subm, subp1, subp2):
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1390 sublog = self.dirlog(subm.dir())
30368 ed45283a0ca7 manifest: remove dependency on manifestrevlog being able to create trees Durham Goode <durham@fb.com> parents: 30345 diff changeset	1391 sublog.add(subm, transaction, link, subp1, subp2, None, None,
ed45283a0ca7 manifest: remove dependency on manifestrevlog being able to create trees Durham Goode <durham@fb.com> parents: 30345 diff changeset	1392 readtree=readtree)
29961 774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1393 m.writesubtrees(m1, m2, writesubtree)
36373 0147a4730420 cleanup: say goodbye to manifestv2 format Augie Fackler <augie@google.com> parents: 36301 diff changeset	1394 text = m.dirtext()
31294 c134a33b1d73 treemanifest: make node reuse match flat manifest behavior Durham Goode <durham@fb.com> parents: 31255 diff changeset	1395 n = None
39243 0d97530eb535 manifest: rename dir argument and attribute to tree Gregory Szorc <gregory.szorc@gmail.com> parents: 39242 diff changeset	1396 if self._tree != '':
31294 c134a33b1d73 treemanifest: make node reuse match flat manifest behavior Durham Goode <durham@fb.com> parents: 31255 diff changeset	1397 # Double-check whether contents are unchanged to one parent
36373 0147a4730420 cleanup: say goodbye to manifestv2 format Augie Fackler <augie@google.com> parents: 36301 diff changeset	1398 if text == m1.dirtext():
31294 c134a33b1d73 treemanifest: make node reuse match flat manifest behavior Durham Goode <durham@fb.com> parents: 31255 diff changeset	1399 n = m1.node()
36373 0147a4730420 cleanup: say goodbye to manifestv2 format Augie Fackler <augie@google.com> parents: 36301 diff changeset	1400 elif text == m2.dirtext():
31294 c134a33b1d73 treemanifest: make node reuse match flat manifest behavior Durham Goode <durham@fb.com> parents: 31255 diff changeset	1401 n = m2.node()
c134a33b1d73 treemanifest: make node reuse match flat manifest behavior Durham Goode <durham@fb.com> parents: 31255 diff changeset	1402
c134a33b1d73 treemanifest: make node reuse match flat manifest behavior Durham Goode <durham@fb.com> parents: 31255 diff changeset	1403 if not n:
39314 7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1404 n = self._revlog.addrevision(text, transaction, link, m1.node(),
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1405 m2.node())
31294 c134a33b1d73 treemanifest: make node reuse match flat manifest behavior Durham Goode <durham@fb.com> parents: 31255 diff changeset	1406
29961 774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1407 # Save nodeid so parent manifest can calculate its nodeid
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1408 m.setnode(n)
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1409 return n
774a15b129e8 manifest: move manifest.add onto manifestrevlog Durham Goode <durham@fb.com> parents: 29960 diff changeset	1410
39314 7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1411 def __len__(self):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1412 return len(self._revlog)
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1413
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1414 def __iter__(self):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1415 return self._revlog.__iter__()
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1416
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1417 def rev(self, node):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1418 return self._revlog.rev(node)
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1419
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1420 def node(self, rev):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1421 return self._revlog.node(rev)
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1422
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1423 def lookup(self, value):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1424 return self._revlog.lookup(value)
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1425
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1426 def parentrevs(self, rev):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1427 return self._revlog.parentrevs(rev)
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1428
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1429 def parents(self, node):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1430 return self._revlog.parents(node)
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1431
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1432 def linkrev(self, rev):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1433 return self._revlog.linkrev(rev)
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1434
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1435 def checksize(self):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1436 return self._revlog.checksize()
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1437
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1438 def revision(self, node, _df=None, raw=False):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1439 return self._revlog.revision(node, _df=_df, raw=raw)
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1440
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1441 def revdiff(self, rev1, rev2):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1442 return self._revlog.revdiff(rev1, rev2)
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1443
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1444 def cmp(self, node, text):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1445 return self._revlog.cmp(node, text)
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1446
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1447 def deltaparent(self, rev):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1448 return self._revlog.deltaparent(rev)
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1449
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1450 def emitrevisiondeltas(self, requests):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1451 return self._revlog.emitrevisiondeltas(requests)
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1452
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1453 def addgroup(self, deltas, linkmapper, transaction, addrevisioncb=None):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1454 return self._revlog.addgroup(deltas, linkmapper, transaction,
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1455 addrevisioncb=addrevisioncb)
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1456
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1457 def getstrippoint(self, minlink):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1458 return self._revlog.getstrippoint(minlink)
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1459
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1460 def strip(self, minlink, transaction):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1461 return self._revlog.strip(minlink, transaction)
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1462
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1463 def files(self):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1464 return self._revlog.files()
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1465
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1466 def clone(self, tr, destrevlog, **kwargs):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1467 if not isinstance(destrevlog, manifestrevlog):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1468 raise error.ProgrammingError('expected manifestrevlog to clone()')
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1469
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1470 return self._revlog.clone(tr, destrevlog._revlog, **kwargs)
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1471
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1472 @property
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1473 def indexfile(self):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1474 return self._revlog.indexfile
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1475
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1476 @indexfile.setter
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1477 def indexfile(self, value):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1478 self._revlog.indexfile = value
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1479
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1480 @property
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1481 def opener(self):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1482 return self._revlog.opener
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1483
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1484 @opener.setter
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1485 def opener(self, value):
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1486 self._revlog.opener = value
7f5e6d3e9032 manifest: proxy to revlog instance instead of inheriting Gregory Szorc <gregory.szorc@gmail.com> parents: 39246 diff changeset	1487
38530 c82ea938efbb repository: define manifest interfaces Gregory Szorc <gregory.szorc@gmail.com> parents: 38510 diff changeset	1488 @interfaceutil.implementer(repository.imanifestlog)
29825 426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1489 class manifestlog(object):
426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1490 """A collection class representing the collection of manifest snapshots
426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1491 referenced by commits in the repository.
426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1492
426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1493 In this situation, 'manifest' refers to the abstract concept of a snapshot
426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1494 of the list of files in the given commit. Consumers of the output of this
426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1495 class do not care about the implementation details of the actual manifests
426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1496 they receive (i.e. tree or flat or lazily loaded, etc)."""
29826 93b44aa17691 manifest: use property instead of field for manifest revlog storage Durham Goode <durham@fb.com> parents: 29825 diff changeset	1497 def __init__(self, opener, repo):
29959 483003c27938 manifest: move treeinmem onto manifestlog Durham Goode <durham@fb.com> parents: 29941 diff changeset	1498 usetreemanifest = False
30372 7c7d845f8b64 manifest: make manifestlog use it's own cache Durham Goode <durham@fb.com> parents: 30371 diff changeset	1499 cachesize = 4
29959 483003c27938 manifest: move treeinmem onto manifestlog Durham Goode <durham@fb.com> parents: 29941 diff changeset	1500
483003c27938 manifest: move treeinmem onto manifestlog Durham Goode <durham@fb.com> parents: 29941 diff changeset	1501 opts = getattr(opener, 'options', None)
483003c27938 manifest: move treeinmem onto manifestlog Durham Goode <durham@fb.com> parents: 29941 diff changeset	1502 if opts is not None:
483003c27938 manifest: move treeinmem onto manifestlog Durham Goode <durham@fb.com> parents: 29941 diff changeset	1503 usetreemanifest = opts.get('treemanifest', usetreemanifest)
30372 7c7d845f8b64 manifest: make manifestlog use it's own cache Durham Goode <durham@fb.com> parents: 30371 diff changeset	1504 cachesize = opts.get('manifestcachesize', cachesize)
39245 071f97d03acb manifest: rename manifestlog._treeinmem to ._treemanifests Gregory Szorc <gregory.szorc@gmail.com> parents: 39244 diff changeset	1505
071f97d03acb manifest: rename manifestlog._treeinmem to ._treemanifests Gregory Szorc <gregory.szorc@gmail.com> parents: 39244 diff changeset	1506 self._treemanifests = usetreemanifest
29959 483003c27938 manifest: move treeinmem onto manifestlog Durham Goode <durham@fb.com> parents: 29941 diff changeset	1507
32195 9d3136638784 manifest: remove unused property _oldmanifest Martin von Zweigbergk <martinvonz@google.com> parents: 32171 diff changeset	1508 self._revlog = repo._constructmanifest()
38781 0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1509 self._revlog._setupmanifestcachehooks(repo)
37373 c50078fc32f3 narrow: move manifestrevlog overrides to core Martin von Zweigbergk <martinvonz@google.com> parents: 37372 diff changeset	1510 self._narrowmatch = repo.narrowmatch()
30219 3c8811efdddc manifest: make manifestlog a storecache Durham Goode <durham@fb.com> parents: 30209 diff changeset	1511
30292 d4b340bf68c5 manifest: change manifestlog mancache to be directory based Durham Goode <durham@fb.com> parents: 30291 diff changeset	1512 # A cache of the manifestctx or treemanifestctx for each directory
d4b340bf68c5 manifest: change manifestlog mancache to be directory based Durham Goode <durham@fb.com> parents: 30291 diff changeset	1513 self._dirmancache = {}
30372 7c7d845f8b64 manifest: make manifestlog use it's own cache Durham Goode <durham@fb.com> parents: 30371 diff changeset	1514 self._dirmancache[''] = util.lrucachedict(cachesize)
30292 d4b340bf68c5 manifest: change manifestlog mancache to be directory based Durham Goode <durham@fb.com> parents: 30291 diff changeset	1515
38510 561a450c7b64 manifest: make cachesize a private attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 38331 diff changeset	1516 self._cachesize = cachesize
29826 93b44aa17691 manifest: use property instead of field for manifest revlog storage Durham Goode <durham@fb.com> parents: 29825 diff changeset	1517
29825 426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1518 def __getitem__(self, node):
30290 1a0c1ad57833 manifest: throw LookupError if node not in revlog Durham Goode <durham@fb.com> parents: 30221 diff changeset	1519 """Retrieves the manifest instance for the given node. Throws a
1a0c1ad57833 manifest: throw LookupError if node not in revlog Durham Goode <durham@fb.com> parents: 30221 diff changeset	1520 LookupError if not found.
29825 426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1521 """
30291 dc21ea3323c4 manifest: add manifestlog.get to obtain subdirectory instances Durham Goode <durham@fb.com> parents: 30290 diff changeset	1522 return self.get('', node)
29825 426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1523
39235 43387fd2aa1f manifest: rename dir to tree to avoid shadowing built-in Gregory Szorc <gregory.szorc@gmail.com> parents: 38781 diff changeset	1524 def get(self, tree, node, verify=True):
30291 dc21ea3323c4 manifest: add manifestlog.get to obtain subdirectory instances Durham Goode <durham@fb.com> parents: 30290 diff changeset	1525 """Retrieves the manifest instance for the given node. Throws a
dc21ea3323c4 manifest: add manifestlog.get to obtain subdirectory instances Durham Goode <durham@fb.com> parents: 30290 diff changeset	1526 LookupError if not found.
30403 a431daa93f8c manifest: make revlog verification optional Durham Goode <durham@fb.com> parents: 30377 diff changeset	1527
a431daa93f8c manifest: make revlog verification optional Durham Goode <durham@fb.com> parents: 30377 diff changeset	1528 `verify` - if True an exception will be thrown if the node is not in
a431daa93f8c manifest: make revlog verification optional Durham Goode <durham@fb.com> parents: 30377 diff changeset	1529 the revlog
30291 dc21ea3323c4 manifest: add manifestlog.get to obtain subdirectory instances Durham Goode <durham@fb.com> parents: 30290 diff changeset	1530 """
39235 43387fd2aa1f manifest: rename dir to tree to avoid shadowing built-in Gregory Szorc <gregory.szorc@gmail.com> parents: 38781 diff changeset	1531 if node in self._dirmancache.get(tree, ()):
43387fd2aa1f manifest: rename dir to tree to avoid shadowing built-in Gregory Szorc <gregory.szorc@gmail.com> parents: 38781 diff changeset	1532 return self._dirmancache[tree][node]
30292 d4b340bf68c5 manifest: change manifestlog mancache to be directory based Durham Goode <durham@fb.com> parents: 30291 diff changeset	1533
37374 ac42e39b1b77 narrow: move manifestlog overrides to core Martin von Zweigbergk <martinvonz@google.com> parents: 37373 diff changeset	1534 if not self._narrowmatch.always():
39235 43387fd2aa1f manifest: rename dir to tree to avoid shadowing built-in Gregory Szorc <gregory.szorc@gmail.com> parents: 38781 diff changeset	1535 if not self._narrowmatch.visitdir(tree[:-1] or '.'):
43387fd2aa1f manifest: rename dir to tree to avoid shadowing built-in Gregory Szorc <gregory.szorc@gmail.com> parents: 38781 diff changeset	1536 return excludeddirmanifestctx(tree, node)
43387fd2aa1f manifest: rename dir to tree to avoid shadowing built-in Gregory Szorc <gregory.szorc@gmail.com> parents: 38781 diff changeset	1537 if tree:
30291 dc21ea3323c4 manifest: add manifestlog.get to obtain subdirectory instances Durham Goode <durham@fb.com> parents: 30290 diff changeset	1538 if self._revlog._treeondisk:
30403 a431daa93f8c manifest: make revlog verification optional Durham Goode <durham@fb.com> parents: 30377 diff changeset	1539 if verify:
39246 61700d525a3b manifest: use rev() instead of nodemap.__contains__ Gregory Szorc <gregory.szorc@gmail.com> parents: 39245 diff changeset	1540 # Side-effect is LookupError is raised if node doesn't
61700d525a3b manifest: use rev() instead of nodemap.__contains__ Gregory Szorc <gregory.szorc@gmail.com> parents: 39245 diff changeset	1541 # exist.
61700d525a3b manifest: use rev() instead of nodemap.__contains__ Gregory Szorc <gregory.szorc@gmail.com> parents: 39245 diff changeset	1542 self.getstorage(tree).rev(node)
61700d525a3b manifest: use rev() instead of nodemap.__contains__ Gregory Szorc <gregory.szorc@gmail.com> parents: 39245 diff changeset	1543
39235 43387fd2aa1f manifest: rename dir to tree to avoid shadowing built-in Gregory Szorc <gregory.szorc@gmail.com> parents: 38781 diff changeset	1544 m = treemanifestctx(self, tree, node)
30291 dc21ea3323c4 manifest: add manifestlog.get to obtain subdirectory instances Durham Goode <durham@fb.com> parents: 30290 diff changeset	1545 else:
dc21ea3323c4 manifest: add manifestlog.get to obtain subdirectory instances Durham Goode <durham@fb.com> parents: 30290 diff changeset	1546 raise error.Abort(
dc21ea3323c4 manifest: add manifestlog.get to obtain subdirectory instances Durham Goode <durham@fb.com> parents: 30290 diff changeset	1547 _("cannot ask for manifest directory '%s' in a flat "
39235 43387fd2aa1f manifest: rename dir to tree to avoid shadowing built-in Gregory Szorc <gregory.szorc@gmail.com> parents: 38781 diff changeset	1548 "manifest") % tree)
29907 4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1549 else:
30403 a431daa93f8c manifest: make revlog verification optional Durham Goode <durham@fb.com> parents: 30377 diff changeset	1550 if verify:
39246 61700d525a3b manifest: use rev() instead of nodemap.__contains__ Gregory Szorc <gregory.szorc@gmail.com> parents: 39245 diff changeset	1551 # Side-effect is LookupError is raised if node doesn't exist.
61700d525a3b manifest: use rev() instead of nodemap.__contains__ Gregory Szorc <gregory.szorc@gmail.com> parents: 39245 diff changeset	1552 self._revlog.rev(node)
61700d525a3b manifest: use rev() instead of nodemap.__contains__ Gregory Szorc <gregory.szorc@gmail.com> parents: 39245 diff changeset	1553
39245 071f97d03acb manifest: rename manifestlog._treeinmem to ._treemanifests Gregory Szorc <gregory.szorc@gmail.com> parents: 39244 diff changeset	1554 if self._treemanifests:
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1555 m = treemanifestctx(self, '', node)
30291 dc21ea3323c4 manifest: add manifestlog.get to obtain subdirectory instances Durham Goode <durham@fb.com> parents: 30290 diff changeset	1556 else:
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1557 m = manifestctx(self, node)
30292 d4b340bf68c5 manifest: change manifestlog mancache to be directory based Durham Goode <durham@fb.com> parents: 30291 diff changeset	1558
d4b340bf68c5 manifest: change manifestlog mancache to be directory based Durham Goode <durham@fb.com> parents: 30291 diff changeset	1559 if node != revlog.nullid:
39235 43387fd2aa1f manifest: rename dir to tree to avoid shadowing built-in Gregory Szorc <gregory.szorc@gmail.com> parents: 38781 diff changeset	1560 mancache = self._dirmancache.get(tree)
30292 d4b340bf68c5 manifest: change manifestlog mancache to be directory based Durham Goode <durham@fb.com> parents: 30291 diff changeset	1561 if not mancache:
38510 561a450c7b64 manifest: make cachesize a private attribute Gregory Szorc <gregory.szorc@gmail.com> parents: 38331 diff changeset	1562 mancache = util.lrucachedict(self._cachesize)
39235 43387fd2aa1f manifest: rename dir to tree to avoid shadowing built-in Gregory Szorc <gregory.szorc@gmail.com> parents: 38781 diff changeset	1563 self._dirmancache[tree] = mancache
30292 d4b340bf68c5 manifest: change manifestlog mancache to be directory based Durham Goode <durham@fb.com> parents: 30291 diff changeset	1564 mancache[node] = m
29825 426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1565 return m
426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1566
39244 73cf21b2e8a6 manifest: add getstorage() to manifestlog and use it globally Gregory Szorc <gregory.szorc@gmail.com> parents: 39243 diff changeset	1567 def getstorage(self, tree):
73cf21b2e8a6 manifest: add getstorage() to manifestlog and use it globally Gregory Szorc <gregory.szorc@gmail.com> parents: 39243 diff changeset	1568 return self._revlog.dirlog(tree)
73cf21b2e8a6 manifest: add getstorage() to manifestlog and use it globally Gregory Szorc <gregory.szorc@gmail.com> parents: 39243 diff changeset	1569
38781 0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1570 def clearcaches(self, clear_persisted_data=False):
30370 10c924596e5c manifest: move clearcaches to manifestlog Durham Goode <durham@fb.com> parents: 30369 diff changeset	1571 self._dirmancache.clear()
38781 0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1572 self._revlog.clearcaches(clear_persisted_data=clear_persisted_data)
30370 10c924596e5c manifest: move clearcaches to manifestlog Durham Goode <durham@fb.com> parents: 30369 diff changeset	1573
38555 f2f9bacf0587 manifest: define and implement rev() on manifestlog Gregory Szorc <gregory.szorc@gmail.com> parents: 38530 diff changeset	1574 def rev(self, node):
f2f9bacf0587 manifest: define and implement rev() on manifestlog Gregory Szorc <gregory.szorc@gmail.com> parents: 38530 diff changeset	1575 return self._revlog.rev(node)
f2f9bacf0587 manifest: define and implement rev() on manifestlog Gregory Szorc <gregory.szorc@gmail.com> parents: 38530 diff changeset	1576
38530 c82ea938efbb repository: define manifest interfaces Gregory Szorc <gregory.szorc@gmail.com> parents: 38510 diff changeset	1577 @interfaceutil.implementer(repository.imanifestrevisionwritable)
30342 fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1578 class memmanifestctx(object):
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1579 def __init__(self, manifestlog):
5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1580 self._manifestlog = manifestlog
30342 fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1581 self._manifestdict = manifestdict()
fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1582
30345 fa54f7ade491 manifest: remove manifest.add and add memmfctx.write Durham Goode <durham@fb.com> parents: 30343 diff changeset	1583 def _revlog(self):
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1584 return self._manifestlog._revlog
30345 fa54f7ade491 manifest: remove manifest.add and add memmfctx.write Durham Goode <durham@fb.com> parents: 30343 diff changeset	1585
30342 fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1586 def new(self):
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1587 return memmanifestctx(self._manifestlog)
30342 fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1588
30343 952e1916ae56 manifest: add copy to mfctx classes Durham Goode <durham@fb.com> parents: 30342 diff changeset	1589 def copy(self):
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1590 memmf = memmanifestctx(self._manifestlog)
30343 952e1916ae56 manifest: add copy to mfctx classes Durham Goode <durham@fb.com> parents: 30342 diff changeset	1591 memmf._manifestdict = self.read().copy()
952e1916ae56 manifest: add copy to mfctx classes Durham Goode <durham@fb.com> parents: 30342 diff changeset	1592 return memmf
952e1916ae56 manifest: add copy to mfctx classes Durham Goode <durham@fb.com> parents: 30342 diff changeset	1593
30342 fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1594 def read(self):
fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1595 return self._manifestdict
fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1596
30345 fa54f7ade491 manifest: remove manifest.add and add memmfctx.write Durham Goode <durham@fb.com> parents: 30343 diff changeset	1597 def write(self, transaction, link, p1, p2, added, removed):
fa54f7ade491 manifest: remove manifest.add and add memmfctx.write Durham Goode <durham@fb.com> parents: 30343 diff changeset	1598 return self._revlog().add(self._manifestdict, transaction, link, p1, p2,
fa54f7ade491 manifest: remove manifest.add and add memmfctx.write Durham Goode <durham@fb.com> parents: 30343 diff changeset	1599 added, removed)
fa54f7ade491 manifest: remove manifest.add and add memmfctx.write Durham Goode <durham@fb.com> parents: 30343 diff changeset	1600
38530 c82ea938efbb repository: define manifest interfaces Gregory Szorc <gregory.szorc@gmail.com> parents: 38510 diff changeset	1601 @interfaceutil.implementer(repository.imanifestrevisionstored)
29926 be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1602 class manifestctx(object):
29825 426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1603 """A class representing a single revision of a manifest, including its
426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1604 contents, its parent revs, and its linkrev.
426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1605 """
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1606 def __init__(self, manifestlog, node):
5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1607 self._manifestlog = manifestlog
29926 be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1608 self._data = None
29825 426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1609
426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1610 self._node = node
29907 4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1611
4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1612 # TODO: We eventually want p1, p2, and linkrev exposed on this class,
4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1613 # but let's add it later when something needs it and we can load it
4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1614 # lazily.
4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1615 #self.p1, self.p2 = revlog.parents(node)
4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1616 #rev = revlog.rev(node)
4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1617 #self.linkrev = revlog.linkrev(rev)
29825 426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1618
30341 3dfb5a0171c9 manifestctx: add _revlog() function Durham Goode <durham@fb.com> parents: 30340 diff changeset	1619 def _revlog(self):
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1620 return self._manifestlog._revlog
30341 3dfb5a0171c9 manifestctx: add _revlog() function Durham Goode <durham@fb.com> parents: 30340 diff changeset	1621
29825 426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1622 def node(self):
426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1623 return self._node
426d931e5db2 manifest: introduce manifestlog and manifestctx classes Durham Goode <durham@fb.com> parents: 29824 diff changeset	1624
30342 fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1625 def new(self):
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1626 return memmanifestctx(self._manifestlog)
30342 fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1627
30343 952e1916ae56 manifest: add copy to mfctx classes Durham Goode <durham@fb.com> parents: 30342 diff changeset	1628 def copy(self):
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1629 memmf = memmanifestctx(self._manifestlog)
30343 952e1916ae56 manifest: add copy to mfctx classes Durham Goode <durham@fb.com> parents: 30342 diff changeset	1630 memmf._manifestdict = self.read().copy()
952e1916ae56 manifest: add copy to mfctx classes Durham Goode <durham@fb.com> parents: 30342 diff changeset	1631 return memmf
952e1916ae56 manifest: add copy to mfctx classes Durham Goode <durham@fb.com> parents: 30342 diff changeset	1632
30565 7fbc8a742b4d manifest: expose the parents() method Mateusz Kwapich <mitrandir@fb.com> parents: 30443 diff changeset	1633 @propertycache
7fbc8a742b4d manifest: expose the parents() method Mateusz Kwapich <mitrandir@fb.com> parents: 30443 diff changeset	1634 def parents(self):
7fbc8a742b4d manifest: expose the parents() method Mateusz Kwapich <mitrandir@fb.com> parents: 30443 diff changeset	1635 return self._revlog().parents(self._node)
7fbc8a742b4d manifest: expose the parents() method Mateusz Kwapich <mitrandir@fb.com> parents: 30443 diff changeset	1636
29926 be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1637 def read(self):
31097 4a1486c73fdf manifest: check 'if x is None' instead of 'if not x' Durham Goode <durham@fb.com> parents: 30565 diff changeset	1638 if self._data is None:
29926 be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1639 if self._node == revlog.nullid:
be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1640 self._data = manifestdict()
be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1641 else:
30341 3dfb5a0171c9 manifestctx: add _revlog() function Durham Goode <durham@fb.com> parents: 30340 diff changeset	1642 rl = self._revlog()
38781 0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1643 if self._node in rl._fulltextcache:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1644 text = pycompat.bytestr(rl._fulltextcache[self._node])
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1645 else:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1646 text = rl.revision(self._node)
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1647 arraytext = bytearray(text)
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1648 rl._fulltextcache[self._node] = arraytext
29926 be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1649 self._data = manifestdict(text)
be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1650 return self._data
be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1651
30293 78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1652 def readfast(self, shallow=False):
30294 bce79dfcf5e4 manifest: get rid of manifest.readshallowfast Durham Goode <durham@fb.com> parents: 30293 diff changeset	1653 '''Calls either readdelta or read, based on which would be less work.
bce79dfcf5e4 manifest: get rid of manifest.readshallowfast Durham Goode <durham@fb.com> parents: 30293 diff changeset	1654 readdelta is called if the delta is against the p1, and therefore can be
bce79dfcf5e4 manifest: get rid of manifest.readshallowfast Durham Goode <durham@fb.com> parents: 30293 diff changeset	1655 read quickly.
bce79dfcf5e4 manifest: get rid of manifest.readshallowfast Durham Goode <durham@fb.com> parents: 30293 diff changeset	1656
bce79dfcf5e4 manifest: get rid of manifest.readshallowfast Durham Goode <durham@fb.com> parents: 30293 diff changeset	1657 If `shallow` is True, nothing changes since this is a flat manifest.
bce79dfcf5e4 manifest: get rid of manifest.readshallowfast Durham Goode <durham@fb.com> parents: 30293 diff changeset	1658 '''
30341 3dfb5a0171c9 manifestctx: add _revlog() function Durham Goode <durham@fb.com> parents: 30340 diff changeset	1659 rl = self._revlog()
29939 80be4436e4cc manifest: adds manifestctx.readfast Durham Goode <durham@fb.com> parents: 29938 diff changeset	1660 r = rl.rev(self._node)
80be4436e4cc manifest: adds manifestctx.readfast Durham Goode <durham@fb.com> parents: 29938 diff changeset	1661 deltaparent = rl.deltaparent(r)
80be4436e4cc manifest: adds manifestctx.readfast Durham Goode <durham@fb.com> parents: 29938 diff changeset	1662 if deltaparent != revlog.nullrev and deltaparent in rl.parentrevs(r):
80be4436e4cc manifest: adds manifestctx.readfast Durham Goode <durham@fb.com> parents: 29938 diff changeset	1663 return self.readdelta()
80be4436e4cc manifest: adds manifestctx.readfast Durham Goode <durham@fb.com> parents: 29938 diff changeset	1664 return self.read()
80be4436e4cc manifest: adds manifestctx.readfast Durham Goode <durham@fb.com> parents: 29938 diff changeset	1665
30293 78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1666 def readdelta(self, shallow=False):
30295 f65faa4422c8 manifest: remove manifest.readshallowdelta Durham Goode <durham@fb.com> parents: 30294 diff changeset	1667 '''Returns a manifest containing just the entries that are present
f65faa4422c8 manifest: remove manifest.readshallowdelta Durham Goode <durham@fb.com> parents: 30294 diff changeset	1668 in this manifest, but not in its p1 manifest. This is efficient to read
f65faa4422c8 manifest: remove manifest.readshallowdelta Durham Goode <durham@fb.com> parents: 30294 diff changeset	1669 if the revlog delta is already p1.
f65faa4422c8 manifest: remove manifest.readshallowdelta Durham Goode <durham@fb.com> parents: 30294 diff changeset	1670
f65faa4422c8 manifest: remove manifest.readshallowdelta Durham Goode <durham@fb.com> parents: 30294 diff changeset	1671 Changing the value of `shallow` has no effect on flat manifests.
f65faa4422c8 manifest: remove manifest.readshallowdelta Durham Goode <durham@fb.com> parents: 30294 diff changeset	1672 '''
30341 3dfb5a0171c9 manifestctx: add _revlog() function Durham Goode <durham@fb.com> parents: 30340 diff changeset	1673 revlog = self._revlog()
29938 a059b17352ef manifest: add manifestctx.readdelta() Durham Goode <durham@fb.com> parents: 29926 diff changeset	1674 r = revlog.rev(self._node)
a059b17352ef manifest: add manifestctx.readdelta() Durham Goode <durham@fb.com> parents: 29926 diff changeset	1675 d = mdiff.patchtext(revlog.revdiff(revlog.deltaparent(r), r))
a059b17352ef manifest: add manifestctx.readdelta() Durham Goode <durham@fb.com> parents: 29926 diff changeset	1676 return manifestdict(d)
a059b17352ef manifest: add manifestctx.readdelta() Durham Goode <durham@fb.com> parents: 29926 diff changeset	1677
30340 608ba935e041 manifest: remove manifest.find Durham Goode <durham@fb.com> parents: 30338 diff changeset	1678 def find(self, key):
608ba935e041 manifest: remove manifest.find Durham Goode <durham@fb.com> parents: 30338 diff changeset	1679 return self.read().find(key)
608ba935e041 manifest: remove manifest.find Durham Goode <durham@fb.com> parents: 30338 diff changeset	1680
38530 c82ea938efbb repository: define manifest interfaces Gregory Szorc <gregory.szorc@gmail.com> parents: 38510 diff changeset	1681 @interfaceutil.implementer(repository.imanifestrevisionwritable)
30342 fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1682 class memtreemanifestctx(object):
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1683 def __init__(self, manifestlog, dir=''):
5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1684 self._manifestlog = manifestlog
30342 fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1685 self._dir = dir
fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1686 self._treemanifest = treemanifest()
fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1687
30345 fa54f7ade491 manifest: remove manifest.add and add memmfctx.write Durham Goode <durham@fb.com> parents: 30343 diff changeset	1688 def _revlog(self):
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1689 return self._manifestlog._revlog
30345 fa54f7ade491 manifest: remove manifest.add and add memmfctx.write Durham Goode <durham@fb.com> parents: 30343 diff changeset	1690
30342 fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1691 def new(self, dir=''):
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1692 return memtreemanifestctx(self._manifestlog, dir=dir)
30342 fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1693
30343 952e1916ae56 manifest: add copy to mfctx classes Durham Goode <durham@fb.com> parents: 30342 diff changeset	1694 def copy(self):
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1695 memmf = memtreemanifestctx(self._manifestlog, dir=self._dir)
30343 952e1916ae56 manifest: add copy to mfctx classes Durham Goode <durham@fb.com> parents: 30342 diff changeset	1696 memmf._treemanifest = self._treemanifest.copy()
952e1916ae56 manifest: add copy to mfctx classes Durham Goode <durham@fb.com> parents: 30342 diff changeset	1697 return memmf
952e1916ae56 manifest: add copy to mfctx classes Durham Goode <durham@fb.com> parents: 30342 diff changeset	1698
30342 fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1699 def read(self):
fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1700 return self._treemanifest
fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1701
30345 fa54f7ade491 manifest: remove manifest.add and add memmfctx.write Durham Goode <durham@fb.com> parents: 30343 diff changeset	1702 def write(self, transaction, link, p1, p2, added, removed):
30368 ed45283a0ca7 manifest: remove dependency on manifestrevlog being able to create trees Durham Goode <durham@fb.com> parents: 30345 diff changeset	1703 def readtree(dir, node):
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1704 return self._manifestlog.get(dir, node).read()
30345 fa54f7ade491 manifest: remove manifest.add and add memmfctx.write Durham Goode <durham@fb.com> parents: 30343 diff changeset	1705 return self._revlog().add(self._treemanifest, transaction, link, p1, p2,
30368 ed45283a0ca7 manifest: remove dependency on manifestrevlog being able to create trees Durham Goode <durham@fb.com> parents: 30345 diff changeset	1706 added, removed, readtree=readtree)
30345 fa54f7ade491 manifest: remove manifest.add and add memmfctx.write Durham Goode <durham@fb.com> parents: 30343 diff changeset	1707
38530 c82ea938efbb repository: define manifest interfaces Gregory Szorc <gregory.szorc@gmail.com> parents: 38510 diff changeset	1708 @interfaceutil.implementer(repository.imanifestrevisionstored)
29926 be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1709 class treemanifestctx(object):
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1710 def __init__(self, manifestlog, dir, node):
5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1711 self._manifestlog = manifestlog
29907 4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1712 self._dir = dir
29926 be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1713 self._data = None
29907 4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1714
4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1715 self._node = node
4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1716
4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1717 # TODO: Load p1/p2/linkrev lazily. They need to be lazily loaded so that
4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1718 # we can instantiate treemanifestctx objects for directories we don't
4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1719 # have on disk.
4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1720 #self.p1, self.p2 = revlog.parents(node)
4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1721 #rev = revlog.rev(node)
4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1722 #self.linkrev = revlog.linkrev(rev)
4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1723
30221 f2c5b9d48b29 manifest: make treemanifestctx store the repo Durham Goode <durham@fb.com> parents: 30220 diff changeset	1724 def _revlog(self):
37373 c50078fc32f3 narrow: move manifestrevlog overrides to core Martin von Zweigbergk <martinvonz@google.com> parents: 37372 diff changeset	1725 narrowmatch = self._manifestlog._narrowmatch
c50078fc32f3 narrow: move manifestrevlog overrides to core Martin von Zweigbergk <martinvonz@google.com> parents: 37372 diff changeset	1726 if not narrowmatch.always():
c50078fc32f3 narrow: move manifestrevlog overrides to core Martin von Zweigbergk <martinvonz@google.com> parents: 37372 diff changeset	1727 if not narrowmatch.visitdir(self._dir[:-1] or '.'):
c50078fc32f3 narrow: move manifestrevlog overrides to core Martin von Zweigbergk <martinvonz@google.com> parents: 37372 diff changeset	1728 return excludedmanifestrevlog(self._dir)
39244 73cf21b2e8a6 manifest: add getstorage() to manifestlog and use it globally Gregory Szorc <gregory.szorc@gmail.com> parents: 39243 diff changeset	1729 return self._manifestlog.getstorage(self._dir)
30221 f2c5b9d48b29 manifest: make treemanifestctx store the repo Durham Goode <durham@fb.com> parents: 30220 diff changeset	1730
29926 be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1731 def read(self):
31097 4a1486c73fdf manifest: check 'if x is None' instead of 'if not x' Durham Goode <durham@fb.com> parents: 30565 diff changeset	1732 if self._data is None:
30221 f2c5b9d48b29 manifest: make treemanifestctx store the repo Durham Goode <durham@fb.com> parents: 30220 diff changeset	1733 rl = self._revlog()
29926 be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1734 if self._node == revlog.nullid:
be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1735 self._data = treemanifest()
30221 f2c5b9d48b29 manifest: make treemanifestctx store the repo Durham Goode <durham@fb.com> parents: 30220 diff changeset	1736 elif rl._treeondisk:
29926 be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1737 m = treemanifest(dir=self._dir)
be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1738 def gettext():
30221 f2c5b9d48b29 manifest: make treemanifestctx store the repo Durham Goode <durham@fb.com> parents: 30220 diff changeset	1739 return rl.revision(self._node)
29926 be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1740 def readsubtree(dir, subm):
30404 a1beadaa4061 manifest: change treemanifestctx to construct subtrees from the manifestlog Durham Goode <durham@fb.com> parents: 30403 diff changeset	1741 # Set verify to False since we need to be able to create
a1beadaa4061 manifest: change treemanifestctx to construct subtrees from the manifestlog Durham Goode <durham@fb.com> parents: 30403 diff changeset	1742 # subtrees for trees that don't exist on disk.
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1743 return self._manifestlog.get(dir, subm, verify=False).read()
29926 be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1744 m.read(gettext, readsubtree)
be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1745 m.setnode(self._node)
be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1746 self._data = m
be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1747 else:
38781 0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1748 if self._node in rl.fulltextcache:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1749 text = pycompat.bytestr(rl.fulltextcache[self._node])
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1750 else:
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1751 text = rl.revision(self._node)
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1752 arraytext = bytearray(text)
0a57945aaf7f manifest: persist the manifestfulltext cache Martijn Pieters <mj@zopatista.com> parents: 38657 diff changeset	1753 rl.fulltextcache[self._node] = arraytext
29926 be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1754 self._data = treemanifest(dir=self._dir, text=text)
be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1755
be16091ac14d manifest: change manifestctx to not inherit from manifestdict Durham Goode <durham@fb.com> parents: 29916 diff changeset	1756 return self._data
29907 4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1757
4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1758 def node(self):
4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1759 return self._node
4fb4fc331699 manifest: add treemanifestctx class Durham Goode <durham@fb.com> parents: 29888 diff changeset	1760
30342 fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1761 def new(self, dir=''):
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1762 return memtreemanifestctx(self._manifestlog, dir=dir)
30342 fe1ee393de78 manifest: introduce memmanifestctx and memtreemanifestctx Durham Goode <durham@fb.com> parents: 30341 diff changeset	1763
30343 952e1916ae56 manifest: add copy to mfctx classes Durham Goode <durham@fb.com> parents: 30342 diff changeset	1764 def copy(self):
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1765 memmf = memtreemanifestctx(self._manifestlog, dir=self._dir)
30343 952e1916ae56 manifest: add copy to mfctx classes Durham Goode <durham@fb.com> parents: 30342 diff changeset	1766 memmf._treemanifest = self.read().copy()
952e1916ae56 manifest: add copy to mfctx classes Durham Goode <durham@fb.com> parents: 30342 diff changeset	1767 return memmf
952e1916ae56 manifest: add copy to mfctx classes Durham Goode <durham@fb.com> parents: 30342 diff changeset	1768
30565 7fbc8a742b4d manifest: expose the parents() method Mateusz Kwapich <mitrandir@fb.com> parents: 30443 diff changeset	1769 @propertycache
7fbc8a742b4d manifest: expose the parents() method Mateusz Kwapich <mitrandir@fb.com> parents: 30443 diff changeset	1770 def parents(self):
7fbc8a742b4d manifest: expose the parents() method Mateusz Kwapich <mitrandir@fb.com> parents: 30443 diff changeset	1771 return self._revlog().parents(self._node)
7fbc8a742b4d manifest: expose the parents() method Mateusz Kwapich <mitrandir@fb.com> parents: 30443 diff changeset	1772
30293 78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1773 def readdelta(self, shallow=False):
30295 f65faa4422c8 manifest: remove manifest.readshallowdelta Durham Goode <durham@fb.com> parents: 30294 diff changeset	1774 '''Returns a manifest containing just the entries that are present
f65faa4422c8 manifest: remove manifest.readshallowdelta Durham Goode <durham@fb.com> parents: 30294 diff changeset	1775 in this manifest, but not in its p1 manifest. This is efficient to read
f65faa4422c8 manifest: remove manifest.readshallowdelta Durham Goode <durham@fb.com> parents: 30294 diff changeset	1776 if the revlog delta is already p1.
f65faa4422c8 manifest: remove manifest.readshallowdelta Durham Goode <durham@fb.com> parents: 30294 diff changeset	1777
f65faa4422c8 manifest: remove manifest.readshallowdelta Durham Goode <durham@fb.com> parents: 30294 diff changeset	1778 If `shallow` is True, this will read the delta for this directory,
f65faa4422c8 manifest: remove manifest.readshallowdelta Durham Goode <durham@fb.com> parents: 30294 diff changeset	1779 without recursively reading subdirectory manifests. Instead, any
f65faa4422c8 manifest: remove manifest.readshallowdelta Durham Goode <durham@fb.com> parents: 30294 diff changeset	1780 subdirectory entry will be reported as it appears in the manifest, i.e.
f65faa4422c8 manifest: remove manifest.readshallowdelta Durham Goode <durham@fb.com> parents: 30294 diff changeset	1781 the subdirectory will be reported among files and distinguished only by
f65faa4422c8 manifest: remove manifest.readshallowdelta Durham Goode <durham@fb.com> parents: 30294 diff changeset	1782 its 't' flag.
f65faa4422c8 manifest: remove manifest.readshallowdelta Durham Goode <durham@fb.com> parents: 30294 diff changeset	1783 '''
30221 f2c5b9d48b29 manifest: make treemanifestctx store the repo Durham Goode <durham@fb.com> parents: 30220 diff changeset	1784 revlog = self._revlog()
36373 0147a4730420 cleanup: say goodbye to manifestv2 format Augie Fackler <augie@google.com> parents: 36301 diff changeset	1785 if shallow:
30293 78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1786 r = revlog.rev(self._node)
78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1787 d = mdiff.patchtext(revlog.revdiff(revlog.deltaparent(r), r))
78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1788 return manifestdict(d)
78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1789 else:
78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1790 # Need to perform a slow delta
78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1791 r0 = revlog.deltaparent(revlog.rev(self._node))
31153 5cab44fd1257 manifest: remove _repo from manifestctx objects Durham Goode <durham@fb.com> parents: 31151 diff changeset	1792 m0 = self._manifestlog.get(self._dir, revlog.node(r0)).read()
30293 78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1793 m1 = self.read()
78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1794 md = treemanifest(dir=self._dir)
78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1795 for f, ((n0, fl0), (n1, fl1)) in m0.diff(m1).iteritems():
78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1796 if n1:
78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1797 md[f] = n1
78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1798 if fl1:
78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1799 md.setflag(f, fl1)
78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1800 return md
29938 a059b17352ef manifest: add manifestctx.readdelta() Durham Goode <durham@fb.com> parents: 29926 diff changeset	1801
30293 78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1802 def readfast(self, shallow=False):
30294 bce79dfcf5e4 manifest: get rid of manifest.readshallowfast Durham Goode <durham@fb.com> parents: 30293 diff changeset	1803 '''Calls either readdelta or read, based on which would be less work.
bce79dfcf5e4 manifest: get rid of manifest.readshallowfast Durham Goode <durham@fb.com> parents: 30293 diff changeset	1804 readdelta is called if the delta is against the p1, and therefore can be
bce79dfcf5e4 manifest: get rid of manifest.readshallowfast Durham Goode <durham@fb.com> parents: 30293 diff changeset	1805 read quickly.
bce79dfcf5e4 manifest: get rid of manifest.readshallowfast Durham Goode <durham@fb.com> parents: 30293 diff changeset	1806
bce79dfcf5e4 manifest: get rid of manifest.readshallowfast Durham Goode <durham@fb.com> parents: 30293 diff changeset	1807 If `shallow` is True, it only returns the entries from this manifest,
bce79dfcf5e4 manifest: get rid of manifest.readshallowfast Durham Goode <durham@fb.com> parents: 30293 diff changeset	1808 and not any submanifests.
bce79dfcf5e4 manifest: get rid of manifest.readshallowfast Durham Goode <durham@fb.com> parents: 30293 diff changeset	1809 '''
30221 f2c5b9d48b29 manifest: make treemanifestctx store the repo Durham Goode <durham@fb.com> parents: 30220 diff changeset	1810 rl = self._revlog()
29939 80be4436e4cc manifest: adds manifestctx.readfast Durham Goode <durham@fb.com> parents: 29938 diff changeset	1811 r = rl.rev(self._node)
80be4436e4cc manifest: adds manifestctx.readfast Durham Goode <durham@fb.com> parents: 29938 diff changeset	1812 deltaparent = rl.deltaparent(r)
30293 78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1813 if (deltaparent != revlog.nullrev and
78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1814 deltaparent in rl.parentrevs(r)):
78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1815 return self.readdelta(shallow=shallow)
78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1816
78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1817 if shallow:
78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1818 return manifestdict(rl.revision(self._node))
78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1819 else:
78f3c7166f0d manifest: add shallow option to treemanifestctx.readdelta and readfast Durham Goode <durham@fb.com> parents: 30292 diff changeset	1820 return self.read()
29939 80be4436e4cc manifest: adds manifestctx.readfast Durham Goode <durham@fb.com> parents: 29938 diff changeset	1821
30340 608ba935e041 manifest: remove manifest.find Durham Goode <durham@fb.com> parents: 30338 diff changeset	1822 def find(self, key):
608ba935e041 manifest: remove manifest.find Durham Goode <durham@fb.com> parents: 30338 diff changeset	1823 return self.read().find(key)
37372 1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1824
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1825 class excludeddir(treemanifest):
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1826 """Stand-in for a directory that is excluded from the repository.
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1827
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1828 With narrowing active on a repository that uses treemanifests,
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1829 some of the directory revlogs will be excluded from the resulting
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1830 clone. This is a huge storage win for clients, but means we need
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1831 some sort of pseudo-manifest to surface to internals so we can
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1832 detect a merge conflict outside the narrowspec. That's what this
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1833 class is: it stands in for a directory whose node is known, but
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1834 whose contents are unknown.
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1835 """
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1836 def __init__(self, dir, node):
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1837 super(excludeddir, self).__init__(dir)
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1838 self._node = node
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1839 # Add an empty file, which will be included by iterators and such,
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1840 # appearing as the directory itself (i.e. something like "dir/")
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1841 self._files[''] = node
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1842 self._flags[''] = 't'
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1843
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1844 # Manifests outside the narrowspec should never be modified, so avoid
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1845 # copying. This makes a noticeable difference when there are very many
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1846 # directories outside the narrowspec. Also, it makes sense for the copy to
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1847 # be of the same type as the original, which would not happen with the
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1848 # super type's copy().
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1849 def copy(self):
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1850 return self
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1851
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1852 class excludeddirmanifestctx(treemanifestctx):
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1853 """context wrapper for excludeddir - see that docstring for rationale"""
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1854 def __init__(self, dir, node):
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1855 self._dir = dir
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1856 self._node = node
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1857
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1858 def read(self):
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1859 return excludeddir(self._dir, self._node)
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1860
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1861 def write(self, *args):
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1862 raise error.ProgrammingError(
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1863 'attempt to write manifest from excluded dir %s' % self._dir)
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1864
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1865 class excludedmanifestrevlog(manifestrevlog):
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1866 """Stand-in for excluded treemanifest revlogs.
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1867
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1868 When narrowing is active on a treemanifest repository, we'll have
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1869 references to directories we can't see due to the revlog being
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1870 skipped. This class exists to conform to the manifestrevlog
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1871 interface for those directories and proactively prevent writes to
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1872 outside the narrowspec.
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1873 """
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1874
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1875 def __init__(self, dir):
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1876 self._dir = dir
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1877
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1878 def __len__(self):
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1879 raise error.ProgrammingError(
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1880 'attempt to get length of excluded dir %s' % self._dir)
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1881
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1882 def rev(self, node):
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1883 raise error.ProgrammingError(
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1884 'attempt to get rev from excluded dir %s' % self._dir)
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1885
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1886 def linkrev(self, node):
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1887 raise error.ProgrammingError(
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1888 'attempt to get linkrev from excluded dir %s' % self._dir)
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1889
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1890 def node(self, rev):
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1891 raise error.ProgrammingError(
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1892 'attempt to get node from excluded dir %s' % self._dir)
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1893
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1894 def add(self, args, *kwargs):
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1895 # We should never write entries in dirlogs outside the narrow clone.
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1896 # However, the method still gets called from writesubtree() in
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1897 # _addtree(), so we need to handle it. We should possibly make that
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1898 # avoid calling add() with a clean manifest (_dirty is always False
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1899 # in excludeddir instances).
1b2fa531fd7a narrow: move excludeddir and related classes to core Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1900 pass

Mercurial > public > mercurial-scm > hg

annotate mercurial/manifest.py @ 39314:7f5e6d3e9032