##// END OF EJS Templates
record: make use of output labeling
record: make use of output labeling

File last commit:

r10282:08a0f04b default
r10825:781689b9 default
Show More
context.py
912 lines | 28.1 KiB | text/x-python | PythonLexer
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 # context.py - changeset and file context objects for mercurial
#
Thomas Arendsen Hein
Updated copyright notices and add "and others" to "hg version"
r4635 # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 #
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.
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Matt Mackall
context: add __int__ and hex methods
r6763 from node import nullid, nullrev, short, hex
Matt Mackall
Simplify i18n imports
r3891 from i18n import _
Matt Mackall
subrepo: introduce basic state parsing
r8812 import ancestor, bdiff, error, util, subrepo
Simon Heimberg
separate import lines from mercurial and general python modules
r8312 import os, errno
Matt Mackall
filectx: add rename traversal for parents()
r3122
Matt Mackall
util: take propertycache from context.py
r8207 propertycache = util.propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 class changectx(object):
"""A changecontext object makes access to data related to a particular
changeset convenient."""
Matt Mackall
context: simplify changeid logic
r6741 def __init__(self, repo, changeid=''):
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 """changeid is a revision number, node, or tag"""
Matt Mackall
context: simplify changeid logic
r6741 if changeid == '':
changeid = '.'
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 self._repo = repo
Dirkjan Ochtman
context: special-case changectx setup for integer changeid
r7367 if isinstance(changeid, (long, int)):
self._rev = changeid
self._node = self._repo.changelog.node(changeid)
else:
self._node = self._repo.lookup(changeid)
self._rev = self._repo.changelog.rev(self._node)
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Matt Mackall
Add str methods to contexts
r3166 def __str__(self):
return short(self.node())
Matt Mackall
context: add __int__ and hex methods
r6763 def __int__(self):
return self.rev()
Matt Mackall
context: add __repr__ methods
r3151 def __repr__(self):
Matt Mackall
context: simplify repr methods
r3216 return "<changectx %s>" % str(self)
Matt Mackall
context: add __repr__ methods
r3151
Paul Moore
python 2.6 compatibility: add __hash__ to classes that have __eq__
r6469 def __hash__(self):
try:
return hash(self._rev)
except AttributeError:
return id(self)
Matt Mackall
Add equality operators to changectx and filectx
r3165 def __eq__(self, other):
Brendan Cully
Make context __eq__ handle arbitrary RHS values
r3715 try:
return self._rev == other._rev
except AttributeError:
return False
Matt Mackall
Add equality operators to changectx and filectx
r3165
Matt Mackall
merge: make test for fast-forward merge stricter (issue619)...
r4748 def __ne__(self, other):
return not (self == other)
Matt Mackall
context: add __nonzero__ methods
r3168 def __nonzero__(self):
Thomas Arendsen Hein
Define and use nullrev (revision of nullid) instead of -1.
r3578 return self._rev != nullrev
Matt Mackall
context: add __nonzero__ methods
r3168
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _changeset(self):
return self._repo.changelog.read(self.node())
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _manifest(self):
return self._repo.manifest.read(self._changeset[0])
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _manifestdelta(self):
return self._repo.manifest.readdelta(self._changeset[0])
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _parents(self):
p = self._repo.changelog.parentrevs(self._rev)
if p[1] == nullrev:
p = p[:-1]
return [changectx(self._repo, x) for x in p]
Matt Mackall
contexts: use __getattr__ rather than try/except in changectx
r3215
Matt Mackall
subrepo: introduce basic state parsing
r8812 @propertycache
def substate(self):
return subrepo.state(self)
Matt Mackall
context: add __contains__, __getitem__, and __iter__
r4909 def __contains__(self, key):
return key in self._manifest
def __getitem__(self, key):
return self.filectx(key)
def __iter__(self):
Matt Mackall
replace util.sort with sorted built-in...
r8209 for f in sorted(self._manifest):
Bryan O'Sullivan
Fix context iterator.
r5485 yield f
Matt Mackall
context: add __contains__, __getitem__, and __iter__
r4909
Matt Mackall
many, many trivial check-code fixups
r10282 def changeset(self):
return self._changeset
def manifest(self):
return self._manifest
def manifestnode(self):
return self._changeset[0]
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Matt Mackall
many, many trivial check-code fixups
r10282 def rev(self):
return self._rev
def node(self):
return self._node
def hex(self):
return hex(self._node)
def user(self):
return self._changeset[1]
def date(self):
return self._changeset[2]
def files(self):
return self._changeset[3]
def description(self):
return self._changeset[4]
def branch(self):
return self._changeset[5].get("branch")
def extra(self):
return self._changeset[5]
def tags(self):
return self._repo.nodetags(self._node)
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
def parents(self):
"""return contexts for each parent changeset"""
Matt Mackall
context: clean up parents()
r6742 return self._parents
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Matt Mackall
context: add p1 and p2 methods
r8406 def p1(self):
return self._parents[0]
def p2(self):
if len(self._parents) == 2:
return self._parents[1]
return changectx(self._repo, -1)
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 def children(self):
"""return contexts for each child changeset"""
Benoit Boissinot
context.py: self.repo is not defined, change to self._repo
r2627 c = self._repo.changelog.children(self._node)
Thomas Arendsen Hein
white space and line break cleanups
r3673 return [changectx(self._repo, x) for x in c]
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Matt Mackall
Merge with stable...
r6876 def ancestors(self):
for a in self._repo.changelog.ancestors(self._rev):
yield changectx(self._repo, a)
def descendants(self):
for d in self._repo.changelog.descendants(self._rev):
yield changectx(self._repo, d)
Patrick Mezard
context: add fileflags() to avoid rebuilding manifests
r5389 def _fileinfo(self, path):
Brendan Cully
context: check self.__dict__ instead of using hasattr...
r3336 if '_manifest' in self.__dict__:
Brendan Cully
Make changectx.filenode raise repo.LookupError on failure
r3242 try:
Patrick Mezard
context: add fileflags() to avoid rebuilding manifests
r5389 return self._manifest[path], self._manifest.flags(path)
Brendan Cully
Make changectx.filenode raise repo.LookupError on failure
r3242 except KeyError:
Matt Mackall
errors: move revlog errors...
r7633 raise error.LookupError(self._node, path,
_('not found in manifest'))
Brendan Cully
changectx: search manifest delta for filenode
r3337 if '_manifestdelta' in self.__dict__ or path in self.files():
if path in self._manifestdelta:
Patrick Mezard
context: add fileflags() to avoid rebuilding manifests
r5389 return self._manifestdelta[path], self._manifestdelta.flags(path)
Matt Mackall
contexts: use __getattr__ rather than try/except in changectx
r3215 node, flag = self._repo.manifest.find(self._changeset[0], path)
Brendan Cully
Make changectx.filenode raise repo.LookupError on failure
r3242 if not node:
Matt Mackall
errors: move revlog errors...
r7633 raise error.LookupError(self._node, path,
_('not found in manifest'))
Brendan Cully
Make changectx.filenode raise repo.LookupError on failure
r3242
Patrick Mezard
context: add fileflags() to avoid rebuilding manifests
r5389 return node, flag
def filenode(self, path):
return self._fileinfo(path)[0]
Matt Mackall
simplify flag handling...
r6743 def flags(self, path):
Patrick Mezard
context: add fileflags() to avoid rebuilding manifests
r5389 try:
return self._fileinfo(path)[1]
Matt Mackall
errors: move revlog errors...
r7633 except error.LookupError:
Patrick Mezard
context: add fileflags() to avoid rebuilding manifests
r5389 return ''
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Benoit Boissinot
context: create a filectxt with filelog reuse
r3966 def filectx(self, path, fileid=None, filelog=None):
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 """get a file context from this changeset"""
Benoit Boissinot
context.py: filectxs was using a keyword arg, add it to filectx
r2628 if fileid is None:
fileid = self.filenode(path)
Benoit Boissinot
context: create a filectxt with filelog reuse
r3966 return filectx(self._repo, path, fileid=fileid,
changectx=self, filelog=filelog)
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Matt Mackall
changectx: add ancestor function
r3125 def ancestor(self, c2):
"""
return the ancestor context of self and c2
"""
Matt Mackall
merge: fix changectx.ancestor(workingctx) (issue1327)
r9843 # deal with workingctxs
n2 = c2._node
if n2 == None:
n2 = c2._parents[0]._node
n = self._repo.changelog.ancestor(self._node, n2)
Matt Mackall
changectx: add ancestor function
r3125 return changectx(self._repo, n)
Matt Mackall
context: add walk method
r6764 def walk(self, match):
Simon Heimberg
context: replace pseudo-set by real set
r8380 fset = set(match.files())
Matt Mackall
context: add walk method
r6764 # for dirstate.walk, files=['.'] means "walk the whole tree".
# follow that here, too
Simon Heimberg
context: replace pseudo-set by real set
r8380 fset.discard('.')
Matt Mackall
context: add walk method
r6764 for fn in self:
Simon Heimberg
context: replace pseudo-set by real set
r8380 for ffn in fset:
Matt Mackall
context: add walk method
r6764 # match if the file is the exact name or a directory
if ffn == fn or fn.startswith("%s/" % ffn):
Simon Heimberg
context: replace pseudo-set by real set
r8380 fset.remove(ffn)
Matt Mackall
context: add walk method
r6764 break
if match(fn):
yield fn
Simon Heimberg
context: replace pseudo-set by real set
r8380 for fn in sorted(fset):
Matt Mackall
context: add walk method
r6764 if match.bad(fn, 'No such file in rev ' + str(self)) and match(fn):
yield fn
Matt Mackall
commit: recurse into subrepositories
r8813 def sub(self, path):
return subrepo.subrepo(self, path)
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 class filectx(object):
"""A filecontext object makes access to data related to a particular
filerevision convenient."""
Matt Mackall
context: make filectx remember changectx in changectx.filectx
r3214 def __init__(self, repo, path, changeid=None, fileid=None,
filelog=None, changectx=None):
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 """changeid can be a changeset revision, node, or tag.
fileid can be a file revision or node."""
self._repo = repo
self._path = path
Benoit Boissinot
make it possible to use changectx to create a filectx
r3964 assert (changeid is not None
or fileid is not None
Greg Ward
context: improve arg-checking assert.
r9024 or changectx is not None), \
("bad args: changeid=%r, fileid=%r, changectx=%r"
% (changeid, fileid, changectx))
Benoit Boissinot
fix filectxt to really work...
r2643
Matt Mackall
filectx: allow passing filelog in init to avoid opening new filelogs
r3124 if filelog:
self._filelog = filelog
Maxim Dounin
context: preserve changeset in filectx if we have one...
r5810 if changeid is not None:
self._changeid = changeid
if changectx is not None:
self._changectx = changectx
if fileid is not None:
Matt Mackall
Make filectx lazier...
r3213 self._fileid = fileid
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _changectx(self):
return changectx(self._repo, self._changeid)
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _filelog(self):
return self._repo.file(self._path)
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _changeid(self):
if '_changectx' in self.__dict__:
return self._changectx.rev()
Brendan Cully
Make filectx lazier - some users never use filenode
r3144 else:
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 return self._filelog.linkrev(self._filerev)
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _filenode(self):
if '_fileid' in self.__dict__:
return self._filelog.lookup(self._fileid)
else:
return self._changectx.filenode(self._path)
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _filerev(self):
return self._filelog.rev(self._filenode)
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _repopath(self):
return self._path
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Matt Mackall
context: add __nonzero__ methods
r3168 def __nonzero__(self):
Benoit Boissinot
context: None is not a valid filenode (revert from 23ede9e7ad4d)
r3712 try:
Peter Arrenbrecht
cleanup: drop variables for unused return values...
r7874 self._filenode
Benoit Boissinot
context: None is not a valid filenode (revert from 23ede9e7ad4d)
r3712 return True
Matt Mackall
errors: move revlog errors...
r7633 except error.LookupError:
Benoit Boissinot
context: None is not a valid filenode (revert from 23ede9e7ad4d)
r3712 # file is missing
return False
Matt Mackall
context: add __nonzero__ methods
r3168
Matt Mackall
Add str methods to contexts
r3166 def __str__(self):
return "%s@%s" % (self.path(), short(self.node()))
Matt Mackall
context: add __repr__ methods
r3151 def __repr__(self):
Matt Mackall
context: simplify repr methods
r3216 return "<filectx %s>" % str(self)
Matt Mackall
context: add __repr__ methods
r3151
Paul Moore
python 2.6 compatibility: add __hash__ to classes that have __eq__
r6469 def __hash__(self):
try:
return hash((self._path, self._fileid))
except AttributeError:
return id(self)
Matt Mackall
Add equality operators to changectx and filectx
r3165 def __eq__(self, other):
Brendan Cully
Make context __eq__ handle arbitrary RHS values
r3715 try:
return (self._path == other._path
Matt Mackall
contexts: improve filectx eq test
r4889 and self._fileid == other._fileid)
Brendan Cully
Make context __eq__ handle arbitrary RHS values
r3715 except AttributeError:
return False
Matt Mackall
Add equality operators to changectx and filectx
r3165
Matt Mackall
merge: make test for fast-forward merge stricter (issue619)...
r4748 def __ne__(self, other):
return not (self == other)
Brendan Cully
Add lookup method to filectx
r3207 def filectx(self, fileid):
'''opens an arbitrary revision of the file without
opening a new filelog'''
return filectx(self._repo, self._path, fileid=fileid,
filelog=self._filelog)
Matt Mackall
many, many trivial check-code fixups
r10282 def filerev(self):
return self._filerev
def filenode(self):
return self._filenode
def flags(self):
return self._changectx.flags(self._path)
def filelog(self):
return self._filelog
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Matt Mackall
filectx: lazy linkrev usage
r3150 def rev(self):
Brendan Cully
context: check self.__dict__ instead of using hasattr...
r3336 if '_changectx' in self.__dict__:
Matt Mackall
filectx: lazy linkrev usage
r3150 return self._changectx.rev()
Maxim Dounin
context: preserve changeset in filectx if we have one...
r5810 if '_changeid' in self.__dict__:
Thomas Arendsen Hein
Removed trailing spaces from everything except test output
r6210 return self._changectx.rev()
Matt Mackall
linkrev: take a revision number rather than a hash
r7361 return self._filelog.linkrev(self._filerev)
Matt Mackall
filectx: lazy linkrev usage
r3150
Matt Mackall
many, many trivial check-code fixups
r10282 def linkrev(self):
return self._filelog.linkrev(self._filerev)
def node(self):
return self._changectx.node()
def hex(self):
return hex(self.node())
def user(self):
return self._changectx.user()
def date(self):
return self._changectx.date()
def files(self):
return self._changectx.files()
def description(self):
return self._changectx.description()
def branch(self):
return self._changectx.branch()
def extra(self):
return self._changectx.extra()
def manifest(self):
return self._changectx.manifest()
def changectx(self):
return self._changectx
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Matt Mackall
many, many trivial check-code fixups
r10282 def data(self):
return self._filelog.read(self._filenode)
def path(self):
return self._path
def size(self):
return self._filelog.size(self._filerev)
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Matt Mackall
many, many trivial check-code fixups
r10282 def cmp(self, text):
return self._filelog.cmp(self._filenode, text)
Matt Mackall
context: add cmp for filectxs
r3310
Maxim Dounin
Fix copies reporting in log and convert....
r5811 def renamed(self):
"""check if file was actually renamed in this changeset revision
If rename logged in file revision, we report copy for changeset only
if file revisions linkrev points back to the changeset in question
or both changeset parents contain different file revisions.
"""
renamed = self._filelog.renamed(self._filenode)
if not renamed:
return renamed
if self.rev() == self.linkrev():
return renamed
name = self.path()
fnode = self._filenode
for p in self._changectx.parents():
try:
if fnode == p.filenode(name):
return None
Matt Mackall
errors: move revlog errors...
r7633 except error.LookupError:
Maxim Dounin
Fix copies reporting in log and convert....
r5811 pass
return renamed
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 def parents(self):
Matt Mackall
filectx: allow passing filelog in init to avoid opening new filelogs
r3124 p = self._path
fl = self._filelog
Thomas Arendsen Hein
white space and line break cleanups
r3673 pl = [(p, n, fl) for n in self._filelog.parents(self._filenode)]
Matt Mackall
filelog: make metadata method private
r3123
Patrick Mezard
context: fix filectx.parents() bug introduced when editing 180a3eee4b75
r5813 r = self._filelog.renamed(self._filenode)
Matt Mackall
filectx: add rename traversal for parents()
r3122 if r:
Matt Mackall
filectx: allow passing filelog in init to avoid opening new filelogs
r3124 pl[0] = (r[0], r[1], None)
Thomas Arendsen Hein
white space and line break cleanups
r3673 return [filectx(self._repo, p, fileid=n, filelog=l)
Matt Mackall
many, many trivial check-code fixups
r10282 for p, n, l in pl if n != nullid]
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
def children(self):
# hard for renames
c = self._filelog.children(self._filenode)
Thomas Arendsen Hein
white space and line break cleanups
r3673 return [filectx(self._repo, self._path, fileid=x,
filelog=self._filelog) for x in c]
Matt Mackall
Convert hg annotate to context api
r2566
FUJIWARA Katsunori
Allow filectx.annotate to return the line number of first appearance.
r4856 def annotate(self, follow=False, linenumber=None):
Brendan Cully
Refactor annotate copy support.
r3172 '''returns a list of tuples of (ctx, line) for each line
in the file, where ctx is the filectx of the node where
FUJIWARA Katsunori
Allow filectx.annotate to return the line number of first appearance.
r4856 that line was last changed.
This returns tuples of ((ctx, linenumber), line) for each line,
if "linenumber" parameter is NOT "None".
In such tuples, linenumber means one at the first appearance
in the managed file.
To reduce annotation cost,
this returns fixed value(False is used) as linenumber,
if "linenumber" parameter is "False".'''
Brendan Cully
Refactor annotate copy support.
r3172
FUJIWARA Katsunori
Allow filectx.annotate to return the line number of first appearance.
r4856 def decorate_compat(text, rev):
Brendan Cully
Refactor annotate copy support.
r3172 return ([rev] * len(text.splitlines()), text)
FUJIWARA Katsunori
Allow filectx.annotate to return the line number of first appearance.
r4856 def without_linenumber(text, rev):
return ([(rev, False)] * len(text.splitlines()), text)
def with_linenumber(text, rev):
size = len(text.splitlines())
return ([(rev, i) for i in xrange(1, size + 1)], text)
decorate = (((linenumber is None) and decorate_compat) or
(linenumber and with_linenumber) or
without_linenumber)
Brendan Cully
Refactor annotate copy support.
r3172 def pair(parent, child):
for a1, a2, b1, b2 in bdiff.blocks(parent[1], child[1]):
child[0][b1:b2] = parent[0][a1:a2]
return child
Matt Mackall
fix memory usage of revlog caches by limiting cache size [issue1639]
r9097 getlog = util.lrucachefunc(lambda x: self._repo.file(x))
Brendan Cully
Refactor annotate copy support.
r3172 def getctx(path, fileid):
log = path == self._path and self._filelog or getlog(path)
return filectx(self._repo, path, fileid=fileid, filelog=log)
Matt Mackall
fix memory usage of revlog caches by limiting cache size [issue1639]
r9097 getctx = util.lrucachefunc(getctx)
Brendan Cully
Refactor annotate copy support.
r3172
def parents(f):
# we want to reuse filectx objects as much as possible
p = f._path
Matt Mackall
contexts: add working dir and working file contexts...
r3217 if f._filerev is None: # working dir
Thomas Arendsen Hein
white space and line break cleanups
r3673 pl = [(n.path(), n.filerev()) for n in f.parents()]
Matt Mackall
contexts: add working dir and working file contexts...
r3217 else:
Thomas Arendsen Hein
white space and line break cleanups
r3673 pl = [(p, n) for n in f._filelog.parentrevs(f._filerev)]
Brendan Cully
Refactor annotate copy support.
r3172
if follow:
r = f.renamed()
if r:
pl[0] = (r[0], getlog(r[0]).rev(r[1]))
Brendan Cully
filectx.annotate: return filectx for each line instead of rev
r3146
Thomas Arendsen Hein
Define and use nullrev (revision of nullid) instead of -1.
r3578 return [getctx(p, n) for p, n in pl if n != nullrev]
Matt Mackall
contexts: add working dir and working file contexts...
r3217
Brendan Cully
Fix annotate where linkrev != rev without exporting linkrev
r3404 # use linkrev to find the first changeset where self appeared
Maxim Dounin
Fix copies reporting in log and convert....
r5811 if self.rev() != self.linkrev():
Brendan Cully
Fix annotate where linkrev != rev without exporting linkrev
r3404 base = self.filectx(self.filerev())
else:
base = self
Brendan Cully
Refactor annotate copy support.
r3172 # find all ancestors
Brendan Cully
Fix annotate where linkrev != rev without exporting linkrev
r3404 needed = {base: 1}
visit = [base]
files = [base._path]
Brendan Cully
Refactor annotate copy support.
r3172 while visit:
f = visit.pop(0)
for p in parents(f):
if p not in needed:
needed[p] = 1
visit.append(p)
if p._path not in files:
files.append(p._path)
else:
# count how many times we'll use this
needed[p] += 1
# sort by revision (per file) which is a topological order
visit = []
for f in files:
Benoit Boissinot
context: use key-sorting instead of tuples
r9973 visit.extend(n for n in needed if n._path == f)
Matt Mackall
util: add sort helper
r6762
Brendan Cully
Refactor annotate copy support.
r3172 hist = {}
Benoit Boissinot
context: use key-sorting instead of tuples
r9973 for f in sorted(visit, key=lambda x: x.rev()):
Brendan Cully
Refactor annotate copy support.
r3172 curr = decorate(f.data(), f)
for p in parents(f):
Benoit Boissinot
context: parents() already filters nullid
r9974 curr = pair(hist[p], curr)
# trim the history of unneeded revs
needed[p] -= 1
if not needed[p]:
del hist[p]
Brendan Cully
Refactor annotate copy support.
r3172 hist[f] = curr
Nicolas Dumazet
for calls expecting bool args, pass bool instead of int...
r9136 return zip(hist[f][0], hist[f][1].splitlines(True))
Matt Mackall
filectx: allow passing filelog in init to avoid opening new filelogs
r3124
Matt Mackall
filectx: add rename-aware ancestor algorithm...
r3126 def ancestor(self, fc2):
"""
find the common ancestor file context, if any, of self, and fc2
"""
Matt Mackall
merge: first part of fix for issue1327...
r9750 actx = self.changectx().ancestor(fc2.changectx())
Matt Mackall
filectx: shortcut unrelated files in ancestor() (issue1327)
r9751
# the trivial case: changesets are unrelated, files must be too
if not actx:
return None
# the easy case: no (relevant) renames
if fc2.path() == self.path() and self.path() in actx:
Matt Mackall
merge: first part of fix for issue1327...
r9750 return actx[self.path()]
Matt Mackall
Abstract ancestor algorithm into generic function...
r3135 acache = {}
Matt Mackall
contexts: add working dir and working file contexts...
r3217
# prime the ancestor cache for the working directory
for c in (self, fc2):
Martin Geisler
use 'x is None' instead of 'x == None'...
r8527 if c._filerev is None:
Thomas Arendsen Hein
white space and line break cleanups
r3673 pl = [(n.path(), n.filenode()) for n in c.parents()]
Matt Mackall
contexts: add working dir and working file contexts...
r3217 acache[(c._path, None)] = pl
Alexis S. L. Carvalho
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)...
r6286 flcache = {self._repopath:self._filelog, fc2._repopath:fc2._filelog}
Matt Mackall
Abstract ancestor algorithm into generic function...
r3135 def parents(vertex):
if vertex in acache:
return acache[vertex]
f, n = vertex
if f not in flcache:
Matt Mackall
filectx: add rename-aware ancestor algorithm...
r3126 flcache[f] = self._repo.file(f)
Matt Mackall
Abstract ancestor algorithm into generic function...
r3135 fl = flcache[f]
Thomas Arendsen Hein
white space and line break cleanups
r3673 pl = [(f, p) for p in fl.parents(n) if p != nullid]
Matt Mackall
Abstract ancestor algorithm into generic function...
r3135 re = fl.renamed(n)
if re:
pl.append(re)
Thomas Arendsen Hein
white space and line break cleanups
r3673 acache[vertex] = pl
Matt Mackall
Abstract ancestor algorithm into generic function...
r3135 return pl
Matt Mackall
filectx: add rename-aware ancestor algorithm...
r3126
Matt Mackall
Abstract ancestor algorithm into generic function...
r3135 a, b = (self._path, self._filenode), (fc2._path, fc2._filenode)
v = ancestor.ancestor(a, b, parents)
if v:
Thomas Arendsen Hein
white space and line break cleanups
r3673 f, n = v
Matt Mackall
Abstract ancestor algorithm into generic function...
r3135 return filectx(self._repo, f, fileid=n, filelog=flcache[f])
Matt Mackall
filectx: add rename-aware ancestor algorithm...
r3126
Matt Mackall
Abstract ancestor algorithm into generic function...
r3135 return None
Matt Mackall
contexts: add working dir and working file contexts...
r3217
Matt Mackall
copies: speed up copy detection...
r10262 def ancestors(self):
seen = set(str(self))
visit = [self]
while visit:
for parent in visit.pop(0).parents():
s = str(parent)
if s not in seen:
visit.append(parent)
seen.add(s)
yield parent
Matt Mackall
contexts: add working dir and working file contexts...
r3217 class workingctx(changectx):
"""A workingctx object makes access to data related to
Patrick Mezard
context: let workingctx parents be overriden
r6705 the current working directory convenient.
parents - a pair of parent nodeids, or None to use the dirstate.
Patrick Mezard
context: let workingctx.date(), .user() and description() be overriden
r6709 date - any valid date string or (unixtime, offset), or None.
user - username string, or None.
Patrick Mezard
localrepo: let commit() get extra data from workingctx
r6708 extra - a dictionary of extra values, or None.
Patrick Mezard
localrepo: hide commit() file selection behind workingctx
r6707 changes - a list of file lists as returned by localrepo.status()
or None to use the repository status.
Patrick Mezard
context: let workingctx parents be overriden
r6705 """
Dirkjan Ochtman
kill some trailing spaces
r6721 def __init__(self, repo, parents=None, text="", user=None, date=None,
Patrick Mezard
context: let workingctx.date(), .user() and description() be overriden
r6709 extra=None, changes=None):
Matt Mackall
contexts: add working dir and working file contexts...
r3217 self._repo = repo
self._rev = None
self._node = None
Patrick Mezard
context: let workingctx.date(), .user() and description() be overriden
r6709 self._text = text
Christian Ebert
Fix commit date (issue1193)...
r6718 if date:
Patrick Mezard
context: let workingctx.date(), .user() and description() be overriden
r6709 self._date = util.parsedate(date)
Matt Mackall
minor status fixups
r6817 if user:
self._user = user
Patrick Mezard
context: let workingctx parents be overriden
r6705 if parents:
Matt Mackall
context: simplify parents code
r6772 self._parents = [changectx(self._repo, p) for p in parents]
Patrick Mezard
localrepo: hide commit() file selection behind workingctx
r6707 if changes:
self._status = list(changes)
Matt Mackall
contexts: add working dir and working file contexts...
r3217
Patrick Mezard
localrepo: let commit() get extra data from workingctx
r6708 self._extra = {}
if extra:
self._extra = extra.copy()
if 'branch' not in self._extra:
branch = self._repo.dirstate.branch()
try:
branch = branch.decode('UTF-8').encode('UTF-8')
except UnicodeDecodeError:
raise util.Abort(_('branch name not in UTF-8!'))
self._extra['branch'] = branch
if self._extra['branch'] == '':
self._extra['branch'] = 'default'
Matt Mackall
contexts: add working dir and working file contexts...
r3217 def __str__(self):
Matt Mackall
context: change workingctx str() from . to <node>+
r3313 return str(self._parents[0]) + "+"
Matt Mackall
contexts: add working dir and working file contexts...
r3217
def __nonzero__(self):
return True
Matt Mackall
workingctx: add __contains__ method
r6771 def __contains__(self, key):
Patrick Mezard
context: fix workingctx.__contains__
r8061 return self._repo.dirstate[key] not in "?r"
Matt Mackall
workingctx: add __contains__ method
r6771
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _manifest(self):
Matt Mackall
contexts: add working dir and working file contexts...
r3217 """generate a manifest corresponding to the working directory"""
Matt Mackall
merge: use new working context object in update
r3218 man = self._parents[0].manifest().copy()
Matt Mackall
contexts: add working dir and working file contexts...
r3217 copied = self._repo.dirstate.copies()
Matt Mackall
simplify flag handling...
r6743 cf = lambda x: man.flags(copied.get(x, x))
ff = self._repo.dirstate.flagfunc(cf)
Matt Mackall
contexts: add working dir and working file contexts...
r3217 modified, added, removed, deleted, unknown = self._status[:5]
Thomas Arendsen Hein
white space and line break cleanups
r3673 for i, l in (("a", added), ("m", modified), ("u", unknown)):
Matt Mackall
contexts: add working dir and working file contexts...
r3217 for f in l:
man[f] = man.get(copied.get(f, f), nullid) + i
Matt Mackall
context: don't spuriously raise abort when a file goes missing.
r3823 try:
Matt Mackall
simplify flag handling...
r6743 man.set(f, ff(f))
Matt Mackall
context: don't spuriously raise abort when a file goes missing.
r3823 except OSError:
pass
Matt Mackall
contexts: add working dir and working file contexts...
r3217
for f in deleted + removed:
Giorgos Keramidas
Revert changeset c67920d78248....
r3325 if f in man:
del man[f]
Matt Mackall
contexts: add working dir and working file contexts...
r3217
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 return man
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _status(self):
return self._repo.status(unknown=True)
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _user(self):
return self._repo.ui.username()
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _date(self):
return util.makedate()
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _parents(self):
p = self._repo.dirstate.parents()
if p[1] == nullid:
p = p[:-1]
self._parents = [changectx(self._repo, x) for x in p]
return self._parents
Matt Mackall
contexts: add working dir and working file contexts...
r3217
Matt Mackall
many, many trivial check-code fixups
r10282 def manifest(self):
return self._manifest
def user(self):
return self._user or self._repo.ui.username()
def date(self):
return self._date
def description(self):
return self._text
Matt Mackall
contexts: add working dir and working file contexts...
r3217 def files(self):
Matt Mackall
replace util.sort with sorted built-in...
r8209 return sorted(self._status[0] + self._status[1] + self._status[2])
Matt Mackall
contexts: add working dir and working file contexts...
r3217
Matt Mackall
many, many trivial check-code fixups
r10282 def modified(self):
return self._status[0]
def added(self):
return self._status[1]
def removed(self):
return self._status[2]
def deleted(self):
return self._status[3]
def unknown(self):
return self._status[4]
def clean(self):
return self._status[5]
def branch(self):
return self._extra['branch']
def extra(self):
return self._extra
Matt Mackall
contexts: add working dir and working file contexts...
r3217
Matt Mackall
context: add tags() method
r4663 def tags(self):
t = []
[t.extend(p.tags()) for p in self.parents()]
return t
Matt Mackall
contexts: add working dir and working file contexts...
r3217 def children(self):
return []
Matt Mackall
simplify flag handling...
r6743 def flags(self, path):
Patrick Mezard
context: add fileflags() to avoid rebuilding manifests
r5389 if '_manifest' in self.__dict__:
try:
return self._manifest.flags(path)
except KeyError:
return ''
Thomas Arendsen Hein
Removed tabs and trailing whitespace in python files
r5760
Patrick Mezard
context: add fileflags() to avoid rebuilding manifests
r5389 pnode = self._parents[0].changeset()[0]
Patrick Mezard
Fix workingctx exec/link bit of copies on non-supporting systems
r5407 orig = self._repo.dirstate.copies().get(path, path)
node, flag = self._repo.manifest.find(pnode, orig)
Patrick Mezard
context: add fileflags() to avoid rebuilding manifests
r5389 try:
Matt Mackall
simplify flag handling...
r6743 ff = self._repo.dirstate.flagfunc(lambda x: flag or '')
return ff(path)
Patrick Mezard
context: add fileflags() to avoid rebuilding manifests
r5389 except OSError:
pass
if not node or path in self.deleted() or path in self.removed():
return ''
return flag
Benoit Boissinot
context: create a filectxt with filelog reuse
r3966 def filectx(self, path, filelog=None):
Matt Mackall
contexts: add working dir and working file contexts...
r3217 """get a file context from the working directory"""
Benoit Boissinot
context: create a filectxt with filelog reuse
r3966 return workingfilectx(self._repo, path, workingctx=self,
filelog=filelog)
Matt Mackall
contexts: add working dir and working file contexts...
r3217
def ancestor(self, c2):
"""return the ancestor context of self and c2"""
return self._parents[0].ancestor(c2) # punt on two parents for now
Matt Mackall
context: add walk method
r6764 def walk(self, match):
Augie Fackler
dirstate: don't check state of subrepo directories
r10176 return sorted(self._repo.dirstate.walk(match, self.substate.keys(),
True, False))
Matt Mackall
context: add walk method
r6764
Matt Mackall
context: add a dirty method to detect modified contexts
r8717 def dirty(self, missing=False):
"check whether a working directory is modified"
return (self.p2() or self.branch() != self.p1().branch() or
self.modified() or self.added() or self.removed() or
(missing and self.deleted()))
Matt Mackall
contexts: add working dir and working file contexts...
r3217 class workingfilectx(filectx):
"""A workingfilectx object makes access to data related to a particular
file in the working directory convenient."""
def __init__(self, repo, path, filelog=None, workingctx=None):
"""changeid can be a changeset revision, node, or tag.
fileid can be a file revision or node."""
self._repo = repo
self._path = path
self._changeid = None
self._filerev = self._filenode = None
if filelog:
self._filelog = filelog
if workingctx:
self._changectx = workingctx
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _changectx(self):
return workingctx(self._repo)
Matt Mackall
contexts: add working dir and working file contexts...
r3217 def __nonzero__(self):
return True
def __str__(self):
Matt Mackall
context: change workingctx str() from . to <node>+
r3313 return "%s@%s" % (self.path(), self._changectx)
Matt Mackall
contexts: add working dir and working file contexts...
r3217
Matt Mackall
many, many trivial check-code fixups
r10282 def data(self):
return self._repo.wread(self._path)
Matt Mackall
contexts: add working dir and working file contexts...
r3217 def renamed(self):
Benoit Boissinot
workingfilectx: always use the same filelog, even for renames...
r8528 rp = self._repo.dirstate.copied(self._path)
if not rp:
Matt Mackall
contexts: add working dir and working file contexts...
r3217 return None
Benoit Boissinot
context: fix a bug in workingfilectx.renamed
r3965 return rp, self._changectx._parents[0]._manifest.get(rp, nullid)
Matt Mackall
contexts: add working dir and working file contexts...
r3217
def parents(self):
'''return parent filectxs, following copies if necessary'''
Benoit Boissinot
workingfilectx: always use the same filelog, even for renames...
r8528 def filenode(ctx, path):
return ctx._manifest.get(path, nullid)
path = self._path
Matt Mackall
contexts: add working dir and working file contexts...
r3217 fl = self._filelog
Benoit Boissinot
workingfilectx: always use the same filelog, even for renames...
r8528 pcl = self._changectx._parents
renamed = self.renamed()
if renamed:
pl = [renamed + (None,)]
else:
pl = [(path, filenode(pcl[0], path), fl)]
for pc in pcl[1:]:
pl.append((path, filenode(pc, path), fl))
Matt Mackall
contexts: add working dir and working file contexts...
r3217
Thomas Arendsen Hein
white space and line break cleanups
r3673 return [filectx(self._repo, p, fileid=n, filelog=l)
Matt Mackall
many, many trivial check-code fixups
r10282 for p, n, l in pl if n != nullid]
Matt Mackall
contexts: add working dir and working file contexts...
r3217
def children(self):
return []
Matt Mackall
many, many trivial check-code fixups
r10282 def size(self):
return os.stat(self._repo.wjoin(self._path)).st_size
Benoit Boissinot
add date attribute to workingfilectx
r3962 def date(self):
t, tz = self._changectx.date()
try:
Thomas Arendsen Hein
Use only integer part of mtime in workingfilectx.date(), fixes test-context.py...
r4117 return (int(os.lstat(self._repo.wjoin(self._path)).st_mtime), tz)
Benoit Boissinot
add date attribute to workingfilectx
r3962 except OSError, err:
Matt Mackall
many, many trivial check-code fixups
r10282 if err.errno != errno.ENOENT:
raise
Benoit Boissinot
add date attribute to workingfilectx
r3962 return (t, tz)
Matt Mackall
context: add cmp for filectxs
r3310
Matt Mackall
many, many trivial check-code fixups
r10282 def cmp(self, text):
return self._repo.wread(self._path) == text
Patrick Mezard
context: add memctx for memory commits
r6715
class memctx(object):
Patrick Mezard
context: improve memctx documentation
r7077 """Use memctx to perform in-memory commits via localrepo.commitctx().
Patrick Mezard
context: add memctx for memory commits
r6715
Patrick Mezard
context: improve memctx documentation
r7077 Revision information is supplied at initialization time while
related files data and is made available through a callback
mechanism. 'repo' is the current localrepo, 'parents' is a
sequence of two parent revisions identifiers (pass None for every
missing parent), 'text' is the commit message and 'files' lists
names of files touched by the revision (normalized and relative to
repository root).
Patrick Mezard
context: add memctx for memory commits
r6715
Patrick Mezard
context: improve memctx documentation
r7077 filectxfn(repo, memctx, path) is a callable receiving the
repository, the current memctx object and the normalized path of
requested file, relative to repository root. It is fired by the
commit function for every file in 'files', but calls order is
undefined. If the file is available in the revision being
committed (updated or added), filectxfn returns a memfilectx
object. If the file was removed, filectxfn raises an
IOError. Moved files are represented by marking the source file
removed and the new file added with copy information (see
memfilectx).
user receives the committer name and defaults to current
repository username, date is the commit date in any format
supported by util.parsedate() and defaults to current date, extra
is a dictionary of metadata or is left empty.
Patrick Mezard
context: add memctx for memory commits
r6715 """
Dirkjan Ochtman
kill some trailing spaces
r6721 def __init__(self, repo, parents, text, files, filectxfn, user=None,
Patrick Mezard
context: add memctx for memory commits
r6715 date=None, extra=None):
self._repo = repo
self._rev = None
self._node = None
self._text = text
self._date = date and util.parsedate(date) or util.makedate()
Patrick Mezard
context: trigger missing username warning only when necessary
r6809 self._user = user
Patrick Mezard
context: add memctx for memory commits
r6715 parents = [(p or nullid) for p in parents]
p1, p2 = parents
Matt Mackall
use repo[changeid] to get a changectx
r6747 self._parents = [changectx(self._repo, p) for p in (p1, p2)]
Matt Mackall
replace util.sort with sorted built-in...
r8209 files = sorted(set(files))
Patrick Mezard
context: add memctx for memory commits
r6715 self._status = [files, [], [], [], []]
self._filectxfn = filectxfn
self._extra = extra and extra.copy() or {}
if 'branch' not in self._extra:
self._extra['branch'] = 'default'
elif self._extra.get('branch') == '':
self._extra['branch'] = 'default'
def __str__(self):
return str(self._parents[0]) + "+"
Matt Mackall
context: add __int__ and hex methods
r6763 def __int__(self):
return self._rev
Patrick Mezard
context: add memctx for memory commits
r6715 def __nonzero__(self):
return True
Matt Mackall
filecommit: swallow some bits from _commitctx, add _
r8401 def __getitem__(self, key):
return self.filectx(key)
Matt Mackall
many, many trivial check-code fixups
r10282 def p1(self):
return self._parents[0]
def p2(self):
return self._parents[1]
Matt Mackall
context: add p1 and p2 methods
r8406
Matt Mackall
many, many trivial check-code fixups
r10282 def user(self):
return self._user or self._repo.ui.username()
def date(self):
return self._date
def description(self):
return self._text
def files(self):
return self.modified()
def modified(self):
return self._status[0]
def added(self):
return self._status[1]
def removed(self):
return self._status[2]
def deleted(self):
return self._status[3]
def unknown(self):
return self._status[4]
def clean(self):
return self._status[5]
def branch(self):
return self._extra['branch']
def extra(self):
return self._extra
def flags(self, f):
return self[f].flags()
Patrick Mezard
context: add memctx for memory commits
r6715
def parents(self):
"""return contexts for each parent changeset"""
return self._parents
def filectx(self, path, filelog=None):
"""get a file context from the working directory"""
return self._filectxfn(self._repo, self, path)
class memfilectx(object):
Patrick Mezard
context: improve memctx documentation
r7077 """memfilectx represents an in-memory file to commit.
See memctx for more details.
Patrick Mezard
context: add memctx for memory commits
r6715 """
def __init__(self, path, data, islink, isexec, copied):
Patrick Mezard
context: improve memctx documentation
r7077 """
path is the normalized file path relative to repository root.
data is the file content as a string.
islink is True if the file is a symbolic link.
isexec is True if the file is executable.
copied is the source file path if current file was copied in the
revision being committed, or None."""
Patrick Mezard
context: add memctx for memory commits
r6715 self._path = path
self._data = data
self._flags = (islink and 'l' or '') + (isexec and 'x' or '')
self._copied = None
if copied:
self._copied = (copied, nullid)
Matt Mackall
many, many trivial check-code fixups
r10282 def __nonzero__(self):
return True
def __str__(self):
return "%s@%s" % (self.path(), self._changectx)
def path(self):
return self._path
def data(self):
return self._data
def flags(self):
return self._flags
def isexec(self):
return 'x' in self._flags
def islink(self):
return 'l' in self._flags
def renamed(self):
return self._copied