##// END OF EJS Templates
merge with stable
merge with stable

File last commit:

r16267:aa6821a7 default
r16569:d7c9976b merge default
Show More
changelog.py
255 lines | 8.8 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
Joel Rosdahl
Expand import * to allow Pyflakes to find problems
r6211 from node import bin, hex, nullid
Benoit Boissinot
forbid username with '\n' at the changelog level...
r7035 from i18n import _
Matt Mackall
move encoding bits from util to encoding...
r7948 import util, error, revlog, encoding
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):
"""
>>> d = {'nl': chr(10), 'bs': chr(92), 'cr': chr(13), 'nul': chr(0)}
>>> s = "ab%(nl)scd%(bs)s%(bs)sn%(nul)sab%(cr)scd%(bs)s%(nl)s" % d
>>> s
'ab\\ncd\\\\\\\\n\\x00ab\\rcd\\\\\\n'
>>> res = _string_escape(s)
Matt Mackall
changelog: inline trivial call for extra data unescaping
r5745 >>> s == res.decode('string_escape')
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 """
>>> decodeextra(encodeextra({'foo': 'bar', 'baz': chr(0) + '2'}))
Matt Mackall
changelog: micro-optimizations to changelog.read()
r16267 {'foo': 'bar', 'baz': '\\x002', 'branch': 'default'}
Matt Mackall
changelog: handle decoding of NULs in extra more carefully (issue3156)...
r15661 >>> decodeextra(encodeextra({'foo': 'bar', 'baz': chr(92) + chr(0) + '2'}))
Matt Mackall
changelog: micro-optimizations to changelog.read()
r16267 {'foo': 'bar', 'baz': '\\\\\\x002', 'branch': 'default'}
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', '')
Martin Geisler
changelog: turn {de,en}code_extra methods into functions...
r8443 k, v = l.decode('string_escape').split(':', 1)
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)
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'''
def __init__(self, fp, buf):
self.data = buf
self.fp = fp
self.offset = fp.tell()
self.size = util.fstat(fp).st_size
def end(self):
return self.size + len("".join(self.data))
def tell(self):
return self.offset
def flush(self):
pass
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):
Matt Mackall
revlog: fix caching of buffer objects
r5450 self.data.append(str(s))
Matt Mackall
restructure changelog file appending...
r4261 self.offset += len(s)
Matt Mackall
changelog: move delayopener outside of class to eliminate reference cycle
r9166 def delayopener(opener, target, divert, buf):
def o(name, mode='r'):
if name != target:
return opener(name, mode)
if divert:
return opener(name + ".a", mode.replace('a', 'w'))
# otherwise, divert to memory
return appender(opener(name, mode), buf)
return o
Matt Mackall
revlog: kill from-style imports...
r7634 class changelog(revlog.revlog):
Matt Mackall
revlog: simplify revlog version handling...
r4258 def __init__(self, opener):
Matt Mackall
changelog: swap opener to switch delay modes
r9165 revlog.revlog.__init__(self, opener, "00changelog.i")
Sune Foldager
changelog: don't use generaldelta
r14334 if self._initempty:
# changelogs don't benefit from generaldelta
self.version &= ~revlog.REVLOGGENERALDELTA
self._generaldelta = False
Matt Mackall
changelog: make delayopener less intrusive
r8644 self._realopener = opener
self._delayed = False
Matt Mackall
changelog: _delaycount -> _divert
r9163 self._divert = False
Pierre-Yves David
hidden: Add a hiddenrevs attributes to changelog....
r14643 # hiddenrevs: revs that should be hidden by command and tools
self.hiddenrevs = set()
mpm@selenic.com
Break apart hg.py...
r1089
Matt Mackall
restructure changelog file appending...
r4261 def delayupdate(self):
"delay visibility of index updates to other readers"
Matt Mackall
changelog: make delayopener less intrusive
r8644 self._delayed = True
Matt Mackall
changelog: _delaycount -> _divert
r9163 self._divert = (len(self) == 0)
Matt Mackall
restructure changelog file appending...
r4261 self._delaybuf = []
Matt Mackall
changelog: move delayopener outside of class to eliminate reference cycle
r9166 self.opener = delayopener(self._realopener, self.indexfile,
self._divert, self._delaybuf)
Matt Mackall
restructure changelog file appending...
r4261
def finalize(self, tr):
"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:
Zachary Gramana
changelog: fixes leaked file handle
r14207 nfile = self.opener(self.indexfile + ".a")
n = nfile.name
nfile.close()
Matt Mackall
changelog: move delayopener outside of class to eliminate reference cycle
r9166 util.rename(n, n[:-2])
Matt Mackall
changelog: optimize delayed updates for clone vs pull...
r4269 elif self._delaybuf:
Matt Mackall
restructure changelog file appending...
r4261 fp = self.opener(self.indexfile, 'a')
fp.write("".join(self._delaybuf))
fp.close()
Matt Mackall
Introduce HG_PREPEND to solve pretxn races...
r7787 self._delaybuf = []
Matt Mackall
changelog: optimize delayed updates for clone vs pull...
r4269 # split when we're done
Matt Mackall
restructure changelog file appending...
r4261 self.checkinlinesize(tr)
Matt Mackall
Introduce HG_PREPEND to solve pretxn races...
r7787 def readpending(self, file):
r = revlog.revlog(self.opener, file)
self.index = r.index
self.nodemap = r.nodemap
self._chunkcache = r._chunkcache
def writepending(self):
"create a file containing the unfinalized state for pretxnchangegroup"
if self._delaybuf:
# make a temporary copy of the index
fp1 = self._realopener(self.indexfile)
fp2 = self._realopener(self.indexfile + ".a", "w")
fp2.write(fp1.read())
# add pending data
fp2.write("".join(self._delaybuf))
fp2.close()
# switch modes so finalize can simply rename
self._delaybuf = []
Matt Mackall
changelog: factor out _delayname
r9164 self._divert = True
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
Matt Mackall
restructure changelog file appending...
r4261 def checkinlinesize(self, tr, fp=None):
Matt Mackall
changelog: swap opener to switch delay modes
r9165 if not self._delayed:
revlog.revlog.checkinlinesize(self, tr, fp)
Matt Mackall
restructure changelog file appending...
r4261
Matt Mackall
changelog: remove extract function
r5744 def read(self, node):
Benoit Boissinot
document changelog format
r3077 """
format used:
Benoit Boissinot
[extendedchangelog] add extra metadata in the changelog entry...
r3233 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 metadatas, 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
Benoit Boissinot
document changelog format
r3077 """
Matt Mackall
changelog: remove extract function
r5744 text = self.revision(node)
mpm@selenic.com
Break apart hg.py...
r1089 if not text:
Matt Mackall
changelog: micro-optimizations to changelog.read()
r16267 return (nullid, "", (0, 0), [], "", _defaultextra)
mpm@selenic.com
Break apart hg.py...
r1089 last = text.index("\n\n")
Matt Mackall
move encoding bits from util to encoding...
r7948 desc = encoding.tolocal(text[last + 2:])
Benoit Boissinot
[extendedchangelog] add extra metadata in the changelog entry...
r3233 l = text[:last].split('\n')
mpm@selenic.com
Break apart hg.py...
r1089 manifest = bin(l[0])
Matt Mackall
move encoding bits from util to encoding...
r7948 user = encoding.tolocal(l[1])
Benoit Boissinot
[extendedchangelog] add extra metadata in the changelog entry...
r3233
Matt Mackall
changelog: micro-optimizations to changelog.read()
r16267 tdata = l[2].split(' ', 2)
if len(tdata) != 3:
time = float(tdata[0])
Benoit Boissinot
[extendedchangelog] add extra metadata in the changelog entry...
r3233 try:
# various tools did silly things with the time zone field.
Matt Mackall
changelog: micro-optimizations to changelog.read()
r16267 timezone = int(tdata[1])
Idan Kamara
eliminate various naked except clauses
r14004 except ValueError:
Benoit Boissinot
[extendedchangelog] add extra metadata in the changelog entry...
r3233 timezone = 0
Matt Mackall
changelog: micro-optimizations to changelog.read()
r16267 extra = _defaultextra
Benoit Boissinot
[extendedchangelog] add extra metadata in the changelog entry...
r3233 else:
Matt Mackall
changelog: micro-optimizations to changelog.read()
r16267 time, timezone = float(tdata[0]), int(tdata[1])
extra = decodeextra(tdata[2])
mpm@selenic.com
Break apart hg.py...
r1089 files = l[3:]
Benoit Boissinot
[extendedchangelog] add extra metadata in the changelog entry...
r3233 return (manifest, user, (time, timezone), files, desc, extra)
mpm@selenic.com
Break apart hg.py...
r1089
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
# strip trailing whitespace and leading and trailing empty lines
desc = '\n'.join([l.rstrip() for l in desc.splitlines()]).strip('\n')
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)