##// END OF EJS Templates
py3: convert content-type to bytes...
py3: convert content-type to bytes This fixes the exception: TypeError: %b requires a bytes-like object, or an object that implements __bytes__, not 'str' On the line: ui.debug('Content-Type: %s\n' % content_type) And it prevents additional exceptions that use the content_type variable later. Differential Revision: https://phab.mercurial-scm.org/D2136

File last commit:

r35992:9ba1d0c7 default
r36052:95791b27 default
Show More
changelog.py
565 lines | 18.4 KiB | text/x-python | PythonLexer
mpm@selenic.com
changelog: adjust imports, comment
r1095 # changelog.py - changelog class for mercurial
mpm@selenic.com
Break apart hg.py...
r1089 #
Thomas Arendsen Hein
Updated copyright notices and add "and others" to "hg version"
r4635 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
mpm@selenic.com
Break apart hg.py...
r1089 #
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
mpm@selenic.com
Break apart hg.py...
r1089
Gregory Szorc
changelog: use absolute_import
r25922 from __future__ import absolute_import
from .i18n import _
from .node import (
bin,
hex,
nullid,
)
Siddharth Agarwal
changelog: use attrs instead of namedtuple...
r34399 from .thirdparty import (
attr,
)
Gregory Szorc
changelog: use absolute_import
r25922
from . import (
encoding,
error,
revlog,
util,
)
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
changelog: micro-optimizations to changelog.read()
r16267 _defaultextra = {'branch': 'default'}
Benoit Boissinot
[extendedchangelog] encode/decode function...
r3232 def _string_escape(text):
"""
Yuya Nishihara
doctest: replace chr() with pycompat.bytechr()
r34135 >>> from .pycompat import bytechr as chr
Yuya Nishihara
doctest: bulk-replace string literals with b'' for Python 3...
r34133 >>> d = {b'nl': chr(10), b'bs': chr(92), b'cr': chr(13), b'nul': chr(0)}
>>> s = b"ab%(nl)scd%(bs)s%(bs)sn%(nul)sab%(cr)scd%(bs)s%(nl)s" % d
Benoit Boissinot
[extendedchangelog] encode/decode function...
r3232 >>> s
'ab\\ncd\\\\\\\\n\\x00ab\\rcd\\\\\\n'
>>> res = _string_escape(s)
Yuya Nishihara
util: wrap s.decode('string_escape') calls for future py3 compatibility
r31484 >>> s == util.unescapestr(res)
Benoit Boissinot
[extendedchangelog] encode/decode function...
r3232 True
"""
# subset of the string_escape codec
text = text.replace('\\', '\\\\').replace('\n', '\\n').replace('\r', '\\r')
return text.replace('\0', '\\0')
Martin Geisler
changelog: turn {de,en}code_extra methods into functions...
r8443 def decodeextra(text):
Matt Mackall
changelog: handle decoding of NULs in extra more carefully (issue3156)...
r15661 """
Yuya Nishihara
doctest: replace chr() with pycompat.bytechr()
r34135 >>> from .pycompat import bytechr as chr
Yuya Nishihara
doctest: bulk-replace string literals with b'' for Python 3...
r34133 >>> sorted(decodeextra(encodeextra({b'foo': b'bar', b'baz': chr(0) + b'2'})
Yuya Nishihara
doctest: replace .iteritems() with .items()
r34134 ... ).items())
Mads Kiilerich
tests: fix doctest stability over Python versions...
r18379 [('baz', '\\x002'), ('branch', 'default'), ('foo', 'bar')]
Yuya Nishihara
doctest: bulk-replace string literals with b'' for Python 3...
r34133 >>> sorted(decodeextra(encodeextra({b'foo': b'bar',
... b'baz': chr(92) + chr(0) + b'2'})
Yuya Nishihara
doctest: replace .iteritems() with .items()
r34134 ... ).items())
Mads Kiilerich
tests: fix doctest stability over Python versions...
r18379 [('baz', '\\\\\\x002'), ('branch', 'default'), ('foo', 'bar')]
Matt Mackall
changelog: handle decoding of NULs in extra more carefully (issue3156)...
r15661 """
Matt Mackall
changelog: micro-optimizations to changelog.read()
r16267 extra = _defaultextra.copy()
Martin Geisler
changelog: turn {de,en}code_extra methods into functions...
r8443 for l in text.split('\0'):
if l:
Matt Mackall
changelog: handle decoding of NULs in extra more carefully (issue3156)...
r15661 if '\\0' in l:
# fix up \0 without getting into trouble with \\0
l = l.replace('\\\\', '\\\\\n')
l = l.replace('\\0', '\0')
l = l.replace('\n', '')
Yuya Nishihara
util: wrap s.decode('string_escape') calls for future py3 compatibility
r31484 k, v = util.unescapestr(l).split(':', 1)
Martin Geisler
changelog: turn {de,en}code_extra methods into functions...
r8443 extra[k] = v
return extra
def encodeextra(d):
# keys must be sorted to produce a deterministic changelog entry
items = [_string_escape('%s:%s' % (k, d[k])) for k in sorted(d)]
return "\0".join(items)
Pierre-Yves David
changelog: extract description cleaning logic in a dedicated function...
r17810 def stripdesc(desc):
"""strip trailing whitespace and leading and trailing empty lines"""
return '\n'.join([l.rstrip() for l in desc.splitlines()]).strip('\n')
Benoit Boissinot
use new style classes
r8778 class appender(object):
timeless
help: miscellaneous language fixes
r7807 '''the changelog index must be updated last on disk, so we use this class
Matt Mackall
restructure changelog file appending...
r4261 to delay writes to it'''
FUJIWARA Katsunori
changelog: use "vfs.fstat()" instead of "util.fstat()"...
r19899 def __init__(self, vfs, name, mode, buf):
Matt Mackall
restructure changelog file appending...
r4261 self.data = buf
FUJIWARA Katsunori
changelog: use "vfs.fstat()" instead of "util.fstat()"...
r19899 fp = vfs(name, mode)
Matt Mackall
restructure changelog file appending...
r4261 self.fp = fp
self.offset = fp.tell()
FUJIWARA Katsunori
changelog: use "vfs.fstat()" instead of "util.fstat()"...
r19899 self.size = vfs.fstat(fp).st_size
Durham Goode
changelog: keep track of file end in appender (issue5444)...
r30596 self._end = self.size
Matt Mackall
restructure changelog file appending...
r4261
def end(self):
Durham Goode
changelog: keep track of file end in appender (issue5444)...
r30596 return self._end
Matt Mackall
restructure changelog file appending...
r4261 def tell(self):
return self.offset
def flush(self):
pass
Boris Feld
changelog: add the missing 'closed' property on 'appender' object...
r35981
@property
def closed(self):
return self.fp.closed
Matt Mackall
restructure changelog file appending...
r4261 def close(self):
Benoit Boissinot
fix bogus close spotted by pychecker (no close() in global scope)
r4961 self.fp.close()
Matt Mackall
restructure changelog file appending...
r4261
def seek(self, offset, whence=0):
'''virtual file offset spans real file and data'''
if whence == 0:
self.offset = offset
elif whence == 1:
self.offset += offset
elif whence == 2:
self.offset = self.end() + offset
if self.offset < self.size:
self.fp.seek(self.offset)
def read(self, count=-1):
'''only trick here is reads that span real file and data'''
ret = ""
if self.offset < self.size:
s = self.fp.read(count)
ret = s
self.offset += len(s)
if count > 0:
count -= len(s)
if count != 0:
doff = self.offset - self.size
self.data.insert(0, "".join(self.data))
del self.data[1:]
Matt Mackall
many, many trivial check-code fixups
r10282 s = self.data[0][doff:doff + count]
Matt Mackall
restructure changelog file appending...
r4261 self.offset += len(s)
ret += s
return ret
def write(self, s):
Yuya Nishihara
py3: use bytes() to cast to immutable bytes in changelog.appender.write()
r31642 self.data.append(bytes(s))
Matt Mackall
restructure changelog file appending...
r4261 self.offset += len(s)
Durham Goode
changelog: keep track of file end in appender (issue5444)...
r30596 self._end += len(s)
Matt Mackall
restructure changelog file appending...
r4261
Boris Feld
changelog: implement context manager method for 'appender' object...
r35980 def __enter__(self):
self.fp.__enter__()
return self
def __exit__(self, *args):
return self.fp.__exit__(*args)
Pierre-Yves David
changelog: rework the delayupdate mechanism...
r23201 def _divertopener(opener, target):
"""build an opener that writes in 'target.a' instead of 'target'"""
FUJIWARA Katsunori
revlog: specify checkambig at writing to avoid file stat ambiguity...
r29997 def _divert(name, mode='r', checkambig=False):
Matt Mackall
changelog: move delayopener outside of class to eliminate reference cycle
r9166 if name != target:
return opener(name, mode)
Pierre-Yves David
changelog: rework the delayupdate mechanism...
r23201 return opener(name + ".a", mode)
return _divert
def _delayopener(opener, target, buf):
"""build an opener that stores chunks in 'buf' instead of 'target'"""
FUJIWARA Katsunori
revlog: specify checkambig at writing to avoid file stat ambiguity...
r29997 def _delay(name, mode='r', checkambig=False):
Pierre-Yves David
changelog: rework the delayupdate mechanism...
r23201 if name != target:
return opener(name, mode)
FUJIWARA Katsunori
changelog: use "vfs.fstat()" instead of "util.fstat()"...
r19899 return appender(opener, name, mode, buf)
Pierre-Yves David
changelog: rework the delayupdate mechanism...
r23201 return _delay
Matt Mackall
changelog: move delayopener outside of class to eliminate reference cycle
r9166
Siddharth Agarwal
changelog: use attrs instead of namedtuple...
r34399 @attr.s
class _changelogrevision(object):
# Extensions might modify _defaultextra, so let the constructor below pass
# it in
extra = attr.ib()
manifest = attr.ib(default=nullid)
user = attr.ib(default='')
date = attr.ib(default=(0, 0))
Gregory Szorc
changelog: use a Factory for default value for files...
r34442 files = attr.ib(default=attr.Factory(list))
Siddharth Agarwal
changelog: use attrs instead of namedtuple...
r34399 description = attr.ib(default='')
Gregory Szorc
changelog: add class to represent parsed changelog revisions...
r28487
class changelogrevision(object):
"""Holds results of a parsed changelog revision.
Changelog revisions consist of multiple pieces of data, including
the manifest node, user, and date. This object exposes a view into
the parsed object.
"""
__slots__ = (
Pulkit Goyal
py3: use unicode literals in changelog.py...
r29696 u'_offsets',
u'_text',
Gregory Szorc
changelog: add class to represent parsed changelog revisions...
r28487 )
def __new__(cls, text):
if not text:
Siddharth Agarwal
changelog: use attrs instead of namedtuple...
r34399 return _changelogrevision(extra=_defaultextra)
Gregory Szorc
changelog: add class to represent parsed changelog revisions...
r28487
self = super(changelogrevision, cls).__new__(cls)
# We could return here and implement the following as an __init__.
# But doing it here is equivalent and saves an extra function call.
# format used:
# nodeid\n : manifest node in ascii
# user\n : user, no \n or \r allowed
# time tz extra\n : date (time is int or float, timezone is int)
# : extra is metadata, encoded and separated by '\0'
# : older versions ignore it
# files\n\n : files modified by the cset, no \n or \r allowed
# (.*) : comment (free text, ideally utf-8)
#
# changelog v0 doesn't use extra
Gregory Szorc
changelog: lazily parse manifest node...
r28490 nl1 = text.index('\n')
Gregory Szorc
changelog: lazily parse user...
r28491 nl2 = text.index('\n', nl1 + 1)
Gregory Szorc
changelog: lazily parse date/extra field...
r28492 nl3 = text.index('\n', nl2 + 1)
Gregory Szorc
changelog: add class to represent parsed changelog revisions...
r28487
Gregory Szorc
changelog: lazily parse files...
r28493 # The list of files may be empty. Which means nl3 is the first of the
# double newline that precedes the description.
Pulkit Goyal
py3: slice over bytes to prevent getting ascii values
r32153 if text[nl3 + 1:nl3 + 2] == '\n':
Gregory Szorc
changelog: avoid slicing raw data until needed...
r28495 doublenl = nl3
Gregory Szorc
changelog: lazily parse files...
r28493 else:
Gregory Szorc
changelog: parse description last...
r28494 doublenl = text.index('\n\n', nl3 + 1)
Gregory Szorc
changelog: avoid slicing raw data until needed...
r28495
self._offsets = (nl1, nl2, nl3, doublenl)
self._text = text
Gregory Szorc
changelog: add class to represent parsed changelog revisions...
r28487
return self
Gregory Szorc
changelog: lazily parse description...
r28489 @property
Gregory Szorc
changelog: lazily parse manifest node...
r28490 def manifest(self):
Gregory Szorc
changelog: avoid slicing raw data until needed...
r28495 return bin(self._text[0:self._offsets[0]])
Gregory Szorc
changelog: lazily parse manifest node...
r28490
@property
Gregory Szorc
changelog: lazily parse user...
r28491 def user(self):
Gregory Szorc
changelog: avoid slicing raw data until needed...
r28495 off = self._offsets
return encoding.tolocal(self._text[off[0] + 1:off[1]])
Gregory Szorc
changelog: lazily parse user...
r28491
@property
Gregory Szorc
changelog: lazily parse date/extra field...
r28492 def _rawdate(self):
Gregory Szorc
changelog: avoid slicing raw data until needed...
r28495 off = self._offsets
dateextra = self._text[off[1] + 1:off[2]]
return dateextra.split(' ', 2)[0:2]
Gregory Szorc
changelog: lazily parse date/extra field...
r28492
@property
def _rawextra(self):
Gregory Szorc
changelog: avoid slicing raw data until needed...
r28495 off = self._offsets
dateextra = self._text[off[1] + 1:off[2]]
fields = dateextra.split(' ', 2)
Gregory Szorc
changelog: lazily parse date/extra field...
r28492 if len(fields) != 3:
return None
return fields[2]
@property
def date(self):
raw = self._rawdate
time = float(raw[0])
# Various tools did silly things with the timezone.
try:
timezone = int(raw[1])
except ValueError:
timezone = 0
return time, timezone
@property
def extra(self):
raw = self._rawextra
if raw is None:
return _defaultextra
return decodeextra(raw)
@property
Gregory Szorc
changelog: lazily parse files...
r28493 def files(self):
Gregory Szorc
changelog: avoid slicing raw data until needed...
r28495 off = self._offsets
if off[2] == off[3]:
Gregory Szorc
changelog: lazily parse files...
r28493 return []
Gregory Szorc
changelog: avoid slicing raw data until needed...
r28495 return self._text[off[2] + 1:off[3]].split('\n')
Gregory Szorc
changelog: lazily parse files...
r28493
@property
Gregory Szorc
changelog: lazily parse description...
r28489 def description(self):
Gregory Szorc
changelog: avoid slicing raw data until needed...
r28495 return encoding.tolocal(self._text[self._offsets[3] + 2:])
Gregory Szorc
changelog: lazily parse description...
r28489
Matt Mackall
revlog: kill from-style imports...
r7634 class changelog(revlog.revlog):
Gregory Szorc
changelog: load pending file directly...
r32292 def __init__(self, opener, trypending=False):
"""Load a changelog revlog using an opener.
If ``trypending`` is true, we attempt to load the index from a
``00changelog.i.a`` file instead of the default ``00changelog.i``.
The ``00changelog.i.a`` file contains index (and possibly inline
revision) data for a transaction that hasn't been finalized yet.
It exists in a separate file to facilitate readers (such as
hooks processes) accessing data before a transaction is finalized.
"""
if trypending and opener.exists('00changelog.i.a'):
indexfile = '00changelog.i.a'
else:
indexfile = '00changelog.i'
Jun Wu
changelog: make sure datafile is 00changelog.d (API)...
r32307 datafile = '00changelog.d'
revlog.revlog.__init__(self, opener, indexfile, datafile=datafile,
Mark Thomas
revlog: add option to mmap revlog index...
r34297 checkambig=True, mmaplargeindex=True)
Gregory Szorc
changelog: load pending file directly...
r32292
Sune Foldager
changelog: don't use generaldelta
r14334 if self._initempty:
# changelogs don't benefit from generaldelta
Gregory Szorc
revlog: rename constants (API)...
r32316 self.version &= ~revlog.FLAG_GENERALDELTA
Sune Foldager
changelog: don't use generaldelta
r14334 self._generaldelta = False
Gregory Szorc
changelog: disable delta chains...
r30155
# Delta chains for changelogs tend to be very small because entries
# tend to be small and don't delta well with each. So disable delta
# chains.
Pierre-Yves David
revlog: make 'storedeltachains' a "public" attribute...
r30210 self.storedeltachains = False
Gregory Szorc
changelog: disable delta chains...
r30155
Matt Mackall
changelog: make delayopener less intrusive
r8644 self._realopener = opener
self._delayed = False
Pierre-Yves David
changelog: rework the delayupdate mechanism...
r23201 self._delaybuf = None
Matt Mackall
changelog: _delaycount -> _divert
r9163 self._divert = False
Pierre-Yves David
clfilter: use empty frozenset intead of empty tuple...
r18231 self.filteredrevs = frozenset()
Pierre-Yves David
clfilter: introduce `filteredrevs` attribute on changelog...
r17677
Boris Feld
changelog: introduce a 'tiprev' method...
r35689 def tiprev(self):
for i in xrange(len(self) -1, -2, -1):
if i not in self.filteredrevs:
return i
Pierre-Yves David
clfilter: introduce `filteredrevs` attribute on changelog...
r17677 def tip(self):
"""filtered version of revlog.tip"""
Boris Feld
changelog: use 'tiprev()' in 'tip()'...
r35690 return self.node(self.tiprev())
Pierre-Yves David
clfilter: introduce `filteredrevs` attribute on changelog...
r17677
Yuya Nishihara
revlog: add __contains__ for fast membership test...
r24030 def __contains__(self, rev):
"""filtered version of revlog.__contains__"""
Yuya Nishihara
changelog: inline revlog.__contains__ in case it is used in hot loop...
r24662 return (0 <= rev < len(self)
Yuya Nishihara
revlog: add __contains__ for fast membership test...
r24030 and rev not in self.filteredrevs)
Pierre-Yves David
clfilter: introduce `filteredrevs` attribute on changelog...
r17677 def __iter__(self):
"""filtered version of revlog.__iter__"""
Durham Goode
commit: increase perf by avoiding unnecessary filteredrevs check...
r17951 if len(self.filteredrevs) == 0:
return revlog.revlog.__iter__(self)
def filterediter():
for i in xrange(len(self)):
if i not in self.filteredrevs:
yield i
return filterediter()
Pierre-Yves David
clfilter: introduce `filteredrevs` attribute on changelog...
r17677
def revs(self, start=0, stop=None):
"""filtered version of revlog.revs"""
for i in super(changelog, self).revs(start, stop):
if i not in self.filteredrevs:
yield i
@util.propertycache
def nodemap(self):
# XXX need filtering too
self.rev(self.node(0))
return self._nodecache
Laurent Charignon
changelog: add way to call the reachableroots C implementation...
r26005 def reachableroots(self, minroot, heads, roots, includepath=False):
Yuya Nishihara
reachableroots: construct and sort baseset in revset module...
r26094 return self.index.reachableroots2(minroot, heads, roots, includepath)
Laurent Charignon
changelog: add way to call the reachableroots C implementation...
r26005
Pierre-Yves David
clfilter: introduce `filteredrevs` attribute on changelog...
r17677 def headrevs(self):
if self.filteredrevs:
Durham Goode
obsolete: use C code for headrevs calculation...
r22484 try:
Mads Kiilerich
changelog: use headrevsfiltered...
r23088 return self.index.headrevsfiltered(self.filteredrevs)
# AttributeError covers non-c-extension environments and
# old c extensions without filter handling.
except AttributeError:
Durham Goode
obsolete: use C code for headrevs calculation...
r22484 return self._headrevs()
Pierre-Yves David
clfilter: introduce `filteredrevs` attribute on changelog...
r17677 return super(changelog, self).headrevs()
def strip(self, *args, **kwargs):
# XXX make something better than assert
# We can't expect proper strip behavior if we are filtered.
assert not self.filteredrevs
super(changelog, self).strip(*args, **kwargs)
def rev(self, node):
"""filtered version of revlog.rev"""
r = super(changelog, self).rev(node)
if r in self.filteredrevs:
Pierre-Yves David
repoview: add a FilteredLookupError class...
r23015 raise error.FilteredLookupError(hex(node), self.indexfile,
_('filtered node'))
Pierre-Yves David
clfilter: introduce `filteredrevs` attribute on changelog...
r17677 return r
def node(self, rev):
"""filtered version of revlog.node"""
if rev in self.filteredrevs:
Pierre-Yves David
repoview: add a FilteredIndexError class...
r23014 raise error.FilteredIndexError(rev)
Pierre-Yves David
clfilter: introduce `filteredrevs` attribute on changelog...
r17677 return super(changelog, self).node(rev)
def linkrev(self, rev):
"""filtered version of revlog.linkrev"""
if rev in self.filteredrevs:
Pierre-Yves David
repoview: add a FilteredIndexError class...
r23014 raise error.FilteredIndexError(rev)
Pierre-Yves David
clfilter: introduce `filteredrevs` attribute on changelog...
r17677 return super(changelog, self).linkrev(rev)
def parentrevs(self, rev):
"""filtered version of revlog.parentrevs"""
if rev in self.filteredrevs:
Pierre-Yves David
repoview: add a FilteredIndexError class...
r23014 raise error.FilteredIndexError(rev)
Pierre-Yves David
clfilter: introduce `filteredrevs` attribute on changelog...
r17677 return super(changelog, self).parentrevs(rev)
def flags(self, rev):
"""filtered version of revlog.flags"""
if rev in self.filteredrevs:
Pierre-Yves David
repoview: add a FilteredIndexError class...
r23014 raise error.FilteredIndexError(rev)
Pierre-Yves David
clfilter: introduce `filteredrevs` attribute on changelog...
r17677 return super(changelog, self).flags(rev)
mpm@selenic.com
Break apart hg.py...
r1089
Pierre-Yves David
changelog: handle writepending in the transaction...
r23203 def delayupdate(self, tr):
Matt Mackall
restructure changelog file appending...
r4261 "delay visibility of index updates to other readers"
Pierre-Yves David
changelog: rework the delayupdate mechanism...
r23201
if not self._delayed:
if len(self) == 0:
self._divert = True
if self._realopener.exists(self.indexfile + '.a'):
self._realopener.unlink(self.indexfile + '.a')
self.opener = _divertopener(self._realopener, self.indexfile)
else:
self._delaybuf = []
self.opener = _delayopener(self._realopener, self.indexfile,
self._delaybuf)
Matt Mackall
changelog: make delayopener less intrusive
r8644 self._delayed = True
Pierre-Yves David
changelog: handle writepending in the transaction...
r23203 tr.addpending('cl-%i' % id(self), self._writepending)
Pierre-Yves David
transaction: pass the transaction to 'finalize' callback...
r23281 tr.addfinalize('cl-%i' % id(self), self._finalize)
Matt Mackall
restructure changelog file appending...
r4261
Pierre-Yves David
changelog: rely on transaction for finalization...
r23205 def _finalize(self, tr):
Matt Mackall
restructure changelog file appending...
r4261 "finalize index updates"
Matt Mackall
changelog: make delayopener less intrusive
r8644 self._delayed = False
Matt Mackall
changelog: swap opener to switch delay modes
r9165 self.opener = self._realopener
Matt Mackall
changelog: optimize delayed updates for clone vs pull...
r4269 # move redirected index data back into place
Matt Mackall
changelog: factor out _delayname
r9164 if self._divert:
Pierre-Yves David
changelog: rework the delayupdate mechanism...
r23201 assert not self._delaybuf
FUJIWARA Katsunori
changelog: use "vfs.rename()" instead of "util.rename()"
r19898 tmpname = self.indexfile + ".a"
nfile = self.opener.open(tmpname)
Zachary Gramana
changelog: fixes leaked file handle
r14207 nfile.close()
FUJIWARA Katsunori
changelog: specify checkambig=True to avoid ambiguity around truncation...
r29999 self.opener.rename(tmpname, self.indexfile, checkambig=True)
Matt Mackall
changelog: optimize delayed updates for clone vs pull...
r4269 elif self._delaybuf:
FUJIWARA Katsunori
changelog: specify checkambig=True to avoid ambiguity around truncation...
r29999 fp = self.opener(self.indexfile, 'a', checkambig=True)
Matt Mackall
restructure changelog file appending...
r4261 fp.write("".join(self._delaybuf))
fp.close()
Pierre-Yves David
changelog: rework the delayupdate mechanism...
r23201 self._delaybuf = None
self._divert = False
Matt Mackall
changelog: optimize delayed updates for clone vs pull...
r4269 # split when we're done
Boris Feld
revlog: rename 'self.checkinlinesize' into '_enforceinlinesize'...
r35992 self._enforceinlinesize(tr)
Matt Mackall
restructure changelog file appending...
r4261
Pierre-Yves David
transaction: pass the transaction to 'pending' callback...
r23280 def _writepending(self, tr):
Matt Mackall
Introduce HG_PREPEND to solve pretxn races...
r7787 "create a file containing the unfinalized state for pretxnchangegroup"
if self._delaybuf:
# make a temporary copy of the index
fp1 = self._realopener(self.indexfile)
Pierre-Yves David
changelog: register changelog.i.a as a temporary file...
r23292 pendingfilename = self.indexfile + ".a"
# register as a temp file to ensure cleanup on failure
tr.registertmp(pendingfilename)
# write existing data
fp2 = self._realopener(pendingfilename, "w")
Matt Mackall
Introduce HG_PREPEND to solve pretxn races...
r7787 fp2.write(fp1.read())
# add pending data
fp2.write("".join(self._delaybuf))
fp2.close()
# switch modes so finalize can simply rename
Pierre-Yves David
changelog: rework the delayupdate mechanism...
r23201 self._delaybuf = None
Matt Mackall
changelog: factor out _delayname
r9164 self._divert = True
Pierre-Yves David
changelog: rework the delayupdate mechanism...
r23201 self.opener = _divertopener(self._realopener, self.indexfile)
Matt Mackall
Introduce HG_PREPEND to solve pretxn races...
r7787
Matt Mackall
changelog: factor out _delayname
r9164 if self._divert:
Matt Mackall
Introduce HG_PREPEND to solve pretxn races...
r7787 return True
return False
Boris Feld
revlog: rename 'self.checkinlinesize' into '_enforceinlinesize'...
r35992 def _enforceinlinesize(self, tr, fp=None):
Matt Mackall
changelog: swap opener to switch delay modes
r9165 if not self._delayed:
Boris Feld
revlog: rename 'self.checkinlinesize' into '_enforceinlinesize'...
r35992 revlog.revlog._enforceinlinesize(self, tr, fp)
Matt Mackall
restructure changelog file appending...
r4261
Matt Mackall
changelog: remove extract function
r5744 def read(self, node):
Gregory Szorc
changelog: add class to represent parsed changelog revisions...
r28487 """Obtain data from a parsed changelog revision.
Returns a 6-tuple of:
Benoit Boissinot
[extendedchangelog] add extra metadata in the changelog entry...
r3233
Gregory Szorc
changelog: add class to represent parsed changelog revisions...
r28487 - manifest node in binary
- author/user as a localstr
- date as a 2-tuple of (time, timezone)
- list of files
- commit message as a localstr
- dict of extra metadata
Unless you need to access all fields, consider calling
``changelogrevision`` instead, as it is faster for partial object
access.
Benoit Boissinot
document changelog format
r3077 """
Gregory Szorc
changelog: add class to represent parsed changelog revisions...
r28487 c = changelogrevision(self.revision(node))
return (
c.manifest,
c.user,
c.date,
c.files,
c.description,
c.extra
)
Benoit Boissinot
[extendedchangelog] add extra metadata in the changelog entry...
r3233
Gregory Szorc
changelog: add class to represent parsed changelog revisions...
r28487 def changelogrevision(self, nodeorrev):
"""Obtain a ``changelogrevision`` for a node or revision."""
return changelogrevision(self.revision(nodeorrev))
mpm@selenic.com
Break apart hg.py...
r1089
Laurent Charignon
changelog: add a new method to get files modified by a changeset...
r27439 def readfiles(self, node):
"""
short version of read that only returns the files modified by the cset
"""
text = self.revision(node)
if not text:
return []
last = text.index("\n\n")
l = text[:last].split('\n')
return l[3:]
Martin Geisler
changelog: removed bad default arguments in add method...
r8422 def add(self, manifest, files, desc, transaction, p1, p2,
Benoit Boissinot
changelog: do not use a mutable default value
r9677 user, date=None, extra=None):
Martin Geisler
changelog: convert user and desc from local encoding early...
r14379 # Convert to UTF-8 encoded bytestrings as the very first
# thing: calling any method on a localstr object will turn it
# into a str object and the cached UTF-8 string is thus lost.
user, desc = encoding.fromlocal(user), encoding.fromlocal(desc)
Benoit Boissinot
forbid username with '\n' at the changelog level...
r7035 user = user.strip()
Martin Geisler
changelog: refuse to add revisions with empty usernames...
r8424 # An empty username or a username with a "\n" will make the
# revision text contain two "\n\n" sequences -> corrupt
# repository since read cannot unpack the revision.
if not user:
raise error.RevlogError(_("empty username"))
Benoit Boissinot
forbid username with '\n' at the changelog level...
r7035 if "\n" in user:
Matt Mackall
errors: move revlog errors...
r7633 raise error.RevlogError(_("username %s contains a newline")
% repr(user))
Matt Mackall
commit: move description trimming into changelog
r8499
Pierre-Yves David
changelog: extract description cleaning logic in a dedicated function...
r17810 desc = stripdesc(desc)
Matt Mackall
commit: move description trimming into changelog
r8499
Bryan O'Sullivan
Validate user input of dates when adding a changelog entry.
r1195 if date:
Benoit Boissinot
validate the resulting date in parsedate
r2523 parseddate = "%d %d" % util.parsedate(date)
Bryan O'Sullivan
Validate user input of dates when adding a changelog entry.
r1195 else:
Jose M. Prieto
Allow the use of human readable dates (issue 251)
r2522 parseddate = "%d %d" % util.makedate()
Wagner Bruna
branch: avoid using reserved tag names...
r10417 if extra:
branch = extra.get("branch")
if branch in ("default", ""):
del extra["branch"]
elif branch in (".", "null", "tip"):
raise error.RevlogError(_('the name \'%s\' is reserved')
% branch)
Benoit Boissinot
[extendedchangelog] add extra metadata in the changelog entry...
r3233 if extra:
Martin Geisler
changelog: turn {de,en}code_extra methods into functions...
r8443 extra = encodeextra(extra)
Benoit Boissinot
[extendedchangelog] add extra metadata in the changelog entry...
r3233 parseddate = "%s %s" % (parseddate, extra)
Matt Mackall
replace util.sort with sorted built-in...
r8209 l = [hex(manifest), user, parseddate] + sorted(files) + ["", desc]
mpm@selenic.com
Break apart hg.py...
r1089 text = "\n".join(l)
Matt Mackall
add __len__ and __iter__ methods to repo and revlog
r6750 return self.addrevision(text, transaction, len(self), p1, p2)
Pierre-Yves David
changelog: add a `branch` method, bypassing changectx...
r18306
Brodie Rao
branchmap: cache open/closed branch head information...
r20185 def branchinfo(self, rev):
"""return the branch name and open/close state of a revision
Pierre-Yves David
changelog: add a `branch` method, bypassing changectx...
r18306
Mads Kiilerich
changelog: please check-code and remove tabs...
r18308 This function exists because creating a changectx object
just to access this is costly."""
Brodie Rao
branchmap: cache open/closed branch head information...
r20185 extra = self.read(rev)[5]
return encoding.tolocal(extra.get("branch")), 'close' in extra
Pierre-Yves David
transaction: track newly introduced revisions...
r32262
def _addrevision(self, node, rawtext, transaction, *args, **kwargs):
# overlay over the standard revlog._addrevision to track the new
# revision on the transaction.
rev = len(self)
node = super(changelog, self)._addrevision(node, rawtext, transaction,
*args, **kwargs)
revs = transaction.changes.get('revs')
if revs is not None:
Joerg Sonnenberger
transaction: build changes['revs'] as range instead of a set...
r35309 if revs:
assert revs[-1] + 1 == rev
revs = xrange(revs[0], rev + 1)
else:
revs = xrange(rev, rev + 1)
transaction.changes['revs'] = revs
Pierre-Yves David
transaction: track newly introduced revisions...
r32262 return node