##// END OF EJS Templates
changeset_printer: use node.wdirrev to calculate meaningful parentrevs...
changeset_printer: use node.wdirrev to calculate meaningful parentrevs Because we defined the working-directory revision is INT_MAX, it makes sense that "hg log -r 'wdir()'" displays the "parent:" field. This is the same for two revisions that are semantically contiguous but the intermediate revisions are hidden.

File last commit:

r25635:7fdd1782 default
r25739:3dabc9b7 default
Show More
changelog.py
391 lines | 13.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 """
Mads Kiilerich
tests: fix doctest stability over Python versions...
r18379 >>> sorted(decodeextra(encodeextra({'foo': 'bar', 'baz': chr(0) + '2'})
... ).iteritems())
[('baz', '\\x002'), ('branch', 'default'), ('foo', 'bar')]
>>> sorted(decodeextra(encodeextra({'foo': 'bar',
... 'baz': chr(92) + chr(0) + '2'})
... ).iteritems())
[('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', '')
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)
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
Matt Mackall
restructure changelog file appending...
r4261
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)
Pierre-Yves David
changelog: rework the delayupdate mechanism...
r23201 def _divertopener(opener, target):
"""build an opener that writes in 'target.a' instead of 'target'"""
def _divert(name, mode='r'):
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'"""
def _delay(name, mode='r'):
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
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
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
def tip(self):
"""filtered version of revlog.tip"""
for i in xrange(len(self) -1, -2, -1):
if i not in self.filteredrevs:
return self.node(i)
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
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: use "vfs.rename()" instead of "util.rename()"
r19898 self.opener.rename(tmpname, self.indexfile)
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()
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
Matt Mackall
restructure changelog file appending...
r4261 self.checkinlinesize(tr)
Matt Mackall
Introduce HG_PREPEND to solve pretxn races...
r7787 def readpending(self, file):
Pierre-Yves David
changelog: document the 'readpending' method...
r25635 """read index data from a "pending" file
During a transaction, the actual changeset data is already stored in the
main file, but not yet finalized in the on-disk index. Instead, a
"pending" index is written by the transaction logic. If this function
is running, we are likely in a subprocess invoked in a hook. The
subprocess is informed that it is within a transaction and needs to
access its content.
This function will read all the index data out of the pending file and
extend the main index."""
Pierre-Yves David
changelog: fix readpending if no pending data exist (issue4609)...
r24822 if not self.opener.exists(file):
return # no pending data for changelog
Matt Mackall
Introduce HG_PREPEND to solve pretxn races...
r7787 r = revlog.revlog(self.opener, file)
self.index = r.index
self.nodemap = r.nodemap
Bryan O'Sullivan
changelog: ensure that nodecache is valid (issue3428)...
r16619 self._nodecache = r._nodecache
Matt Mackall
Introduce HG_PREPEND to solve pretxn races...
r7787 self._chunkcache = r._chunkcache
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
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)
Mads Kiilerich
fix trivial spelling errors
r17424 : extra is metadata, encoded and separated by '\0'
Benoit Boissinot
[extendedchangelog] add extra metadata in the changelog entry...
r3233 : 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
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