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

annotate mercurial/manifest.py @ 24146:dd8c891dd09a

manifest: make copy logic local to copy() The optional arguments to the manfifestdict constructor are only used by copy(), so assign the fields from that method instead so it's clear that the arguments are not used for anything else.

author	Martin von Zweigbergk <martinvonz@google.com>
date	Mon, 23 Feb 2015 13:41:02 -0800
parents	ed5e8a9598ce
children	ba4fcd80079d

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
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	8 from i18n import _
22965 b697fa74b475 manifest: for diff(), only iterate over files, not flags Martin von Zweigbergk <martinvonz@gmail.com> parents: 22964 diff changeset	9 import mdiff, parsers, error, revlog, util
8312 b87a50b7125c separate import lines from mercurial and general python modules Simon Heimberg <simohe@besonet.ch> parents: 8225 diff changeset	10 import array, struct
79 837d473d54d5 Add basic annotation support mpm@selenic.com parents: 78 diff changeset	11
2835 a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	12 class manifestdict(dict):
24146 dd8c891dd09a manifest: make copy logic local to copy() Martin von Zweigbergk <martinvonz@google.com> parents: 24033 diff changeset	13 def __init__(self):
dd8c891dd09a manifest: make copy logic local to copy() Martin von Zweigbergk <martinvonz@google.com> parents: 24033 diff changeset	14 self._flags = {}
23594 6f53629ad273 manifest: disallow setting the node id of an entry to None Augie Fackler <augie@google.com> parents: 22966 diff changeset	15 def __setitem__(self, k, v):
6f53629ad273 manifest: disallow setting the node id of an entry to None Augie Fackler <augie@google.com> parents: 22966 diff changeset	16 assert v is not None
6f53629ad273 manifest: disallow setting the node id of an entry to None Augie Fackler <augie@google.com> parents: 22966 diff changeset	17 dict.__setitem__(self, k, v)
2834 35af2e56f15a manifestflags: eliminate remaining users of direct dict access Matt Mackall <mpm@selenic.com> parents: 2833 diff changeset	18 def flags(self, f):
2839 b4f05ecf4ee8 Switch to simpler manifestdict Matt Mackall <mpm@selenic.com> parents: 2835 diff changeset	19 return self._flags.get(f, "")
22942 03602f76deee manifest: rename ambiguously-named set to setflag Augie Fackler <raf@durin42.com> parents: 22931 diff changeset	20 def setflag(self, f, flags):
03602f76deee manifest: rename ambiguously-named set to setflag Augie Fackler <raf@durin42.com> parents: 22931 diff changeset	21 """Set the flags (symlink, executable) for path f."""
6743 86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6389 diff changeset	22 self._flags[f] = flags
2831 0b50a580be36 Add manifestflags class Matt Mackall <mpm@selenic.com> parents: 2470 diff changeset	23 def copy(self):
24146 dd8c891dd09a manifest: make copy logic local to copy() Martin von Zweigbergk <martinvonz@google.com> parents: 24033 diff changeset	24 copy = manifestdict()
dd8c891dd09a manifest: make copy logic local to copy() Martin von Zweigbergk <martinvonz@google.com> parents: 24033 diff changeset	25 dict.__init__(copy, self)
dd8c891dd09a manifest: make copy logic local to copy() Martin von Zweigbergk <martinvonz@google.com> parents: 24033 diff changeset	26 copy._flags = dict.copy(self._flags)
dd8c891dd09a manifest: make copy logic local to copy() Martin von Zweigbergk <martinvonz@google.com> parents: 24033 diff changeset	27 return copy
21879 090dcaaf3fff manifestdict: add a new method to intersect with a set of files Siddharth Agarwal <sid0@fb.com> parents: 20075 diff changeset	28 def intersectfiles(self, files):
090dcaaf3fff manifestdict: add a new method to intersect with a set of files Siddharth Agarwal <sid0@fb.com> parents: 20075 diff changeset	29 '''make a new manifestdict with the intersection of self with files
090dcaaf3fff manifestdict: add a new method to intersect with a set of files Siddharth Agarwal <sid0@fb.com> parents: 20075 diff changeset	30
090dcaaf3fff manifestdict: add a new method to intersect with a set of files Siddharth Agarwal <sid0@fb.com> parents: 20075 diff changeset	31 The algorithm assumes that files is much smaller than self.'''
090dcaaf3fff manifestdict: add a new method to intersect with a set of files Siddharth Agarwal <sid0@fb.com> parents: 20075 diff changeset	32 ret = manifestdict()
090dcaaf3fff manifestdict: add a new method to intersect with a set of files Siddharth Agarwal <sid0@fb.com> parents: 20075 diff changeset	33 for fn in files:
090dcaaf3fff manifestdict: add a new method to intersect with a set of files Siddharth Agarwal <sid0@fb.com> parents: 20075 diff changeset	34 if fn in self:
090dcaaf3fff manifestdict: add a new method to intersect with a set of files Siddharth Agarwal <sid0@fb.com> parents: 20075 diff changeset	35 ret[fn] = self[fn]
090dcaaf3fff manifestdict: add a new method to intersect with a set of files Siddharth Agarwal <sid0@fb.com> parents: 20075 diff changeset	36 flags = self._flags.get(fn, None)
090dcaaf3fff manifestdict: add a new method to intersect with a set of files Siddharth Agarwal <sid0@fb.com> parents: 20075 diff changeset	37 if flags:
090dcaaf3fff manifestdict: add a new method to intersect with a set of files Siddharth Agarwal <sid0@fb.com> parents: 20075 diff changeset	38 ret._flags[fn] = flags
090dcaaf3fff manifestdict: add a new method to intersect with a set of files Siddharth Agarwal <sid0@fb.com> parents: 20075 diff changeset	39 return ret
22964 2793ecb1522d manifest: repurpose flagsdiff() into (node-and-flag)diff() Martin von Zweigbergk <martinvonz@gmail.com> parents: 22943 diff changeset	40
23305 0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	41 def matches(self, match):
0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	42 '''generate a new manifest filtered by the match argument'''
0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	43 if match.always():
0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	44 return self.copy()
0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	45
0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	46 files = match.files()
0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	47 if (match.matchfn == match.exact or
0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	48 (not match.anypats() and util.all(fn in self for fn in files))):
0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	49 return self.intersectfiles(files)
0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	50
0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	51 mf = self.copy()
0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	52 for fn in mf.keys():
0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	53 if not match(fn):
0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	54 del mf[fn]
0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	55 return mf
0cc283f44655 manifest: add matches() method Martin von Zweigbergk <martinvonz@google.com> parents: 22966 diff changeset	56
23756 829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	57 def diff(self, m2, clean=False):
829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	58 '''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	59
829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	60 Args:
829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	61 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	62 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	63 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	64
829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	65 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	66 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	67 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	68 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	69 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	70 string.
829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	71 '''
22965 b697fa74b475 manifest: for diff(), only iterate over files, not flags Martin von Zweigbergk <martinvonz@gmail.com> parents: 22964 diff changeset	72 diff = {}
b697fa74b475 manifest: for diff(), only iterate over files, not flags Martin von Zweigbergk <martinvonz@gmail.com> parents: 22964 diff changeset	73
b697fa74b475 manifest: for diff(), only iterate over files, not flags Martin von Zweigbergk <martinvonz@gmail.com> parents: 22964 diff changeset	74 for fn, n1 in self.iteritems():
b697fa74b475 manifest: for diff(), only iterate over files, not flags Martin von Zweigbergk <martinvonz@gmail.com> parents: 22964 diff changeset	75 fl1 = self._flags.get(fn, '')
b697fa74b475 manifest: for diff(), only iterate over files, not flags Martin von Zweigbergk <martinvonz@gmail.com> parents: 22964 diff changeset	76 n2 = m2.get(fn, None)
b697fa74b475 manifest: for diff(), only iterate over files, not flags Martin von Zweigbergk <martinvonz@gmail.com> parents: 22964 diff changeset	77 fl2 = m2._flags.get(fn, '')
b697fa74b475 manifest: for diff(), only iterate over files, not flags Martin von Zweigbergk <martinvonz@gmail.com> parents: 22964 diff changeset	78 if n2 is None:
b697fa74b475 manifest: for diff(), only iterate over files, not flags Martin von Zweigbergk <martinvonz@gmail.com> parents: 22964 diff changeset	79 fl2 = ''
b697fa74b475 manifest: for diff(), only iterate over files, not flags Martin von Zweigbergk <martinvonz@gmail.com> parents: 22964 diff changeset	80 if n1 != n2 or fl1 != fl2:
22966 ff93aa006e6a manifest: transpose pair of pairs from diff() Martin von Zweigbergk <martinvonz@gmail.com> parents: 22965 diff changeset	81 diff[fn] = ((n1, fl1), (n2, fl2))
23756 829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	82 elif clean:
829f640b5540 manifest: add optional recording of clean entries to diff Augie Fackler <augie@google.com> parents: 23602 diff changeset	83 diff[fn] = None
22965 b697fa74b475 manifest: for diff(), only iterate over files, not flags Martin von Zweigbergk <martinvonz@gmail.com> parents: 22964 diff changeset	84
b697fa74b475 manifest: for diff(), only iterate over files, not flags Martin von Zweigbergk <martinvonz@gmail.com> parents: 22964 diff changeset	85 for fn, n2 in m2.iteritems():
b697fa74b475 manifest: for diff(), only iterate over files, not flags Martin von Zweigbergk <martinvonz@gmail.com> parents: 22964 diff changeset	86 if fn not in self:
b697fa74b475 manifest: for diff(), only iterate over files, not flags Martin von Zweigbergk <martinvonz@gmail.com> parents: 22964 diff changeset	87 fl2 = m2._flags.get(fn, '')
22966 ff93aa006e6a manifest: transpose pair of pairs from diff() Martin von Zweigbergk <martinvonz@gmail.com> parents: 22965 diff changeset	88 diff[fn] = ((None, ''), (n2, fl2))
22965 b697fa74b475 manifest: for diff(), only iterate over files, not flags Martin von Zweigbergk <martinvonz@gmail.com> parents: 22964 diff changeset	89
b697fa74b475 manifest: for diff(), only iterate over files, not flags Martin von Zweigbergk <martinvonz@gmail.com> parents: 22964 diff changeset	90 return diff
2831 0b50a580be36 Add manifestflags class Matt Mackall <mpm@selenic.com> parents: 2470 diff changeset	91
22929 bf69cb09a6c9 manifest: move manifestdict-to-text encoding to manifest class Augie Fackler <raf@durin42.com> parents: 22788 diff changeset	92 def text(self):
22943 117e81871113 manifest: add docstring to text() method Augie Fackler <raf@durin42.com> parents: 22942 diff changeset	93 """Get the full data of this manifest as a bytestring."""
22929 bf69cb09a6c9 manifest: move manifestdict-to-text encoding to manifest class Augie Fackler <raf@durin42.com> parents: 22788 diff changeset	94 fl = sorted(self)
bf69cb09a6c9 manifest: move manifestdict-to-text encoding to manifest class Augie Fackler <raf@durin42.com> parents: 22788 diff changeset	95 _checkforbidden(fl)
bf69cb09a6c9 manifest: move manifestdict-to-text encoding to manifest class Augie Fackler <raf@durin42.com> parents: 22788 diff changeset	96
bf69cb09a6c9 manifest: move manifestdict-to-text encoding to manifest class Augie Fackler <raf@durin42.com> parents: 22788 diff changeset	97 hex, flags = revlog.hex, self.flags
bf69cb09a6c9 manifest: move manifestdict-to-text encoding to manifest class Augie Fackler <raf@durin42.com> parents: 22788 diff changeset	98 # if this is changed to support newlines in filenames,
bf69cb09a6c9 manifest: move manifestdict-to-text encoding to manifest class Augie Fackler <raf@durin42.com> parents: 22788 diff changeset	99 # be sure to check the templates/ dir again (especially *-raw.tmpl)
bf69cb09a6c9 manifest: move manifestdict-to-text encoding to manifest class Augie Fackler <raf@durin42.com> parents: 22788 diff changeset	100 return ''.join("%s\0%s%s\n" % (f, hex(self[f]), flags(f)) for f in fl)
22408 dc97e04c12ad manifest: move checkforbidden to module-level Augie Fackler <raf@durin42.com> parents: 21879 diff changeset	101
22931 48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	102 def fastdelta(self, base, changes):
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	103 """Given a base manifest text as an array.array and a list of changes
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	104 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	105 """
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	106 delta = []
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	107 dstart = None
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	108 dend = None
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	109 dline = [""]
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	110 start = 0
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	111 # zero copy representation of base as a buffer
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	112 addbuf = util.buffer(base)
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	113
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	114 # start with a readonly loop that finds the offset of
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	115 # each line and creates the deltas
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	116 for f, todelete in changes:
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	117 # bs will either be the index of the item or the insert point
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	118 start, end = _msearch(addbuf, f, start)
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	119 if not todelete:
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	120 l = "%s\0%s%s\n" % (f, revlog.hex(self[f]), self.flags(f))
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	121 else:
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	122 if start == end:
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	123 # item we want to delete was not found, error out
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	124 raise AssertionError(
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	125 _("failed to remove %s from manifest") % f)
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	126 l = ""
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	127 if dstart is not None and dstart <= start and dend >= start:
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	128 if dend < end:
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	129 dend = end
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	130 if l:
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	131 dline.append(l)
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	132 else:
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	133 if dstart is not None:
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	134 delta.append([dstart, dend, "".join(dline)])
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	135 dstart = start
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	136 dend = end
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	137 dline = [l]
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	138
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	139 if dstart is not None:
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	140 delta.append([dstart, dend, "".join(dline)])
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	141 # apply the delta to the base, and get a delta for addrevision
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	142 deltatext, arraytext = _addlistdelta(base, delta)
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	143 return arraytext, deltatext
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	144
22930 1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	145 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	146 '''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	147
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	148 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	149 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	150 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	151
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	152 m should be a buffer or a string
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	153 s is a string'''
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	154 def advance(i, c):
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	155 while i < lenm and m[i] != c:
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	156 i += 1
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	157 return i
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	158 if not s:
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	159 return (lo, lo)
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	160 lenm = len(m)
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	161 if not hi:
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	162 hi = lenm
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	163 while lo < hi:
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	164 mid = (lo + hi) // 2
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	165 start = mid
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	166 while start > 0 and m[start - 1] != '\n':
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	167 start -= 1
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	168 end = advance(start, '\0')
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	169 if m[start:end] < s:
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	170 # 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	171 # 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	172 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	173 else:
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	174 # 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	175 hi = start
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	176 end = advance(lo, '\0')
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	177 found = m[lo:end]
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	178 if s == found:
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	179 # 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	180 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	181 return (lo, end + 1)
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	182 else:
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	183 return (lo, lo)
1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	184
22415 65ec6c5c0fb3 manifest: mark addlistdelta and checkforbidden as module-private Augie Fackler <raf@durin42.com> parents: 22409 diff changeset	185 def _checkforbidden(l):
22408 dc97e04c12ad manifest: move checkforbidden to module-level Augie Fackler <raf@durin42.com> parents: 21879 diff changeset	186 """Check filenames for illegal characters."""
dc97e04c12ad manifest: move checkforbidden to module-level Augie Fackler <raf@durin42.com> parents: 21879 diff changeset	187 for f in l:
dc97e04c12ad manifest: move checkforbidden to module-level Augie Fackler <raf@durin42.com> parents: 21879 diff changeset	188 if '\n' in f or '\r' in f:
dc97e04c12ad manifest: move checkforbidden to module-level Augie Fackler <raf@durin42.com> parents: 21879 diff changeset	189 raise error.RevlogError(
dc97e04c12ad manifest: move checkforbidden to module-level Augie Fackler <raf@durin42.com> parents: 21879 diff changeset	190 _("'\\n' and '\\r' disallowed in filenames: %r") % f)
dc97e04c12ad manifest: move checkforbidden to module-level Augie Fackler <raf@durin42.com> parents: 21879 diff changeset	191
dc97e04c12ad manifest: move checkforbidden to module-level Augie Fackler <raf@durin42.com> parents: 21879 diff changeset	192
22409 8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	193 # 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	194 # 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	195 def _addlistdelta(addlist, x):
22409 8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	196 # 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	197 # than repeatedly modifying the existing one
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	198 currentposition = 0
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	199 newaddlist = array.array('c')
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	200
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	201 for start, end, content in x:
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	202 newaddlist += addlist[currentposition:start]
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	203 if content:
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	204 newaddlist += array.array('c', content)
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	205
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	206 currentposition = end
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	207
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	208 newaddlist += addlist[currentposition:]
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	209
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	210 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	211 + content for start, end, content in x)
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	212 return deltatext, newaddlist
8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	213
22786 079a0ed5ee4a manifest: move manifest parsing to module-level Augie Fackler <raf@durin42.com> parents: 22415 diff changeset	214 def _parse(lines):
079a0ed5ee4a manifest: move manifest parsing to module-level Augie Fackler <raf@durin42.com> parents: 22415 diff changeset	215 mfdict = manifestdict()
079a0ed5ee4a manifest: move manifest parsing to module-level Augie Fackler <raf@durin42.com> parents: 22415 diff changeset	216 parsers.parse_manifest(mfdict, mfdict._flags, lines)
079a0ed5ee4a manifest: move manifest parsing to module-level Augie Fackler <raf@durin42.com> parents: 22415 diff changeset	217 return mfdict
22409 8f09b785b59b manifest: move addlistdelta to module-level Augie Fackler <raf@durin42.com> parents: 22408 diff changeset	218
7634 14a4337a9b9b revlog: kill from-style imports Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	219 class manifest(revlog.revlog):
4258 b11a2fb59cf5 revlog: simplify revlog version handling Matt Mackall <mpm@selenic.com> parents: 4257 diff changeset	220 def __init__(self, opener):
24033 ed5e8a9598ce manifest: make lru size configurable Durham Goode <durham@fb.com> parents: 23758 diff changeset	221 # During normal operations, we expect to deal with not more than four
ed5e8a9598ce manifest: make lru size configurable Durham Goode <durham@fb.com> parents: 23758 diff changeset	222 # revs at a time (such as during commit --amend). When rebasing large
ed5e8a9598ce manifest: make lru size configurable Durham Goode <durham@fb.com> parents: 23758 diff changeset	223 # stacks of commits, the number can go up, hence the config knob below.
ed5e8a9598ce manifest: make lru size configurable Durham Goode <durham@fb.com> parents: 23758 diff changeset	224 cachesize = 4
ed5e8a9598ce manifest: make lru size configurable Durham Goode <durham@fb.com> parents: 23758 diff changeset	225 opts = getattr(opener, 'options', None)
ed5e8a9598ce manifest: make lru size configurable Durham Goode <durham@fb.com> parents: 23758 diff changeset	226 if opts is not None:
ed5e8a9598ce manifest: make lru size configurable Durham Goode <durham@fb.com> parents: 23758 diff changeset	227 cachesize = opts.get('manifestcachesize', cachesize)
ed5e8a9598ce manifest: make lru size configurable Durham Goode <durham@fb.com> parents: 23758 diff changeset	228 self._mancache = util.lrucachedict(cachesize)
7634 14a4337a9b9b revlog: kill from-style imports Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	229 revlog.revlog.__init__(self, opener, "00manifest.i")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	230
3196 f3b939444c72 Abstract manifest block parsing. Brendan Cully <brendan@kublai.com> parents: 3148 diff changeset	231 def readdelta(self, node):
7362 6db4a2ccef3a revlog: remove delta function Matt Mackall <mpm@selenic.com> parents: 6765 diff changeset	232 r = self.rev(node)
22786 079a0ed5ee4a manifest: move manifest parsing to module-level Augie Fackler <raf@durin42.com> parents: 22415 diff changeset	233 return _parse(mdiff.patchtext(self.revdiff(self.deltaparent(r), r)))
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3196 diff changeset	234
13711 ed913fd7837b manifest: add readfast method Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	235 def readfast(self, node):
ed913fd7837b manifest: add readfast method Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	236 '''use the faster of readdelta or read'''
ed913fd7837b manifest: add readfast method Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	237 r = self.rev(node)
14208 d62d597b8974 revlog: compute correct deltaparent in the deltaparent function Sune Foldager <cryo@cyanite.org> parents: 13711 diff changeset	238 deltaparent = self.deltaparent(r)
d62d597b8974 revlog: compute correct deltaparent in the deltaparent function Sune Foldager <cryo@cyanite.org> parents: 13711 diff changeset	239 if deltaparent != revlog.nullrev and deltaparent in self.parentrevs(r):
13711 ed913fd7837b manifest: add readfast method Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	240 return self.readdelta(node)
ed913fd7837b manifest: add readfast method Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	241 return self.read(node)
ed913fd7837b manifest: add readfast method Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	242
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	243 def read(self, node):
7634 14a4337a9b9b revlog: kill from-style imports Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	244 if node == revlog.nullid:
14a4337a9b9b revlog: kill from-style imports Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	245 return manifestdict() # don't upset local cache
18604 a1141f04e368 manifest: use a size 3 LRU cache to store parsed manifests Siddharth Agarwal <sid0@fb.com> parents: 17983 diff changeset	246 if node in self._mancache:
a1141f04e368 manifest: use a size 3 LRU cache to store parsed manifests Siddharth Agarwal <sid0@fb.com> parents: 17983 diff changeset	247 return self._mancache[node][0]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	248 text = self.revision(node)
9414 65dc516363ee manifest: simplify cache handling, use a unique cache Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9413 diff changeset	249 arraytext = array.array('c', text)
22786 079a0ed5ee4a manifest: move manifest parsing to module-level Augie Fackler <raf@durin42.com> parents: 22415 diff changeset	250 mapping = _parse(text)
18604 a1141f04e368 manifest: use a size 3 LRU cache to store parsed manifests Siddharth Agarwal <sid0@fb.com> parents: 17983 diff changeset	251 self._mancache[node] = (mapping, arraytext)
2835 a9f5d4149123 Combine manifest dict and flags dict into a single object Matt Mackall <mpm@selenic.com> parents: 2834 diff changeset	252 return mapping
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	253
2320 dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	254 def find(self, node, f):
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	255 '''look up entry for a single file efficiently.
4159 a896607d3ec3 fix manifest.find Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3891 diff changeset	256 return (node, flags) pair if found, (None, None) if not.'''
18604 a1141f04e368 manifest: use a size 3 LRU cache to store parsed manifests Siddharth Agarwal <sid0@fb.com> parents: 17983 diff changeset	257 if node in self._mancache:
a1141f04e368 manifest: use a size 3 LRU cache to store parsed manifests Siddharth Agarwal <sid0@fb.com> parents: 17983 diff changeset	258 mapping = self._mancache[node][0]
a1141f04e368 manifest: use a size 3 LRU cache to store parsed manifests Siddharth Agarwal <sid0@fb.com> parents: 17983 diff changeset	259 return mapping.get(f), mapping.flags(f)
2320 dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	260 text = self.revision(node)
22930 1acb81d10eaf manifest: move _search to module level and rename to _msearch Augie Fackler <raf@durin42.com> parents: 22929 diff changeset	261 start, end = _msearch(text, f)
2320 dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	262 if start == end:
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	263 return None, None
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	264 l = text[start:end]
dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	265 f, n = l.split('\0')
7634 14a4337a9b9b revlog: kill from-style imports Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	266 return revlog.bin(n[:40]), n[40:-1]
2320 dbdce3b99988 fix parsing of tags. make parse errors useful. add new tag tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2142 diff changeset	267
22787 4a13849ca359 manifest: simplify manifest.add() by making args required Augie Fackler <raf@durin42.com> parents: 22786 diff changeset	268 def add(self, map, transaction, link, p1, p2, added, removed):
22788 160efd225b24 manifest: rearrange add() method and add comments for clarity Augie Fackler <raf@durin42.com> parents: 22787 diff changeset	269 if p1 in self._mancache:
160efd225b24 manifest: rearrange add() method and add comments for clarity Augie Fackler <raf@durin42.com> parents: 22787 diff changeset	270 # If our first parent is in the manifest cache, we can
160efd225b24 manifest: rearrange add() method and add comments for clarity Augie Fackler <raf@durin42.com> parents: 22787 diff changeset	271 # compute a delta here using properties we know about the
160efd225b24 manifest: rearrange add() method and add comments for clarity Augie Fackler <raf@durin42.com> parents: 22787 diff changeset	272 # manifest up-front, which may save time later for the
160efd225b24 manifest: rearrange add() method and add comments for clarity Augie Fackler <raf@durin42.com> parents: 22787 diff changeset	273 # revlog layer.
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	274
22415 65ec6c5c0fb3 manifest: mark addlistdelta and checkforbidden as module-private Augie Fackler <raf@durin42.com> parents: 22409 diff changeset	275 _checkforbidden(added)
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	276 # combine the changed lists into one list for sorting
9415 e0cc9fa2a576 manifest.add(): cleanup worklist construction and iteration Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9414 diff changeset	277 work = [(x, False) for x in added]
e0cc9fa2a576 manifest.add(): cleanup worklist construction and iteration Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9414 diff changeset	278 work.extend((x, True) for x in removed)
17428 72803c8edaa4 avoid using abbreviations that look like spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 17426 diff changeset	279 # this could use heapq.merge() (from Python 2.6+) or equivalent
9415 e0cc9fa2a576 manifest.add(): cleanup worklist construction and iteration Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9414 diff changeset	280 # since the lists are already sorted
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	281 work.sort()
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 639 diff changeset	282
22931 48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	283 arraytext, deltatext = map.fastdelta(self._mancache[p1][1], work)
48c0b101a9de manifest: add fastdelta method to manifestdict Augie Fackler <raf@durin42.com> parents: 22930 diff changeset	284 cachedelta = self.rev(p1), deltatext
15657 d976b1ef6760 util: don't mess with builtins to emulate buffer() Matt Mackall <mpm@selenic.com> parents: 14632 diff changeset	285 text = util.buffer(arraytext)
22788 160efd225b24 manifest: rearrange add() method and add comments for clarity Augie Fackler <raf@durin42.com> parents: 22787 diff changeset	286 else:
160efd225b24 manifest: rearrange add() method and add comments for clarity Augie Fackler <raf@durin42.com> parents: 22787 diff changeset	287 # The first parent manifest isn't already loaded, so we'll
160efd225b24 manifest: rearrange add() method and add comments for clarity Augie Fackler <raf@durin42.com> parents: 22787 diff changeset	288 # just encode a fulltext of the manifest and pass that
160efd225b24 manifest: rearrange add() method and add comments for clarity Augie Fackler <raf@durin42.com> parents: 22787 diff changeset	289 # through to the revlog layer, and let it handle the delta
160efd225b24 manifest: rearrange add() method and add comments for clarity Augie Fackler <raf@durin42.com> parents: 22787 diff changeset	290 # process.
22929 bf69cb09a6c9 manifest: move manifestdict-to-text encoding to manifest class Augie Fackler <raf@durin42.com> parents: 22788 diff changeset	291 text = map.text()
22788 160efd225b24 manifest: rearrange add() method and add comments for clarity Augie Fackler <raf@durin42.com> parents: 22787 diff changeset	292 arraytext = array.array('c', text)
160efd225b24 manifest: rearrange add() method and add comments for clarity Augie Fackler <raf@durin42.com> parents: 22787 diff changeset	293 cachedelta = None
1534 80a3d6a0af71 Optimize manifest.add mason@suse.com parents: 1451 diff changeset	294
9420 d0db168136dc manifest/revlog: do not let the revlog cache mutable objects Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9416 diff changeset	295 n = self.addrevision(text, transaction, link, p1, p2, cachedelta)
18604 a1141f04e368 manifest: use a size 3 LRU cache to store parsed manifests Siddharth Agarwal <sid0@fb.com> parents: 17983 diff changeset	296 self._mancache[n] = (map, arraytext)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	297
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	298 return n

Mercurial > public > mercurial-scm > hg

annotate mercurial/manifest.py @ 24146:dd8c891dd09a