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

annotate mercurial/changelog.py @ 17677:5c89e7fa5bc2

clfilter: introduce `filteredrevs` attribute on changelog This changeset allows changelog object to be "filtered". You can assign a set of revision numbers to the `changelog.filteredrevs` attributes. The changelog will then pretends these revision does not exists in this repo. A few methods need to be altered to achieve this behavior: - tip - __iter_ - irevs - hasnode - headrevs For consistency and to help debugging, the following methods are altered too. Tests tend to show it's not necessary to alter them but have them raise proper exception helps to detect bad acces to filtered revisions. - rev - node - linkrev - parentrevs - flags The following methods would also need alteration for consistency purpose but this is non-trivial and not done yet. - nodemap - strip The C version of headrevs is not run if there is any revision to filter. It'll need a proper rewrite later to restore performance.

author	Pierre-Yves David <pierre-yves.david@logilab.fr>
date	Thu, 20 Sep 2012 19:02:47 +0200
parents	e7cfe3587ea4
children	2894d180afa1

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
6211 f89fd07fc51d Expand import * to allow Pyflakes to find problems Joel Rosdahl <joel@rosdahl.net> parents: 5791 diff changeset	8 from node import bin, hex, nullid
7035 9d023ef7b467 forbid username with '\n' at the changelog level Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6259 diff changeset	9 from i18n import _
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7807 diff changeset	10 import util, error, revlog, encoding
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	11
16267 aa6821a7b52f changelog: micro-optimizations to changelog.read() Matt Mackall <mpm@selenic.com> parents: 15661 diff changeset	12 _defaultextra = {'branch': 'default'}
aa6821a7b52f changelog: micro-optimizations to changelog.read() Matt Mackall <mpm@selenic.com> parents: 15661 diff changeset	13
3232 394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	14 def _string_escape(text):
394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	15 """
394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	16 >>> 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	17 >>> 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	18 >>> s
394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	19 'ab\\ncd\\\\\\\\n\\x00ab\\rcd\\\\\\n'
394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	20 >>> res = _string_escape(s)
5745 234e40e636a8 changelog: inline trivial call for extra data unescaping Matt Mackall <mpm@selenic.com> parents: 5744 diff changeset	21 >>> s == res.decode('string_escape')
3232 394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	22 True
394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	23 """
394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	24 # subset of the string_escape codec
394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	25 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	26 return text.replace('\0', '\\0')
394ac87f3b74 [extendedchangelog] encode/decode function Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3077 diff changeset	27
8443 53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	28 def decodeextra(text):
15661 20ae902c43ec changelog: handle decoding of NULs in extra more carefully (issue3156) Matt Mackall <mpm@selenic.com> parents: 14643 diff changeset	29 """
20ae902c43ec changelog: handle decoding of NULs in extra more carefully (issue3156) Matt Mackall <mpm@selenic.com> parents: 14643 diff changeset	30 >>> decodeextra(encodeextra({'foo': 'bar', 'baz': chr(0) + '2'}))
16267 aa6821a7b52f changelog: micro-optimizations to changelog.read() Matt Mackall <mpm@selenic.com> parents: 15661 diff changeset	31 {'foo': 'bar', 'baz': '\\x002', 'branch': 'default'}
15661 20ae902c43ec changelog: handle decoding of NULs in extra more carefully (issue3156) Matt Mackall <mpm@selenic.com> parents: 14643 diff changeset	32 >>> decodeextra(encodeextra({'foo': 'bar', 'baz': chr(92) + chr(0) + '2'}))
16267 aa6821a7b52f changelog: micro-optimizations to changelog.read() Matt Mackall <mpm@selenic.com> parents: 15661 diff changeset	33 {'foo': 'bar', 'baz': '\\\\\\x002', 'branch': 'default'}
15661 20ae902c43ec changelog: handle decoding of NULs in extra more carefully (issue3156) Matt Mackall <mpm@selenic.com> parents: 14643 diff changeset	34 """
16267 aa6821a7b52f changelog: micro-optimizations to changelog.read() Matt Mackall <mpm@selenic.com> parents: 15661 diff changeset	35 extra = _defaultextra.copy()
8443 53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	36 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	37 if l:
15661 20ae902c43ec changelog: handle decoding of NULs in extra more carefully (issue3156) Matt Mackall <mpm@selenic.com> parents: 14643 diff changeset	38 if '\\0' in l:
20ae902c43ec changelog: handle decoding of NULs in extra more carefully (issue3156) Matt Mackall <mpm@selenic.com> parents: 14643 diff changeset	39 # 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	40 l = l.replace('\\\\', '\\\\\n')
20ae902c43ec changelog: handle decoding of NULs in extra more carefully (issue3156) Matt Mackall <mpm@selenic.com> parents: 14643 diff changeset	41 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	42 l = l.replace('\n', '')
8443 53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	43 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	44 extra[k] = v
53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	45 return extra
53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	46
53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	47 def encodeextra(d):
53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	48 # 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	49 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	50 return "\0".join(items)
53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	51
8778 c5f36402daad use new style classes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8644 diff changeset	52 class appender(object):
7807 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7787 diff changeset	53 '''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	54 to delay writes to it'''
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	55 def __init__(self, fp, buf):
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	56 self.data = buf
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	57 self.fp = fp
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	58 self.offset = fp.tell()
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	59 self.size = util.fstat(fp).st_size
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	60
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	61 def end(self):
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	62 return self.size + len("".join(self.data))
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	63 def tell(self):
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	64 return self.offset
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	65 def flush(self):
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	66 pass
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	67 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	68 self.fp.close()
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	69
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	70 def seek(self, offset, whence=0):
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	71 '''virtual file offset spans real file and data'''
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	72 if whence == 0:
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	73 self.offset = offset
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	74 elif whence == 1:
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	75 self.offset += offset
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	76 elif whence == 2:
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	77 self.offset = self.end() + offset
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	78 if self.offset < self.size:
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	79 self.fp.seek(self.offset)
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	80
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	81 def read(self, count=-1):
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	82 '''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	83 ret = ""
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	84 if self.offset < self.size:
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	85 s = self.fp.read(count)
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	86 ret = s
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	87 self.offset += len(s)
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	88 if count > 0:
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	89 count -= len(s)
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	90 if count != 0:
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	91 doff = self.offset - self.size
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	92 self.data.insert(0, "".join(self.data))
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	93 del self.data[1:]
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	94 s = self.data[0][doff:doff + count]
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	95 self.offset += len(s)
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	96 ret += s
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	97 return ret
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	98
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	99 def write(self, s):
5450 c728424d44c6 revlog: fix caching of buffer objects Matt Mackall <mpm@selenic.com> parents: 4963 diff changeset	100 self.data.append(str(s))
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	101 self.offset += len(s)
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	102
9166 e6162b854ed5 changelog: move delayopener outside of class to eliminate reference cycle Matt Mackall <mpm@selenic.com> parents: 9165 diff changeset	103 def delayopener(opener, target, divert, buf):
e6162b854ed5 changelog: move delayopener outside of class to eliminate reference cycle Matt Mackall <mpm@selenic.com> parents: 9165 diff changeset	104 def o(name, mode='r'):
e6162b854ed5 changelog: move delayopener outside of class to eliminate reference cycle Matt Mackall <mpm@selenic.com> parents: 9165 diff changeset	105 if name != target:
e6162b854ed5 changelog: move delayopener outside of class to eliminate reference cycle Matt Mackall <mpm@selenic.com> parents: 9165 diff changeset	106 return opener(name, mode)
e6162b854ed5 changelog: move delayopener outside of class to eliminate reference cycle Matt Mackall <mpm@selenic.com> parents: 9165 diff changeset	107 if divert:
e6162b854ed5 changelog: move delayopener outside of class to eliminate reference cycle Matt Mackall <mpm@selenic.com> parents: 9165 diff changeset	108 return opener(name + ".a", mode.replace('a', 'w'))
e6162b854ed5 changelog: move delayopener outside of class to eliminate reference cycle Matt Mackall <mpm@selenic.com> parents: 9165 diff changeset	109 # otherwise, divert to memory
e6162b854ed5 changelog: move delayopener outside of class to eliminate reference cycle Matt Mackall <mpm@selenic.com> parents: 9165 diff changeset	110 return appender(opener(name, mode), buf)
e6162b854ed5 changelog: move delayopener outside of class to eliminate reference cycle Matt Mackall <mpm@selenic.com> parents: 9165 diff changeset	111 return o
e6162b854ed5 changelog: move delayopener outside of class to eliminate reference cycle Matt Mackall <mpm@selenic.com> parents: 9165 diff changeset	112
7634 14a4337a9b9b revlog: kill from-style imports Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	113 class changelog(revlog.revlog):
4258 b11a2fb59cf5 revlog: simplify revlog version handling Matt Mackall <mpm@selenic.com> parents: 4257 diff changeset	114 def __init__(self, opener):
9165 07f9b2f4a9aa changelog: swap opener to switch delay modes Matt Mackall <mpm@selenic.com> parents: 9164 diff changeset	115 revlog.revlog.__init__(self, opener, "00changelog.i")
14334 85c82ebc96a3 changelog: don't use generaldelta Sune Foldager <cryo@cyanite.org> parents: 14207 diff changeset	116 if self._initempty:
85c82ebc96a3 changelog: don't use generaldelta Sune Foldager <cryo@cyanite.org> parents: 14207 diff changeset	117 # changelogs don't benefit from generaldelta
85c82ebc96a3 changelog: don't use generaldelta Sune Foldager <cryo@cyanite.org> parents: 14207 diff changeset	118 self.version &= ~revlog.REVLOGGENERALDELTA
85c82ebc96a3 changelog: don't use generaldelta Sune Foldager <cryo@cyanite.org> parents: 14207 diff changeset	119 self._generaldelta = False
8644 c2ef478b2efa changelog: make delayopener less intrusive Matt Mackall <mpm@selenic.com> parents: 8499 diff changeset	120 self._realopener = opener
c2ef478b2efa changelog: make delayopener less intrusive Matt Mackall <mpm@selenic.com> parents: 8499 diff changeset	121 self._delayed = False
9163 f193b643d1b1 changelog: _delaycount -> _divert Matt Mackall <mpm@selenic.com> parents: 8778 diff changeset	122 self._divert = False
17677 5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	123 self.filteredrevs = ()
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	124
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	125 def tip(self):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	126 """filtered version of revlog.tip"""
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	127 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	128 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	129 return self.node(i)
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	130
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	131 def __iter__(self):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	132 """filtered version of revlog.__iter__"""
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	133 for i in xrange(len(self)):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	134 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	135 yield i
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	136
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	137 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	138 """filtered version of revlog.revs"""
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	139 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	140 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	141 yield i
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	142
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	143 @util.propertycache
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	144 def nodemap(self):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	145 # XXX need filtering too
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	146 self.rev(self.node(0))
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	147 return self._nodecache
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	148
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	149 def hasnode(self, node):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	150 """filtered version of revlog.hasnode"""
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	151 try:
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	152 i = self.rev(node)
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	153 return i not in self.filteredrevs
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	154 except KeyError:
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	155 return False
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	156
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	157 def headrevs(self):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	158 if self.filteredrevs:
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	159 # XXX we should fix and use the C version
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	160 return self._headrevs()
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	161 return super(changelog, self).headrevs()
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	162
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	163 def strip(self, args, *kwargs):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	164 # 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	165 # 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	166 assert not self.filteredrevs
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	167 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	168
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	169 def rev(self, node):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	170 """filtered version of revlog.rev"""
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	171 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	172 if r in self.filteredrevs:
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	173 raise error.LookupError(node, self.indexfile, _('no node'))
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	174 return r
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	175
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	176 def node(self, rev):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	177 """filtered version of revlog.node"""
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	178 if rev in self.filteredrevs:
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	179 raise IndexError(rev)
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	180 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	181
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	182 def linkrev(self, rev):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	183 """filtered version of revlog.linkrev"""
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	184 if rev in self.filteredrevs:
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	185 raise IndexError(rev)
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	186 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	187
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	188 def parentrevs(self, rev):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	189 """filtered version of revlog.parentrevs"""
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	190 if rev in self.filteredrevs:
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	191 raise IndexError(rev)
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	192 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	193
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	194 def flags(self, rev):
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	195 """filtered version of revlog.flags"""
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	196 if rev in self.filteredrevs:
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	197 raise IndexError(rev)
5c89e7fa5bc2 clfilter: introduce `filteredrevs` attribute on changelog Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17424 diff changeset	198 return super(changelog, self).flags(rev)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	199
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	200 def delayupdate(self):
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	201 "delay visibility of index updates to other readers"
8644 c2ef478b2efa changelog: make delayopener less intrusive Matt Mackall <mpm@selenic.com> parents: 8499 diff changeset	202 self._delayed = True
9163 f193b643d1b1 changelog: _delaycount -> _divert Matt Mackall <mpm@selenic.com> parents: 8778 diff changeset	203 self._divert = (len(self) == 0)
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	204 self._delaybuf = []
9166 e6162b854ed5 changelog: move delayopener outside of class to eliminate reference cycle Matt Mackall <mpm@selenic.com> parents: 9165 diff changeset	205 self.opener = delayopener(self._realopener, self.indexfile,
e6162b854ed5 changelog: move delayopener outside of class to eliminate reference cycle Matt Mackall <mpm@selenic.com> parents: 9165 diff changeset	206 self._divert, self._delaybuf)
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	207
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	208 def finalize(self, tr):
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	209 "finalize index updates"
8644 c2ef478b2efa changelog: make delayopener less intrusive Matt Mackall <mpm@selenic.com> parents: 8499 diff changeset	210 self._delayed = False
9165 07f9b2f4a9aa changelog: swap opener to switch delay modes Matt Mackall <mpm@selenic.com> parents: 9164 diff changeset	211 self.opener = self._realopener
4269 73c918c71300 changelog: optimize delayed updates for clone vs pull Matt Mackall <mpm@selenic.com> parents: 4261 diff changeset	212 # move redirected index data back into place
9164 b0d995b6b0a6 changelog: factor out _delayname Matt Mackall <mpm@selenic.com> parents: 9163 diff changeset	213 if self._divert:
14207 c1cca38818b9 changelog: fixes leaked file handle Zachary Gramana <zgramana@pottsconsultinggroup.com> parents: 14004 diff changeset	214 nfile = self.opener(self.indexfile + ".a")
c1cca38818b9 changelog: fixes leaked file handle Zachary Gramana <zgramana@pottsconsultinggroup.com> parents: 14004 diff changeset	215 n = nfile.name
c1cca38818b9 changelog: fixes leaked file handle Zachary Gramana <zgramana@pottsconsultinggroup.com> parents: 14004 diff changeset	216 nfile.close()
9166 e6162b854ed5 changelog: move delayopener outside of class to eliminate reference cycle Matt Mackall <mpm@selenic.com> parents: 9165 diff changeset	217 util.rename(n, n[:-2])
4269 73c918c71300 changelog: optimize delayed updates for clone vs pull Matt Mackall <mpm@selenic.com> parents: 4261 diff changeset	218 elif self._delaybuf:
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	219 fp = self.opener(self.indexfile, 'a')
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	220 fp.write("".join(self._delaybuf))
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	221 fp.close()
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	222 self._delaybuf = []
4269 73c918c71300 changelog: optimize delayed updates for clone vs pull Matt Mackall <mpm@selenic.com> parents: 4261 diff changeset	223 # split when we're done
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	224 self.checkinlinesize(tr)
cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	225
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	226 def readpending(self, file):
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	227 r = revlog.revlog(self.opener, file)
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	228 self.index = r.index
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	229 self.nodemap = r.nodemap
16619 bc84a1aeaf5a changelog: ensure that nodecache is valid (issue3428) Bryan O'Sullivan <bryano@fb.com> parents: 16267 diff changeset	230 self._nodecache = r._nodecache
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	231 self._chunkcache = r._chunkcache
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	232
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	233 def writepending(self):
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	234 "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	235 if self._delaybuf:
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	236 # make a temporary copy of the index
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	237 fp1 = self._realopener(self.indexfile)
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	238 fp2 = self._realopener(self.indexfile + ".a", "w")
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	239 fp2.write(fp1.read())
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	240 # add pending data
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	241 fp2.write("".join(self._delaybuf))
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	242 fp2.close()
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	243 # switch modes so finalize can simply rename
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	244 self._delaybuf = []
9164 b0d995b6b0a6 changelog: factor out _delayname Matt Mackall <mpm@selenic.com> parents: 9163 diff changeset	245 self._divert = True
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	246
9164 b0d995b6b0a6 changelog: factor out _delayname Matt Mackall <mpm@selenic.com> parents: 9163 diff changeset	247 if self._divert:
7787 b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	248 return True
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	249
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	250 return False
b8d750daadde Introduce HG_PREPEND to solve pretxn races Matt Mackall <mpm@selenic.com> parents: 7634 diff changeset	251
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	252 def checkinlinesize(self, tr, fp=None):
9165 07f9b2f4a9aa changelog: swap opener to switch delay modes Matt Mackall <mpm@selenic.com> parents: 9164 diff changeset	253 if not self._delayed:
07f9b2f4a9aa changelog: swap opener to switch delay modes Matt Mackall <mpm@selenic.com> parents: 9164 diff changeset	254 revlog.revlog.checkinlinesize(self, tr, fp)
4261 cd7b36b7869c restructure changelog file appending Matt Mackall <mpm@selenic.com> parents: 4258 diff changeset	255
5744 9db7fd77417d changelog: remove extract function Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	256 def read(self, node):
3077 ad6aecaf4eed document changelog format Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2859 diff changeset	257 """
ad6aecaf4eed document changelog format Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2859 diff changeset	258 format used:
3233 2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	259 nodeid\n : manifest node in ascii
2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	260 user\n : user, no \n or \r allowed
2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	261 time tz extra\n : date (time is int or float, timezone is int)
17424 e7cfe3587ea4 fix trivial spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 17207 diff changeset	262 : extra is metadata, encoded and separated by '\0'
3233 2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	263 : older versions ignore it
2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	264 files\n\n : files modified by the cset, no \n or \r allowed
2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	265 (.*) : comment (free text, ideally utf-8)
2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	266
2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	267 changelog v0 doesn't use extra
3077 ad6aecaf4eed document changelog format Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2859 diff changeset	268 """
5744 9db7fd77417d changelog: remove extract function Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	269 text = self.revision(node)
37 a8811676c85a Move hex/bin bits to revlog mpm@selenic.com parents: 33 diff changeset	270 if not text:
16267 aa6821a7b52f changelog: micro-optimizations to changelog.read() Matt Mackall <mpm@selenic.com> parents: 15661 diff changeset	271 return (nullid, "", (0, 0), [], "", _defaultextra)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	272 last = text.index("\n\n")
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7807 diff changeset	273 desc = encoding.tolocal(text[last + 2:])
3233 2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	274 l = text[:last].split('\n')
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	275 manifest = bin(l[0])
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7807 diff changeset	276 user = encoding.tolocal(l[1])
3233 2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	277
16267 aa6821a7b52f changelog: micro-optimizations to changelog.read() Matt Mackall <mpm@selenic.com> parents: 15661 diff changeset	278 tdata = l[2].split(' ', 2)
aa6821a7b52f changelog: micro-optimizations to changelog.read() Matt Mackall <mpm@selenic.com> parents: 15661 diff changeset	279 if len(tdata) != 3:
aa6821a7b52f changelog: micro-optimizations to changelog.read() Matt Mackall <mpm@selenic.com> parents: 15661 diff changeset	280 time = float(tdata[0])
3233 2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	281 try:
2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	282 # various tools did silly things with the time zone field.
16267 aa6821a7b52f changelog: micro-optimizations to changelog.read() Matt Mackall <mpm@selenic.com> parents: 15661 diff changeset	283 timezone = int(tdata[1])
14004 97ed99d1f419 eliminate various naked except clauses Idan Kamara <idankk86@gmail.com> parents: 10420 diff changeset	284 except ValueError:
3233 2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	285 timezone = 0
16267 aa6821a7b52f changelog: micro-optimizations to changelog.read() Matt Mackall <mpm@selenic.com> parents: 15661 diff changeset	286 extra = _defaultextra
3233 2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	287 else:
16267 aa6821a7b52f changelog: micro-optimizations to changelog.read() Matt Mackall <mpm@selenic.com> parents: 15661 diff changeset	288 time, timezone = float(tdata[0]), int(tdata[1])
aa6821a7b52f changelog: micro-optimizations to changelog.read() Matt Mackall <mpm@selenic.com> parents: 15661 diff changeset	289 extra = decodeextra(tdata[2])
aa6821a7b52f changelog: micro-optimizations to changelog.read() Matt Mackall <mpm@selenic.com> parents: 15661 diff changeset	290
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	291 files = l[3:]
3233 2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	292 return (manifest, user, (time, timezone), files, desc, extra)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	293
8422 437e06bbd11e changelog: removed bad default arguments in add method Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	294 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	295 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	296 # 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	297 # 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	298 # 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	299 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	300
7035 9d023ef7b467 forbid username with '\n' at the changelog level Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6259 diff changeset	301 user = user.strip()
8424 c5b3d3e30de7 changelog: refuse to add revisions with empty usernames Martin Geisler <mg@lazybytes.net> parents: 7807 diff changeset	302 # 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	303 # 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	304 # 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	305 if not user:
c5b3d3e30de7 changelog: refuse to add revisions with empty usernames Martin Geisler <mg@lazybytes.net> parents: 7807 diff changeset	306 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	307 if "\n" in user:
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7470 diff changeset	308 raise error.RevlogError(_("username %s contains a newline")
08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7470 diff changeset	309 % repr(user))
8499 fb9b83df45f3 commit: move description trimming into changelog Matt Mackall <mpm@selenic.com> parents: 8443 diff changeset	310
fb9b83df45f3 commit: move description trimming into changelog Matt Mackall <mpm@selenic.com> parents: 8443 diff changeset	311 # strip trailing whitespace and leading and trailing empty lines
fb9b83df45f3 commit: move description trimming into changelog Matt Mackall <mpm@selenic.com> parents: 8443 diff changeset	312 desc = '\n'.join([l.rstrip() for l in desc.splitlines()]).strip('\n')
fb9b83df45f3 commit: move description trimming into changelog Matt Mackall <mpm@selenic.com> parents: 8443 diff changeset	313
1195 f92af8d53330 Validate user input of dates when adding a changelog entry. Bryan O'Sullivan <bos@serpentine.com> parents: 1095 diff changeset	314 if date:
2523 4ab59a3acd16 validate the resulting date in parsedate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2522 diff changeset	315 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	316 else:
2522 85f796baab10 Allow the use of human readable dates (issue 251) Jose M. Prieto <jmprieto@gmx.net> parents: 2142 diff changeset	317 parseddate = "%d %d" % util.makedate()
10417 58e040c51231 branch: avoid using reserved tag names Wagner Bruna <wbruna@softwareexpress.com.br> parents: 10263 diff changeset	318 if extra:
58e040c51231 branch: avoid using reserved tag names Wagner Bruna <wbruna@softwareexpress.com.br> parents: 10263 diff changeset	319 branch = extra.get("branch")
58e040c51231 branch: avoid using reserved tag names Wagner Bruna <wbruna@softwareexpress.com.br> parents: 10263 diff changeset	320 if branch in ("default", ""):
58e040c51231 branch: avoid using reserved tag names Wagner Bruna <wbruna@softwareexpress.com.br> parents: 10263 diff changeset	321 del extra["branch"]
58e040c51231 branch: avoid using reserved tag names Wagner Bruna <wbruna@softwareexpress.com.br> parents: 10263 diff changeset	322 elif branch in (".", "null", "tip"):
58e040c51231 branch: avoid using reserved tag names Wagner Bruna <wbruna@softwareexpress.com.br> parents: 10263 diff changeset	323 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	324 % branch)
3233 2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	325 if extra:
8443 53ff4a5af284 changelog: turn {de,en}code_extra methods into functions Martin Geisler <mg@lazybytes.net> parents: 8442 diff changeset	326 extra = encodeextra(extra)
3233 2f35961854fb [extendedchangelog] add extra metadata in the changelog entry Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3232 diff changeset	327 parseddate = "%s %s" % (parseddate, extra)
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 7948 diff changeset	328 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	329 text = "\n".join(l)
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6259 diff changeset	330 return self.addrevision(text, transaction, len(self), p1, p2)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/changelog.py @ 17677:5c89e7fa5bc2