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

annotate mercurial/changelog.py @ 28492:837f1c437d58

changelog: lazily parse date/extra field This is probably the most complicated patch in the parsing refactor. Because the date and extras are encoded in the same field, we stuff the entire field into a dedicated variable and add a property for accessing the sub-components of each. There is some duplicated code here. But the code is relatively simple, so it shouldn't be a big deal. We see revset performance wins across the board: author(mpm) 0.896565 0.876713 0.822961 desc(bug) 0.887169 0.895514 0.847054 date(2015) 0.878797 0.820987 0.811613 extra(rebase_source) 0.865446 0.823811 0.797756 author(mpm) or author(greg) 1.801832 1.784160 1.668172 author(mpm) or desc(bug) 1.812438 1.822756 1.677608 date(2015) or branch(default) 0.968276 0.910981 0.896032 author(mpm) or desc(bug) or date(2015) or extra(rebase_source) 3.656193 3.516788 3.265024 We see a speed-up on revsets accessing date and extras because the new parsing code only parses what you access. Even though they are stored the same text field, we avoid parsing dates when accessing extras and vice-versa. But strangely revsets accessing both date and extras appeared to speed up as well! I'm not sure if this is due to refactoring the parsing code or due to an optimization in revsets. You can't argue with the results!

author	Gregory Szorc <gregory.szorc@gmail.com>
date	Sun, 06 Mar 2016 14:30:25 -0800
parents	f57f7500a095
children	7796473c11b3

rev	line source
1095 0a18374c0769 changelog: adjust imports, comment mpm@selenic.com parents: 1094 1089 diff changeset	1 # changelog.py - changelog 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: 4269 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: 9677 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
25922 85f442747153 changelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25814 diff changeset	8 from __future__ import absolute_import
85f442747153 changelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25814 diff changeset	9
28487 98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	10 import collections
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	11
25922 85f442747153 changelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25814 diff changeset	12 from .i18n import _
85f442747153 changelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25814 diff changeset	13 from .node import (
85f442747153 changelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25814 diff changeset	14 bin,
85f442747153 changelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25814 diff changeset	15 hex,
85f442747153 changelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25814 diff changeset	16 nullid,
85f442747153 changelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25814 diff changeset	17 )
85f442747153 changelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25814 diff changeset	18
85f442747153 changelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25814 diff changeset	19 from . import (
85f442747153 changelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25814 diff changeset	20 encoding,
85f442747153 changelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25814 diff changeset	21 error,
85f442747153 changelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25814 diff changeset	22 revlog,
85f442747153 changelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25814 diff changeset	23 util,
85f442747153 changelog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25814 diff changeset	24 )
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	25
16267 aa6821a7b52f changelog: micro-optimizations to changelog.read() Matt Mackall <mpm@selenic.com> parents: 15661 diff changeset	26 _defaultextra = {'branch': 'default'}
aa6821a7b52f changelog: micro-optimizations to changelog.read() Matt Mackall <mpm@selenic.com> parents: 15661 diff changeset	27
3232 394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	28 def _string_escape(text):
394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	29 """
394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	30 >>> d = {'nl': chr(10), 'bs': chr(92), 'cr': chr(13), 'nul': chr(0)}
394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	31 >>> s = "ab%(nl)scd%(bs)s%(bs)sn%(nul)sab%(cr)scd%(bs)s%(nl)s" % d
394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	32 >>> s
394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	33 'ab\\ncd\\\\\\\\n\\x00ab\\rcd\\\\\\n'
394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	34 >>> res = _string_escape(s)
5745 234e40e636a8 changelog: inline trivial call for extra data unescaping Matt Mackall <mpm@selenic.com> parents: 5744 diff changeset	35 >>> s == res.decode('string_escape')
3232 394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	36 True
394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	37 """
394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	38 # subset of the string_escape codec
394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	39 text = text.replace('\\', '\\\\').replace('\n', '\\n').replace('\r', '\\r')
394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	40 return text.replace('\0', '\\0')
394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	41
8443 53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	42 def decodeextra(text):
15661 20ae902c43ec changelog: handle decoding of NULs in extra more carefully (issue3156) Matt Mackall <mpm@selenic.com> parents: 14643 diff changeset	43 """
18379 e0c4f4ba624c tests: fix doctest stability over Python versions Mads Kiilerich <madski@unity3d.com> parents: 18378 diff changeset	44 >>> sorted(decodeextra(encodeextra({'foo': 'bar', 'baz': chr(0) + '2'})
e0c4f4ba624c tests: fix doctest stability over Python versions Mads Kiilerich <madski@unity3d.com> parents: 18378 diff changeset	45 ... ).iteritems())
e0c4f4ba624c tests: fix doctest stability over Python versions Mads Kiilerich <madski@unity3d.com> parents: 18378 diff changeset	46 [('baz', '\\x002'), ('branch', 'default'), ('foo', 'bar')]
e0c4f4ba624c tests: fix doctest stability over Python versions Mads Kiilerich <madski@unity3d.com> parents: 18378 diff changeset	47 >>> sorted(decodeextra(encodeextra({'foo': 'bar',
e0c4f4ba624c tests: fix doctest stability over Python versions Mads Kiilerich <madski@unity3d.com> parents: 18378 diff changeset	48 ... 'baz': chr(92) + chr(0) + '2'})
e0c4f4ba624c tests: fix doctest stability over Python versions Mads Kiilerich <madski@unity3d.com> parents: 18378 diff changeset	49 ... ).iteritems())
e0c4f4ba624c tests: fix doctest stability over Python versions Mads Kiilerich <madski@unity3d.com> parents: 18378 diff changeset	50 [('baz', '\\\\\\x002'), ('branch', 'default'), ('foo', 'bar')]
15661 20ae902c43ec changelog: handle decoding of NULs in extra more carefully (issue3156) Matt Mackall <mpm@selenic.com> parents: 14643 diff changeset	51 """
16267 aa6821a7b52f changelog: micro-optimizations to changelog.read() Matt Mackall <mpm@selenic.com> parents: 15661 diff changeset	52 extra = _defaultextra.copy()
8443 53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	53 for l in text.split('\0'):
53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	54 if l:
15661 20ae902c43ec changelog: handle decoding of NULs in extra more carefully (issue3156) Matt Mackall <mpm@selenic.com> parents: 14643 diff changeset	55 if '\\0' in l:
20ae902c43ec changelog: handle decoding of NULs in extra more carefully (issue3156) Matt Mackall <mpm@selenic.com> parents: 14643 diff changeset	56 # fix up \0 without getting into trouble with \\0
20ae902c43ec changelog: handle decoding of NULs in extra more carefully (issue3156) Matt Mackall <mpm@selenic.com> parents: 14643 diff changeset	57 l = l.replace('\\\\', '\\\\\n')
20ae902c43ec changelog: handle decoding of NULs in extra more carefully (issue3156) Matt Mackall <mpm@selenic.com> parents: 14643 diff changeset	58 l = l.replace('\\0', '\0')
20ae902c43ec changelog: handle decoding of NULs in extra more carefully (issue3156) Matt Mackall <mpm@selenic.com> parents: 14643 diff changeset	59 l = l.replace('\n', '')
8443 53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	60 k, v = l.decode('string_escape').split(':', 1)
53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	61 extra[k] = v
53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	62 return extra
53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	63
53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	64 def encodeextra(d):
53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	65 # keys must be sorted to produce a deterministic changelog entry
53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	66 items = [_string_escape('%s:%s' % (k, d[k])) for k in sorted(d)]
53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	67 return "\0".join(items)
53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	68
17810 2894d180afa1 changelog: extract description cleaning logic in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17677 diff changeset	69 def stripdesc(desc):
2894d180afa1 changelog: extract description cleaning logic in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17677 diff changeset	70 """strip trailing whitespace and leading and trailing empty lines"""
2894d180afa1 changelog: extract description cleaning logic in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17677 diff changeset	71 return '\n'.join([l.rstrip() for l in desc.splitlines()]).strip('\n')
2894d180afa1 changelog: extract description cleaning logic in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17677 diff changeset	72
8778 c5f36402daad use new style classes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8644 diff changeset	73 class appender(object):
7807 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7787 diff changeset	74 '''the changelog index must be updated last on disk, so we use this class
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	75 to delay writes to it'''
19899 8c3dcbbfb5de changelog: use "vfs.fstat()" instead of "util.fstat()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19898 diff changeset	76 def __init__(self, vfs, name, mode, buf):
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	77 self.data = buf
19899 8c3dcbbfb5de changelog: use "vfs.fstat()" instead of "util.fstat()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19898 diff changeset	78 fp = vfs(name, mode)
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	79 self.fp = fp
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	80 self.offset = fp.tell()
19899 8c3dcbbfb5de changelog: use "vfs.fstat()" instead of "util.fstat()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19898 diff changeset	81 self.size = vfs.fstat(fp).st_size
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	82
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	83 def end(self):
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	84 return self.size + len("".join(self.data))
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	85 def tell(self):
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	86 return self.offset
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	87 def flush(self):
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	88 pass
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	89 def close(self):
4961 3fdd09ad6cce fix bogus close spotted by pychecker (no close() in global scope) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4635 diff changeset	90 self.fp.close()
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	91
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	92 def seek(self, offset, whence=0):
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	93 '''virtual file offset spans real file and data'''
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	94 if whence == 0:
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	95 self.offset = offset
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	96 elif whence == 1:
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	97 self.offset += offset
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	98 elif whence == 2:
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	99 self.offset = self.end() + offset
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	100 if self.offset < self.size:
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	101 self.fp.seek(self.offset)
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	102
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	103 def read(self, count=-1):
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	104 '''only trick here is reads that span real file and data'''
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	105 ret = ""
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	106 if self.offset < self.size:
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	107 s = self.fp.read(count)
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	108 ret = s
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	109 self.offset += len(s)
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	110 if count > 0:
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	111 count -= len(s)
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	112 if count != 0:
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	113 doff = self.offset - self.size
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	114 self.data.insert(0, "".join(self.data))
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	115 del self.data[1:]
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	116 s = self.data[0][doff:doff + count]
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	117 self.offset += len(s)
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	118 ret += s
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	119 return ret
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	120
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	121 def write(self, s):
5450 c728424d44c6 revlog: fix caching of buffer objects Matt Mackall <mpm@selenic.com> parents: 4963 diff changeset	122 self.data.append(str(s))
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	123 self.offset += len(s)
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	124
23201 7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	125 def _divertopener(opener, target):
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	126 """build an opener that writes in 'target.a' instead of 'target'"""
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	127 def _divert(name, mode='r'):
9166 e6162b854ed5 changelog: move delayopener outside of class to eliminate reference cycle Matt Mackall <mpm@selenic.com> parents: 9165 diff changeset	128 if name != target:
e6162b854ed5 changelog: move delayopener outside of class to eliminate reference cycle Matt Mackall <mpm@selenic.com> parents: 9165 diff changeset	129 return opener(name, mode)
23201 7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	130 return opener(name + ".a", mode)
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	131 return _divert
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	132
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	133 def _delayopener(opener, target, buf):
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	134 """build an opener that stores chunks in 'buf' instead of 'target'"""
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	135 def _delay(name, mode='r'):
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	136 if name != target:
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	137 return opener(name, mode)
19899 8c3dcbbfb5de changelog: use "vfs.fstat()" instead of "util.fstat()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19898 diff changeset	138 return appender(opener, name, mode, buf)
23201 7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	139 return _delay
9166 e6162b854ed5 changelog: move delayopener outside of class to eliminate reference cycle Matt Mackall <mpm@selenic.com> parents: 9165 diff changeset	140
28487 98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	141 _changelogrevision = collections.namedtuple('changelogrevision',
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	142 ('manifest', 'user', 'date',
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	143 'files', 'description', 'extra'))
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	144
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	145 class changelogrevision(object):
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	146 """Holds results of a parsed changelog revision.
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	147
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	148 Changelog revisions consist of multiple pieces of data, including
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	149 the manifest node, user, and date. This object exposes a view into
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	150 the parsed object.
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	151 """
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	152
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	153 __slots__ = (
28492 837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	154 '_rawdateextra',
28489 8939a95064f1 changelog: lazily parse description Gregory Szorc <gregory.szorc@gmail.com> parents: 28487 diff changeset	155 '_rawdesc',
28487 98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	156 'files',
28490 959eadae589a changelog: lazily parse manifest node Gregory Szorc <gregory.szorc@gmail.com> parents: 28489 diff changeset	157 '_rawmanifest',
28491 f57f7500a095 changelog: lazily parse user Gregory Szorc <gregory.szorc@gmail.com> parents: 28490 diff changeset	158 '_rawuser',
28487 98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	159 )
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	160
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	161 def __new__(cls, text):
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	162 if not text:
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	163 return _changelogrevision(
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	164 manifest=nullid,
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	165 user='',
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	166 date=(0, 0),
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	167 files=[],
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	168 description='',
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	169 extra=_defaultextra,
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	170 )
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	171
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	172 self = super(changelogrevision, cls).__new__(cls)
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	173 # We could return here and implement the following as an __init__.
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	174 # But doing it here is equivalent and saves an extra function call.
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	175
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	176 # format used:
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	177 # nodeid\n : manifest node in ascii
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	178 # user\n : user, no \n or \r allowed
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	179 # time tz extra\n : date (time is int or float, timezone is int)
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	180 # : extra is metadata, encoded and separated by '\0'
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	181 # : older versions ignore it
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	182 # files\n\n : files modified by the cset, no \n or \r allowed
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	183 # (.*) : comment (free text, ideally utf-8)
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	184 #
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	185 # changelog v0 doesn't use extra
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	186
28489 8939a95064f1 changelog: lazily parse description Gregory Szorc <gregory.szorc@gmail.com> parents: 28487 diff changeset	187 doublenl = text.index('\n\n')
8939a95064f1 changelog: lazily parse description Gregory Szorc <gregory.szorc@gmail.com> parents: 28487 diff changeset	188 self._rawdesc = text[doublenl + 2:]
8939a95064f1 changelog: lazily parse description Gregory Szorc <gregory.szorc@gmail.com> parents: 28487 diff changeset	189
28490 959eadae589a changelog: lazily parse manifest node Gregory Szorc <gregory.szorc@gmail.com> parents: 28489 diff changeset	190 nl1 = text.index('\n')
959eadae589a changelog: lazily parse manifest node Gregory Szorc <gregory.szorc@gmail.com> parents: 28489 diff changeset	191 self._rawmanifest = text[0:nl1]
959eadae589a changelog: lazily parse manifest node Gregory Szorc <gregory.szorc@gmail.com> parents: 28489 diff changeset	192
28491 f57f7500a095 changelog: lazily parse user Gregory Szorc <gregory.szorc@gmail.com> parents: 28490 diff changeset	193 nl2 = text.index('\n', nl1 + 1)
f57f7500a095 changelog: lazily parse user Gregory Szorc <gregory.szorc@gmail.com> parents: 28490 diff changeset	194 self._rawuser = text[nl1 + 1:nl2]
f57f7500a095 changelog: lazily parse user Gregory Szorc <gregory.szorc@gmail.com> parents: 28490 diff changeset	195
28492 837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	196 nl3 = text.index('\n', nl2 + 1)
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	197 self._rawdateextra = text[nl2 + 1:nl3]
28487 98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	198
28492 837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	199 l = text[:doublenl].split('\n')
28487 98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	200 self.files = l[3:]
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	201
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	202 return self
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	203
28489 8939a95064f1 changelog: lazily parse description Gregory Szorc <gregory.szorc@gmail.com> parents: 28487 diff changeset	204 @property
28490 959eadae589a changelog: lazily parse manifest node Gregory Szorc <gregory.szorc@gmail.com> parents: 28489 diff changeset	205 def manifest(self):
959eadae589a changelog: lazily parse manifest node Gregory Szorc <gregory.szorc@gmail.com> parents: 28489 diff changeset	206 return bin(self._rawmanifest)
959eadae589a changelog: lazily parse manifest node Gregory Szorc <gregory.szorc@gmail.com> parents: 28489 diff changeset	207
959eadae589a changelog: lazily parse manifest node Gregory Szorc <gregory.szorc@gmail.com> parents: 28489 diff changeset	208 @property
28491 f57f7500a095 changelog: lazily parse user Gregory Szorc <gregory.szorc@gmail.com> parents: 28490 diff changeset	209 def user(self):
f57f7500a095 changelog: lazily parse user Gregory Szorc <gregory.szorc@gmail.com> parents: 28490 diff changeset	210 return encoding.tolocal(self._rawuser)
f57f7500a095 changelog: lazily parse user Gregory Szorc <gregory.szorc@gmail.com> parents: 28490 diff changeset	211
f57f7500a095 changelog: lazily parse user Gregory Szorc <gregory.szorc@gmail.com> parents: 28490 diff changeset	212 @property
28492 837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	213 def _rawdate(self):
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	214 return self._rawdateextra.split(' ', 2)[0:2]
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	215
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	216 @property
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	217 def _rawextra(self):
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	218 fields = self._rawdateextra.split(' ', 2)
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	219 if len(fields) != 3:
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	220 return None
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	221
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	222 return fields[2]
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	223
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	224 @property
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	225 def date(self):
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	226 raw = self._rawdate
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	227 time = float(raw[0])
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	228 # Various tools did silly things with the timezone.
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	229 try:
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	230 timezone = int(raw[1])
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	231 except ValueError:
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	232 timezone = 0
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	233
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	234 return time, timezone
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	235
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	236 @property
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	237 def extra(self):
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	238 raw = self._rawextra
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	239 if raw is None:
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	240 return _defaultextra
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	241
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	242 return decodeextra(raw)
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	243
837f1c437d58 changelog: lazily parse date/extra field Gregory Szorc <gregory.szorc@gmail.com> parents: 28491 diff changeset	244 @property
28489 8939a95064f1 changelog: lazily parse description Gregory Szorc <gregory.szorc@gmail.com> parents: 28487 diff changeset	245 def description(self):
8939a95064f1 changelog: lazily parse description Gregory Szorc <gregory.szorc@gmail.com> parents: 28487 diff changeset	246 return encoding.tolocal(self._rawdesc)
8939a95064f1 changelog: lazily parse description Gregory Szorc <gregory.szorc@gmail.com> parents: 28487 diff changeset	247
7634 14a4337a9b9b revlog: kill from-style imports Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	248 class changelog(revlog.revlog):
4258 b11a2fb59cf5 revlog: simplify revlog version handling Matt Mackall <mpm@selenic.com> parents: 4257 diff changeset	249 def __init__(self, opener):
9165 07f9b2f4a9aa changelog: swap opener to switch delay modes Matt Mackall <mpm@selenic.com> parents: 9164 diff changeset	250 revlog.revlog.__init__(self, opener, "00changelog.i")
14334 85c82ebc96a3 changelog: don't use generaldelta Sune Foldager <cryo@cyanite.org> parents: 14207 diff changeset	251 if self._initempty:
85c82ebc96a3 changelog: don't use generaldelta Sune Foldager <cryo@cyanite.org> parents: 14207 diff changeset	252 # changelogs don't benefit from generaldelta
85c82ebc96a3 changelog: don't use generaldelta Sune Foldager <cryo@cyanite.org> parents: 14207 diff changeset	253 self.version &= ~revlog.REVLOGGENERALDELTA
85c82ebc96a3 changelog: don't use generaldelta Sune Foldager <cryo@cyanite.org> parents: 14207 diff changeset	254 self._generaldelta = False
8644 c2ef478b2efa changelog: make delayopener less intrusive Matt Mackall <mpm@selenic.com> parents: 8499 diff changeset	255 self._realopener = opener
c2ef478b2efa changelog: make delayopener less intrusive Matt Mackall <mpm@selenic.com> parents: 8499 diff changeset	256 self._delayed = False
23201 7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	257 self._delaybuf = None
9163 f193b643d1b1 changelog: _delaycount -> _divert Matt Mackall <mpm@selenic.com> parents: 8778 diff changeset	258 self._divert = False
18231 c0c943ef4e55 clfilter: use empty frozenset intead of empty tuple Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17951 diff changeset	259 self.filteredrevs = frozenset()
17677 5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	260
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	261 def tip(self):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	262 """filtered version of revlog.tip"""
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	263 for i in xrange(len(self) -1, -2, -1):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	264 if i not in self.filteredrevs:
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	265 return self.node(i)
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	266
24030 828dc8db5515 revlog: add __contains__ for fast membership test Yuya Nishihara <yuya@tcha.org> parents: 23292 diff changeset	267 def __contains__(self, rev):
828dc8db5515 revlog: add __contains__ for fast membership test Yuya Nishihara <yuya@tcha.org> parents: 23292 diff changeset	268 """filtered version of revlog.__contains__"""
24662 b5cd8c2f6e65 changelog: inline revlog.__contains__ in case it is used in hot loop Yuya Nishihara <yuya@tcha.org> parents: 24030 diff changeset	269 return (0 <= rev < len(self)
24030 828dc8db5515 revlog: add __contains__ for fast membership test Yuya Nishihara <yuya@tcha.org> parents: 23292 diff changeset	270 and rev not in self.filteredrevs)
828dc8db5515 revlog: add __contains__ for fast membership test Yuya Nishihara <yuya@tcha.org> parents: 23292 diff changeset	271
17677 5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	272 def __iter__(self):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	273 """filtered version of revlog.__iter__"""
17951 6f79c32c0bdf commit: increase perf by avoiding unnecessary filteredrevs check Durham Goode <durham@fb.com> parents: 17810 diff changeset	274 if len(self.filteredrevs) == 0:
6f79c32c0bdf commit: increase perf by avoiding unnecessary filteredrevs check Durham Goode <durham@fb.com> parents: 17810 diff changeset	275 return revlog.revlog.__iter__(self)
6f79c32c0bdf commit: increase perf by avoiding unnecessary filteredrevs check Durham Goode <durham@fb.com> parents: 17810 diff changeset	276
6f79c32c0bdf commit: increase perf by avoiding unnecessary filteredrevs check Durham Goode <durham@fb.com> parents: 17810 diff changeset	277 def filterediter():
6f79c32c0bdf commit: increase perf by avoiding unnecessary filteredrevs check Durham Goode <durham@fb.com> parents: 17810 diff changeset	278 for i in xrange(len(self)):
6f79c32c0bdf commit: increase perf by avoiding unnecessary filteredrevs check Durham Goode <durham@fb.com> parents: 17810 diff changeset	279 if i not in self.filteredrevs:
6f79c32c0bdf commit: increase perf by avoiding unnecessary filteredrevs check Durham Goode <durham@fb.com> parents: 17810 diff changeset	280 yield i
6f79c32c0bdf commit: increase perf by avoiding unnecessary filteredrevs check Durham Goode <durham@fb.com> parents: 17810 diff changeset	281
6f79c32c0bdf commit: increase perf by avoiding unnecessary filteredrevs check Durham Goode <durham@fb.com> parents: 17810 diff changeset	282 return filterediter()
17677 5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	283
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	284 def revs(self, start=0, stop=None):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	285 """filtered version of revlog.revs"""
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	286 for i in super(changelog, self).revs(start, stop):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	287 if i not in self.filteredrevs:
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	288 yield i
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	289
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	290 @util.propertycache
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	291 def nodemap(self):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	292 # XXX need filtering too
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	293 self.rev(self.node(0))
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	294 return self._nodecache
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	295
26005 6f4a280298c1 changelog: add way to call the reachableroots C implementation Laurent Charignon <lcharignon@fb.com> parents: 25922 diff changeset	296 def reachableroots(self, minroot, heads, roots, includepath=False):
26094 df41c7be16d6 reachableroots: construct and sort baseset in revset module Yuya Nishihara <yuya@tcha.org> parents: 26061 diff changeset	297 return self.index.reachableroots2(minroot, heads, roots, includepath)
26005 6f4a280298c1 changelog: add way to call the reachableroots C implementation Laurent Charignon <lcharignon@fb.com> parents: 25922 diff changeset	298
17677 5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	299 def headrevs(self):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	300 if self.filteredrevs:
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 21544 diff changeset	301 try:
23088 fe5f044b753d changelog: use headrevsfiltered Mads Kiilerich <madski@unity3d.com> parents: 23015 diff changeset	302 return self.index.headrevsfiltered(self.filteredrevs)
fe5f044b753d changelog: use headrevsfiltered Mads Kiilerich <madski@unity3d.com> parents: 23015 diff changeset	303 # AttributeError covers non-c-extension environments and
fe5f044b753d changelog: use headrevsfiltered Mads Kiilerich <madski@unity3d.com> parents: 23015 diff changeset	304 # old c extensions without filter handling.
fe5f044b753d changelog: use headrevsfiltered Mads Kiilerich <madski@unity3d.com> parents: 23015 diff changeset	305 except AttributeError:
22484 2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 21544 diff changeset	306 return self._headrevs()
2b5940f64750 obsolete: use C code for headrevs calculation Durham Goode <durham@fb.com> parents: 21544 diff changeset	307
17677 5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	308 return super(changelog, self).headrevs()
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	309
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	310 def strip(self, args, *kwargs):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	311 # XXX make something better than assert
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	312 # We can't expect proper strip behavior if we are filtered.
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	313 assert not self.filteredrevs
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	314 super(changelog, self).strip(args, *kwargs)
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	315
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	316 def rev(self, node):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	317 """filtered version of revlog.rev"""
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	318 r = super(changelog, self).rev(node)
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	319 if r in self.filteredrevs:
23015 21c44c1aed87 repoview: add a FilteredLookupError class Pierre-Yves David <pierre-yves.david@fb.com> parents: 23014 diff changeset	320 raise error.FilteredLookupError(hex(node), self.indexfile,
21c44c1aed87 repoview: add a FilteredLookupError class Pierre-Yves David <pierre-yves.david@fb.com> parents: 23014 diff changeset	321 _('filtered node'))
17677 5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	322 return r
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	323
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	324 def node(self, rev):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	325 """filtered version of revlog.node"""
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	326 if rev in self.filteredrevs:
23014 f00813325c5a repoview: add a FilteredIndexError class Pierre-Yves David <pierre-yves.david@fb.com> parents: 22484 diff changeset	327 raise error.FilteredIndexError(rev)
17677 5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	328 return super(changelog, self).node(rev)
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	329
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	330 def linkrev(self, rev):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	331 """filtered version of revlog.linkrev"""
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	332 if rev in self.filteredrevs:
23014 f00813325c5a repoview: add a FilteredIndexError class Pierre-Yves David <pierre-yves.david@fb.com> parents: 22484 diff changeset	333 raise error.FilteredIndexError(rev)
17677 5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	334 return super(changelog, self).linkrev(rev)
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	335
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	336 def parentrevs(self, rev):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	337 """filtered version of revlog.parentrevs"""
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	338 if rev in self.filteredrevs:
23014 f00813325c5a repoview: add a FilteredIndexError class Pierre-Yves David <pierre-yves.david@fb.com> parents: 22484 diff changeset	339 raise error.FilteredIndexError(rev)
17677 5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	340 return super(changelog, self).parentrevs(rev)
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	341
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	342 def flags(self, rev):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	343 """filtered version of revlog.flags"""
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	344 if rev in self.filteredrevs:
23014 f00813325c5a repoview: add a FilteredIndexError class Pierre-Yves David <pierre-yves.david@fb.com> parents: 22484 diff changeset	345 raise error.FilteredIndexError(rev)
17677 5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	346 return super(changelog, self).flags(rev)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	347
23203 3872d563e01a changelog: handle writepending in the transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 23201 diff changeset	348 def delayupdate(self, tr):
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	349 "delay visibility of index updates to other readers"
23201 7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	350
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	351 if not self._delayed:
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	352 if len(self) == 0:
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	353 self._divert = True
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	354 if self._realopener.exists(self.indexfile + '.a'):
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	355 self._realopener.unlink(self.indexfile + '.a')
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	356 self.opener = _divertopener(self._realopener, self.indexfile)
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	357 else:
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	358 self._delaybuf = []
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	359 self.opener = _delayopener(self._realopener, self.indexfile,
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	360 self._delaybuf)
8644 c2ef478b2efa changelog: make delayopener less intrusive Matt Mackall <mpm@selenic.com> parents: 8499 diff changeset	361 self._delayed = True
23203 3872d563e01a changelog: handle writepending in the transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 23201 diff changeset	362 tr.addpending('cl-%i' % id(self), self._writepending)
23281 f60ed8cf4afc transaction: pass the transaction to 'finalize' callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23280 diff changeset	363 tr.addfinalize('cl-%i' % id(self), self._finalize)
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	364
23205 2d54aa5397cd changelog: rely on transaction for finalization Pierre-Yves David <pierre-yves.david@fb.com> parents: 23203 diff changeset	365 def _finalize(self, tr):
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	366 "finalize index updates"
8644 c2ef478b2efa changelog: make delayopener less intrusive Matt Mackall <mpm@selenic.com> parents: 8499 diff changeset	367 self._delayed = False
9165 07f9b2f4a9aa changelog: swap opener to switch delay modes Matt Mackall <mpm@selenic.com> parents: 9164 diff changeset	368 self.opener = self._realopener
4269 73c918c71300 changelog: optimize delayed updates for clone vs pull Matt Mackall <mpm@selenic.com> parents: 4261 diff changeset	369 # move redirected index data back into place
9164 b0d995b6b0a6 changelog: factor out _delayname Matt Mackall <mpm@selenic.com> parents: 9163 diff changeset	370 if self._divert:
23201 7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	371 assert not self._delaybuf
19898 3f92e749d381 changelog: use "vfs.rename()" instead of "util.rename()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18587 diff changeset	372 tmpname = self.indexfile + ".a"
3f92e749d381 changelog: use "vfs.rename()" instead of "util.rename()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18587 diff changeset	373 nfile = self.opener.open(tmpname)
14207 c1cca38818b9 changelog: fixes leaked file handle Zachary Gramana <zgramana@pottsconsultinggroup.com> parents: 14004 diff changeset	374 nfile.close()
19898 3f92e749d381 changelog: use "vfs.rename()" instead of "util.rename()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18587 diff changeset	375 self.opener.rename(tmpname, self.indexfile)
4269 73c918c71300 changelog: optimize delayed updates for clone vs pull Matt Mackall <mpm@selenic.com> parents: 4261 diff changeset	376 elif self._delaybuf:
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	377 fp = self.opener(self.indexfile, 'a')
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	378 fp.write("".join(self._delaybuf))
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	379 fp.close()
23201 7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	380 self._delaybuf = None
7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	381 self._divert = False
4269 73c918c71300 changelog: optimize delayed updates for clone vs pull Matt Mackall <mpm@selenic.com> parents: 4261 diff changeset	382 # split when we're done
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	383 self.checkinlinesize(tr)
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	384
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	385 def readpending(self, file):
25635 7fdd1782fc4e changelog: document the 'readpending' method Pierre-Yves David <pierre-yves.david@fb.com> parents: 24961 diff changeset	386 """read index data from a "pending" file
7fdd1782fc4e changelog: document the 'readpending' method Pierre-Yves David <pierre-yves.david@fb.com> parents: 24961 diff changeset	387
7fdd1782fc4e changelog: document the 'readpending' method Pierre-Yves David <pierre-yves.david@fb.com> parents: 24961 diff changeset	388 During a transaction, the actual changeset data is already stored in the
7fdd1782fc4e changelog: document the 'readpending' method Pierre-Yves David <pierre-yves.david@fb.com> parents: 24961 diff changeset	389 main file, but not yet finalized in the on-disk index. Instead, a
7fdd1782fc4e changelog: document the 'readpending' method Pierre-Yves David <pierre-yves.david@fb.com> parents: 24961 diff changeset	390 "pending" index is written by the transaction logic. If this function
7fdd1782fc4e changelog: document the 'readpending' method Pierre-Yves David <pierre-yves.david@fb.com> parents: 24961 diff changeset	391 is running, we are likely in a subprocess invoked in a hook. The
7fdd1782fc4e changelog: document the 'readpending' method Pierre-Yves David <pierre-yves.david@fb.com> parents: 24961 diff changeset	392 subprocess is informed that it is within a transaction and needs to
7fdd1782fc4e changelog: document the 'readpending' method Pierre-Yves David <pierre-yves.david@fb.com> parents: 24961 diff changeset	393 access its content.
7fdd1782fc4e changelog: document the 'readpending' method Pierre-Yves David <pierre-yves.david@fb.com> parents: 24961 diff changeset	394
7fdd1782fc4e changelog: document the 'readpending' method Pierre-Yves David <pierre-yves.david@fb.com> parents: 24961 diff changeset	395 This function will read all the index data out of the pending file and
25814 dc1a49264628 changelog: update read pending documentation Pierre-Yves David <pierre-yves.david@fb.com> parents: 25635 diff changeset	396 overwrite the main index."""
25635 7fdd1782fc4e changelog: document the 'readpending' method Pierre-Yves David <pierre-yves.david@fb.com> parents: 24961 diff changeset	397
24822 8678b1eafbcf changelog: fix readpending if no pending data exist (issue4609) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24662 diff changeset	398 if not self.opener.exists(file):
8678b1eafbcf changelog: fix readpending if no pending data exist (issue4609) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24662 diff changeset	399 return # no pending data for changelog
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	400 r = revlog.revlog(self.opener, file)
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	401 self.index = r.index
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	402 self.nodemap = r.nodemap
16619 bc84a1aeaf5a changelog: ensure that nodecache is valid (issue3428) Bryan O'Sullivan <bryano@fb.com> parents: 16267 diff changeset	403 self._nodecache = r._nodecache
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	404 self._chunkcache = r._chunkcache
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	405
23280 b01c491af0cf transaction: pass the transaction to 'pending' callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23205 diff changeset	406 def _writepending(self, tr):
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	407 "create a file containing the unfinalized state for pretxnchangegroup"
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	408 if self._delaybuf:
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	409 # make a temporary copy of the index
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	410 fp1 = self._realopener(self.indexfile)
23292 e44399c494ab changelog: register changelog.i.a as a temporary file Pierre-Yves David <pierre-yves.david@fb.com> parents: 23281 diff changeset	411 pendingfilename = self.indexfile + ".a"
e44399c494ab changelog: register changelog.i.a as a temporary file Pierre-Yves David <pierre-yves.david@fb.com> parents: 23281 diff changeset	412 # register as a temp file to ensure cleanup on failure
e44399c494ab changelog: register changelog.i.a as a temporary file Pierre-Yves David <pierre-yves.david@fb.com> parents: 23281 diff changeset	413 tr.registertmp(pendingfilename)
e44399c494ab changelog: register changelog.i.a as a temporary file Pierre-Yves David <pierre-yves.david@fb.com> parents: 23281 diff changeset	414 # write existing data
e44399c494ab changelog: register changelog.i.a as a temporary file Pierre-Yves David <pierre-yves.david@fb.com> parents: 23281 diff changeset	415 fp2 = self._realopener(pendingfilename, "w")
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	416 fp2.write(fp1.read())
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	417 # add pending data
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	418 fp2.write("".join(self._delaybuf))
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	419 fp2.close()
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	420 # switch modes so finalize can simply rename
23201 7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	421 self._delaybuf = None
9164 b0d995b6b0a6 changelog: factor out _delayname Matt Mackall <mpm@selenic.com> parents: 9163 diff changeset	422 self._divert = True
23201 7e97bf6ee2d6 changelog: rework the delayupdate mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 23088 diff changeset	423 self.opener = _divertopener(self._realopener, self.indexfile)
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	424
9164 b0d995b6b0a6 changelog: factor out _delayname Matt Mackall <mpm@selenic.com> parents: 9163 diff changeset	425 if self._divert:
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	426 return True
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	427
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	428 return False
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	429
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	430 def checkinlinesize(self, tr, fp=None):
9165 07f9b2f4a9aa changelog: swap opener to switch delay modes Matt Mackall <mpm@selenic.com> parents: 9164 diff changeset	431 if not self._delayed:
07f9b2f4a9aa changelog: swap opener to switch delay modes Matt Mackall <mpm@selenic.com> parents: 9164 diff changeset	432 revlog.revlog.checkinlinesize(self, tr, fp)
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	433
5744 9db7fd77417d changelog: remove extract function Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	434 def read(self, node):
28487 98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	435 """Obtain data from a parsed changelog revision.
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	436
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	437 Returns a 6-tuple of:
3233 2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	438
28487 98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	439 - manifest node in binary
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	440 - author/user as a localstr
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	441 - date as a 2-tuple of (time, timezone)
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	442 - list of files
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	443 - commit message as a localstr
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	444 - dict of extra metadata
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	445
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	446 Unless you need to access all fields, consider calling
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	447 ``changelogrevision`` instead, as it is faster for partial object
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	448 access.
3077 ad6aecaf4eed document changelog format Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2859 diff changeset	449 """
28487 98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	450 c = changelogrevision(self.revision(node))
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	451 return (
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	452 c.manifest,
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	453 c.user,
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	454 c.date,
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	455 c.files,
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	456 c.description,
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	457 c.extra
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	458 )
3233 2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	459
28487 98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	460 def changelogrevision(self, nodeorrev):
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	461 """Obtain a ``changelogrevision`` for a node or revision."""
98d98a645e9d changelog: add class to represent parsed changelog revisions Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	462 return changelogrevision(self.revision(nodeorrev))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	463
27439 ed003859f1d8 changelog: add a new method to get files modified by a changeset Laurent Charignon <lcharignon@fb.com> parents: 26094 diff changeset	464 def readfiles(self, node):
ed003859f1d8 changelog: add a new method to get files modified by a changeset Laurent Charignon <lcharignon@fb.com> parents: 26094 diff changeset	465 """
ed003859f1d8 changelog: add a new method to get files modified by a changeset Laurent Charignon <lcharignon@fb.com> parents: 26094 diff changeset	466 short version of read that only returns the files modified by the cset
ed003859f1d8 changelog: add a new method to get files modified by a changeset Laurent Charignon <lcharignon@fb.com> parents: 26094 diff changeset	467 """
ed003859f1d8 changelog: add a new method to get files modified by a changeset Laurent Charignon <lcharignon@fb.com> parents: 26094 diff changeset	468 text = self.revision(node)
ed003859f1d8 changelog: add a new method to get files modified by a changeset Laurent Charignon <lcharignon@fb.com> parents: 26094 diff changeset	469 if not text:
ed003859f1d8 changelog: add a new method to get files modified by a changeset Laurent Charignon <lcharignon@fb.com> parents: 26094 diff changeset	470 return []
ed003859f1d8 changelog: add a new method to get files modified by a changeset Laurent Charignon <lcharignon@fb.com> parents: 26094 diff changeset	471 last = text.index("\n\n")
ed003859f1d8 changelog: add a new method to get files modified by a changeset Laurent Charignon <lcharignon@fb.com> parents: 26094 diff changeset	472 l = text[:last].split('\n')
ed003859f1d8 changelog: add a new method to get files modified by a changeset Laurent Charignon <lcharignon@fb.com> parents: 26094 diff changeset	473 return l[3:]
ed003859f1d8 changelog: add a new method to get files modified by a changeset Laurent Charignon <lcharignon@fb.com> parents: 26094 diff changeset	474
8422 437e06bbd11e changelog: removed bad default arguments in add method Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	475 def add(self, manifest, files, desc, transaction, p1, p2,
9677 0c072e63e3e7 changelog: do not use a mutable default value Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9166 diff changeset	476 user, date=None, extra=None):
14379 bd23d5f28bbb changelog: convert user and desc from local encoding early Martin Geisler <mg@aragost.com> parents: 10420 diff changeset	477 # Convert to UTF-8 encoded bytestrings as the very first
bd23d5f28bbb changelog: convert user and desc from local encoding early Martin Geisler <mg@aragost.com> parents: 10420 diff changeset	478 # thing: calling any method on a localstr object will turn it
bd23d5f28bbb changelog: convert user and desc from local encoding early Martin Geisler <mg@aragost.com> parents: 10420 diff changeset	479 # into a str object and the cached UTF-8 string is thus lost.
bd23d5f28bbb changelog: convert user and desc from local encoding early Martin Geisler <mg@aragost.com> parents: 10420 diff changeset	480 user, desc = encoding.fromlocal(user), encoding.fromlocal(desc)
bd23d5f28bbb changelog: convert user and desc from local encoding early Martin Geisler <mg@aragost.com> parents: 10420 diff changeset	481
7035 9d023ef7b467 forbid username with '\n' at the changelog level Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6259 diff changeset	482 user = user.strip()
8424 c5b3d3e30de7 changelog: refuse to add revisions with empty usernames Martin Geisler <mg@lazybytes.net> parents: 7807 diff changeset	483 # An empty username or a username with a "\n" will make the
c5b3d3e30de7 changelog: refuse to add revisions with empty usernames Martin Geisler <mg@lazybytes.net> parents: 7807 diff changeset	484 # revision text contain two "\n\n" sequences -> corrupt
c5b3d3e30de7 changelog: refuse to add revisions with empty usernames Martin Geisler <mg@lazybytes.net> parents: 7807 diff changeset	485 # repository since read cannot unpack the revision.
c5b3d3e30de7 changelog: refuse to add revisions with empty usernames Martin Geisler <mg@lazybytes.net> parents: 7807 diff changeset	486 if not user:
c5b3d3e30de7 changelog: refuse to add revisions with empty usernames Martin Geisler <mg@lazybytes.net> parents: 7807 diff changeset	487 raise error.RevlogError(_("empty username"))
7035 9d023ef7b467 forbid username with '\n' at the changelog level Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6259 diff changeset	488 if "\n" in user:
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7470 diff changeset	489 raise error.RevlogError(_("username %s contains a newline")
08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7470 diff changeset	490 % repr(user))
8499 fb9b83df45f3 commit: move description trimming into changelog Matt Mackall <mpm@selenic.com> parents: 8443 diff changeset	491
17810 2894d180afa1 changelog: extract description cleaning logic in a dedicated function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17677 diff changeset	492 desc = stripdesc(desc)
8499 fb9b83df45f3 commit: move description trimming into changelog Matt Mackall <mpm@selenic.com> parents: 8443 diff changeset	493
1195 f92af8d53330 Validate user input of dates when adding a changelog entry. Bryan O'Sullivan <bos@serpentine.com> parents: 1095 diff changeset	494 if date:
2523 4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	495 parseddate = "%d %d" % util.parsedate(date)
1195 f92af8d53330 Validate user input of dates when adding a changelog entry. Bryan O'Sullivan <bos@serpentine.com> parents: 1095 diff changeset	496 else:
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2142 diff changeset	497 parseddate = "%d %d" % util.makedate()
10417 58e040c51231 branch: avoid using reserved tag names Wagner Bruna <wbruna@softwareexpress.com.br> parents: 10263 diff changeset	498 if extra:
58e040c51231 branch: avoid using reserved tag names Wagner Bruna <wbruna@softwareexpress.com.br> parents: 10263 diff changeset	499 branch = extra.get("branch")
58e040c51231 branch: avoid using reserved tag names Wagner Bruna <wbruna@softwareexpress.com.br> parents: 10263 diff changeset	500 if branch in ("default", ""):
58e040c51231 branch: avoid using reserved tag names Wagner Bruna <wbruna@softwareexpress.com.br> parents: 10263 diff changeset	501 del extra["branch"]
58e040c51231 branch: avoid using reserved tag names Wagner Bruna <wbruna@softwareexpress.com.br> parents: 10263 diff changeset	502 elif branch in (".", "null", "tip"):
58e040c51231 branch: avoid using reserved tag names Wagner Bruna <wbruna@softwareexpress.com.br> parents: 10263 diff changeset	503 raise error.RevlogError(_('the name \'%s\' is reserved')
58e040c51231 branch: avoid using reserved tag names Wagner Bruna <wbruna@softwareexpress.com.br> parents: 10263 diff changeset	504 % branch)
3233 2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	505 if extra:
8443 53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	506 extra = encodeextra(extra)
3233 2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	507 parseddate = "%s %s" % (parseddate, extra)
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 7948 diff changeset	508 l = [hex(manifest), user, parseddate] + sorted(files) + ["", desc]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	509 text = "\n".join(l)
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6259 diff changeset	510 return self.addrevision(text, transaction, len(self), p1, p2)
18306 06185554e7e3 changelog: add a `branch` method, bypassing changectx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18231 diff changeset	511
20185 7d4219512823 branchmap: cache open/closed branch head information Brodie Rao <brodie@sf.io> parents: 19899 diff changeset	512 def branchinfo(self, rev):
7d4219512823 branchmap: cache open/closed branch head information Brodie Rao <brodie@sf.io> parents: 19899 diff changeset	513 """return the branch name and open/close state of a revision
18306 06185554e7e3 changelog: add a `branch` method, bypassing changectx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18231 diff changeset	514
18308 4e27b06a0fd9 changelog: please check-code and remove tabs Mads Kiilerich <mads@kiilerich.com> parents: 18306 diff changeset	515 This function exists because creating a changectx object
4e27b06a0fd9 changelog: please check-code and remove tabs Mads Kiilerich <mads@kiilerich.com> parents: 18306 diff changeset	516 just to access this is costly."""
20185 7d4219512823 branchmap: cache open/closed branch head information Brodie Rao <brodie@sf.io> parents: 19899 diff changeset	517 extra = self.read(rev)[5]
7d4219512823 branchmap: cache open/closed branch head information Brodie Rao <brodie@sf.io> parents: 19899 diff changeset	518 return encoding.tolocal(extra.get("branch")), 'close' in extra

Mercurial > public > mercurial-scm > hg

annotate mercurial/changelog.py @ 28492:837f1c437d58