context.py
1088 lines
| 34.5 KiB
| text/x-python
|
PythonLexer
/ mercurial / context.py
|
r2563 | # context.py - changeset and file context objects for mercurial | ||
# | ||||
|
r4635 | # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com> | ||
|
r2563 | # | ||
|
r8225 | # This software may be used and distributed according to the terms of the | ||
|
r10263 | # GNU General Public License version 2 or any later version. | ||
|
r2563 | |||
|
r6763 | from node import nullid, nullrev, short, hex | ||
|
r3891 | from i18n import _ | ||
|
r11097 | import ancestor, bdiff, error, util, subrepo, patch | ||
|
r11303 | import os, errno, stat | ||
|
r3122 | |||
|
r8207 | propertycache = util.propertycache | ||
|
r7368 | |||
|
r2563 | class changectx(object): | ||
"""A changecontext object makes access to data related to a particular | ||||
changeset convenient.""" | ||||
|
r6741 | def __init__(self, repo, changeid=''): | ||
|
r2563 | """changeid is a revision number, node, or tag""" | ||
|
r6741 | if changeid == '': | ||
changeid = '.' | ||||
|
r2563 | self._repo = repo | ||
|
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) | ||||
|
r2563 | |||
|
r3166 | def __str__(self): | ||
return short(self.node()) | ||||
|
r6763 | def __int__(self): | ||
return self.rev() | ||||
|
r3151 | def __repr__(self): | ||
|
r3216 | return "<changectx %s>" % str(self) | ||
|
r3151 | |||
|
r6469 | def __hash__(self): | ||
try: | ||||
return hash(self._rev) | ||||
except AttributeError: | ||||
return id(self) | ||||
|
r3165 | def __eq__(self, other): | ||
|
r3715 | try: | ||
return self._rev == other._rev | ||||
except AttributeError: | ||||
return False | ||||
|
r3165 | |||
|
r4748 | def __ne__(self, other): | ||
return not (self == other) | ||||
|
r3168 | def __nonzero__(self): | ||
|
r3578 | return self._rev != nullrev | ||
|
r3168 | |||
|
r8157 | @propertycache | ||
|
r7368 | def _changeset(self): | ||
return self._repo.changelog.read(self.node()) | ||||
|
r8157 | @propertycache | ||
|
r7368 | def _manifest(self): | ||
return self._repo.manifest.read(self._changeset[0]) | ||||
|
r8157 | @propertycache | ||
|
r7368 | def _manifestdelta(self): | ||
return self._repo.manifest.readdelta(self._changeset[0]) | ||||
|
r8157 | @propertycache | ||
|
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] | ||||
|
r3215 | |||
|
r8812 | @propertycache | ||
def substate(self): | ||||
|
r11775 | return subrepo.state(self, self._repo.ui) | ||
|
r8812 | |||
|
r4909 | def __contains__(self, key): | ||
return key in self._manifest | ||||
def __getitem__(self, key): | ||||
return self.filectx(key) | ||||
def __iter__(self): | ||||
|
r8209 | for f in sorted(self._manifest): | ||
|
r5485 | yield f | ||
|
r4909 | |||
|
r10282 | def changeset(self): | ||
return self._changeset | ||||
def manifest(self): | ||||
return self._manifest | ||||
def manifestnode(self): | ||||
return self._changeset[0] | ||||
|
r2563 | |||
|
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) | ||||
|
r2563 | |||
def parents(self): | ||||
"""return contexts for each parent changeset""" | ||||
|
r6742 | return self._parents | ||
|
r2563 | |||
|
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) | ||||
|
r2563 | def children(self): | ||
"""return contexts for each child changeset""" | ||||
|
r2627 | c = self._repo.changelog.children(self._node) | ||
|
r3673 | return [changectx(self._repo, x) for x in c] | ||
|
r2563 | |||
|
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) | ||||
|
r5389 | def _fileinfo(self, path): | ||
|
r3336 | if '_manifest' in self.__dict__: | ||
|
r3242 | try: | ||
|
r5389 | return self._manifest[path], self._manifest.flags(path) | ||
|
r3242 | except KeyError: | ||
|
r7633 | raise error.LookupError(self._node, path, | ||
_('not found in manifest')) | ||||
|
r3337 | if '_manifestdelta' in self.__dict__ or path in self.files(): | ||
if path in self._manifestdelta: | ||||
|
r5389 | return self._manifestdelta[path], self._manifestdelta.flags(path) | ||
|
r3215 | node, flag = self._repo.manifest.find(self._changeset[0], path) | ||
|
r3242 | if not node: | ||
|
r7633 | raise error.LookupError(self._node, path, | ||
_('not found in manifest')) | ||||
|
r3242 | |||
|
r5389 | return node, flag | ||
def filenode(self, path): | ||||
return self._fileinfo(path)[0] | ||||
|
r6743 | def flags(self, path): | ||
|
r5389 | try: | ||
return self._fileinfo(path)[1] | ||||
|
r7633 | except error.LookupError: | ||
|
r5389 | return '' | ||
|
r2563 | |||
|
r3966 | def filectx(self, path, fileid=None, filelog=None): | ||
|
r2563 | """get a file context from this changeset""" | ||
|
r2628 | if fileid is None: | ||
fileid = self.filenode(path) | ||||
|
r3966 | return filectx(self._repo, path, fileid=fileid, | ||
changectx=self, filelog=filelog) | ||||
|
r2563 | |||
|
r3125 | def ancestor(self, c2): | ||
""" | ||||
return the ancestor context of self and c2 | ||||
""" | ||||
|
r9843 | # deal with workingctxs | ||
n2 = c2._node | ||||
if n2 == None: | ||||
n2 = c2._parents[0]._node | ||||
n = self._repo.changelog.ancestor(self._node, n2) | ||||
|
r3125 | return changectx(self._repo, n) | ||
|
r6764 | def walk(self, match): | ||
|
r8380 | fset = set(match.files()) | ||
|
r6764 | # for dirstate.walk, files=['.'] means "walk the whole tree". | ||
# follow that here, too | ||||
|
r8380 | fset.discard('.') | ||
|
r6764 | for fn in self: | ||
|
r8380 | for ffn in fset: | ||
|
r6764 | # match if the file is the exact name or a directory | ||
if ffn == fn or fn.startswith("%s/" % ffn): | ||||
|
r8380 | fset.remove(ffn) | ||
|
r6764 | break | ||
if match(fn): | ||||
yield fn | ||||
|
r8380 | for fn in sorted(fset): | ||
|
r6764 | if match.bad(fn, 'No such file in rev ' + str(self)) and match(fn): | ||
yield fn | ||||
|
r8813 | def sub(self, path): | ||
return subrepo.subrepo(self, path) | ||||
|
r11106 | def diff(self, ctx2=None, match=None, **opts): | ||
|
r11097 | """Returns a diff generator for the given contexts and matcher""" | ||
if ctx2 is None: | ||||
ctx2 = self.p1() | ||||
if ctx2 is not None and not isinstance(ctx2, changectx): | ||||
ctx2 = self._repo[ctx2] | ||||
|
r11105 | diffopts = patch.diffopts(self._repo.ui, opts) | ||
return patch.diff(self._repo, ctx2.node(), self.node(), | ||||
match=match, opts=diffopts) | ||||
|
r11097 | |||
|
r2563 | class filectx(object): | ||
"""A filecontext object makes access to data related to a particular | ||||
filerevision convenient.""" | ||||
|
r3214 | def __init__(self, repo, path, changeid=None, fileid=None, | ||
filelog=None, changectx=None): | ||||
|
r2563 | """changeid can be a changeset revision, node, or tag. | ||
fileid can be a file revision or node.""" | ||||
self._repo = repo | ||||
self._path = path | ||||
|
r3964 | assert (changeid is not None | ||
or fileid is not None | ||||
|
r9024 | or changectx is not None), \ | ||
("bad args: changeid=%r, fileid=%r, changectx=%r" | ||||
% (changeid, fileid, changectx)) | ||||
|
r2643 | |||
|
r3124 | if filelog: | ||
self._filelog = filelog | ||||
|
r5810 | if changeid is not None: | ||
self._changeid = changeid | ||||
if changectx is not None: | ||||
self._changectx = changectx | ||||
if fileid is not None: | ||||
|
r3213 | self._fileid = fileid | ||
|
r2563 | |||
|
r8157 | @propertycache | ||
|
r7368 | def _changectx(self): | ||
return changectx(self._repo, self._changeid) | ||||
|
r8157 | @propertycache | ||
|
r7368 | def _filelog(self): | ||
return self._repo.file(self._path) | ||||
|
r8157 | @propertycache | ||
|
r7368 | def _changeid(self): | ||
if '_changectx' in self.__dict__: | ||||
return self._changectx.rev() | ||||
|
r3144 | else: | ||
|
r7368 | return self._filelog.linkrev(self._filerev) | ||
|
r8157 | @propertycache | ||
|
r7368 | def _filenode(self): | ||
if '_fileid' in self.__dict__: | ||||
return self._filelog.lookup(self._fileid) | ||||
else: | ||||
return self._changectx.filenode(self._path) | ||||
|
r8157 | @propertycache | ||
|
r7368 | def _filerev(self): | ||
return self._filelog.rev(self._filenode) | ||||
|
r8157 | @propertycache | ||
|
r7368 | def _repopath(self): | ||
return self._path | ||||
|
r2563 | |||
|
r3168 | def __nonzero__(self): | ||
|
r3712 | try: | ||
|
r7874 | self._filenode | ||
|
r3712 | return True | ||
|
r7633 | except error.LookupError: | ||
|
r3712 | # file is missing | ||
return False | ||||
|
r3168 | |||
|
r3166 | def __str__(self): | ||
return "%s@%s" % (self.path(), short(self.node())) | ||||
|
r3151 | def __repr__(self): | ||
|
r3216 | return "<filectx %s>" % str(self) | ||
|
r3151 | |||
|
r6469 | def __hash__(self): | ||
try: | ||||
|
r10942 | return hash((self._path, self._filenode)) | ||
|
r6469 | except AttributeError: | ||
return id(self) | ||||
|
r3165 | def __eq__(self, other): | ||
|
r3715 | try: | ||
return (self._path == other._path | ||||
|
r10942 | and self._filenode == other._filenode) | ||
|
r3715 | except AttributeError: | ||
return False | ||||
|
r3165 | |||
|
r4748 | def __ne__(self, other): | ||
return not (self == other) | ||||
|
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) | ||||
|
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 | ||||
|
r2563 | |||
|
r3150 | def rev(self): | ||
|
r3336 | if '_changectx' in self.__dict__: | ||
|
r3150 | return self._changectx.rev() | ||
|
r5810 | if '_changeid' in self.__dict__: | ||
|
r6210 | return self._changectx.rev() | ||
|
r7361 | return self._filelog.linkrev(self._filerev) | ||
|
r3150 | |||
|
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 | ||||
|
r2563 | |||
|
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) | ||||
|
r2563 | |||
|
r11702 | def cmp(self, fctx): | ||
"""compare with other file context | ||||
|
r11539 | |||
|
r11702 | returns True if different than fctx. | ||
|
r11539 | """ | ||
|
r11702 | return self._filelog.cmp(self._filenode, fctx.data()) | ||
|
r3310 | |||
|
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 | ||||
|
r7633 | except error.LookupError: | ||
|
r5811 | pass | ||
return renamed | ||||
|
r2563 | def parents(self): | ||
|
r3124 | p = self._path | ||
fl = self._filelog | ||||
|
r3673 | pl = [(p, n, fl) for n in self._filelog.parents(self._filenode)] | ||
|
r3123 | |||
|
r5813 | r = self._filelog.renamed(self._filenode) | ||
|
r3122 | if r: | ||
|
r3124 | pl[0] = (r[0], r[1], None) | ||
|
r3673 | return [filectx(self._repo, p, fileid=n, filelog=l) | ||
|
r10282 | for p, n, l in pl if n != nullid] | ||
|
r2563 | |||
def children(self): | ||||
# hard for renames | ||||
c = self._filelog.children(self._filenode) | ||||
|
r3673 | return [filectx(self._repo, self._path, fileid=x, | ||
filelog=self._filelog) for x in c] | ||||
|
r2566 | |||
|
r4856 | def annotate(self, follow=False, linenumber=None): | ||
|
r3172 | '''returns a list of tuples of (ctx, line) for each line | ||
in the file, where ctx is the filectx of the node where | ||||
|
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".''' | ||||
|
r3172 | |||
|
r4856 | def decorate_compat(text, rev): | ||
|
r3172 | return ([rev] * len(text.splitlines()), text) | ||
|
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) | ||||
|
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 | ||||
|
r9097 | getlog = util.lrucachefunc(lambda x: self._repo.file(x)) | ||
|
r3172 | def getctx(path, fileid): | ||
log = path == self._path and self._filelog or getlog(path) | ||||
return filectx(self._repo, path, fileid=fileid, filelog=log) | ||||
|
r9097 | getctx = util.lrucachefunc(getctx) | ||
|
r3172 | |||
def parents(f): | ||||
# we want to reuse filectx objects as much as possible | ||||
p = f._path | ||||
|
r3217 | if f._filerev is None: # working dir | ||
|
r3673 | pl = [(n.path(), n.filerev()) for n in f.parents()] | ||
|
r3217 | else: | ||
|
r3673 | pl = [(p, n) for n in f._filelog.parentrevs(f._filerev)] | ||
|
r3172 | |||
if follow: | ||||
r = f.renamed() | ||||
if r: | ||||
pl[0] = (r[0], getlog(r[0]).rev(r[1])) | ||||
|
r3146 | |||
|
r3578 | return [getctx(p, n) for p, n in pl if n != nullrev] | ||
|
r3217 | |||
|
r3404 | # use linkrev to find the first changeset where self appeared | ||
|
r5811 | if self.rev() != self.linkrev(): | ||
|
r3404 | base = self.filectx(self.filerev()) | ||
else: | ||||
base = self | ||||
|
r3172 | # find all ancestors | ||
|
r3404 | needed = {base: 1} | ||
visit = [base] | ||||
files = [base._path] | ||||
|
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: | ||||
|
r9973 | visit.extend(n for n in needed if n._path == f) | ||
|
r6762 | |||
|
r3172 | hist = {} | ||
|
r9973 | for f in sorted(visit, key=lambda x: x.rev()): | ||
|
r3172 | curr = decorate(f.data(), f) | ||
for p in parents(f): | ||||
|
r9974 | curr = pair(hist[p], curr) | ||
# trim the history of unneeded revs | ||||
needed[p] -= 1 | ||||
if not needed[p]: | ||||
del hist[p] | ||||
|
r3172 | hist[f] = curr | ||
|
r9136 | return zip(hist[f][0], hist[f][1].splitlines(True)) | ||
|
r3124 | |||
|
r11453 | def ancestor(self, fc2, actx=None): | ||
|
r3126 | """ | ||
find the common ancestor file context, if any, of self, and fc2 | ||||
|
r11453 | |||
If actx is given, it must be the changectx of the common ancestor | ||||
of self's and fc2's respective changesets. | ||||
|
r3126 | """ | ||
|
r11453 | if actx is None: | ||
actx = self.changectx().ancestor(fc2.changectx()) | ||||
|
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: | ||||
|
r9750 | return actx[self.path()] | ||
|
r3135 | acache = {} | ||
|
r3217 | |||
# prime the ancestor cache for the working directory | ||||
for c in (self, fc2): | ||||
|
r8527 | if c._filerev is None: | ||
|
r3673 | pl = [(n.path(), n.filenode()) for n in c.parents()] | ||
|
r3217 | acache[(c._path, None)] = pl | ||
|
r6286 | flcache = {self._repopath:self._filelog, fc2._repopath:fc2._filelog} | ||
|
r3135 | def parents(vertex): | ||
if vertex in acache: | ||||
return acache[vertex] | ||||
f, n = vertex | ||||
if f not in flcache: | ||||
|
r3126 | flcache[f] = self._repo.file(f) | ||
|
r3135 | fl = flcache[f] | ||
|
r3673 | pl = [(f, p) for p in fl.parents(n) if p != nullid] | ||
|
r3135 | re = fl.renamed(n) | ||
if re: | ||||
pl.append(re) | ||||
|
r3673 | acache[vertex] = pl | ||
|
r3135 | return pl | ||
|
r3126 | |||
|
r3135 | a, b = (self._path, self._filenode), (fc2._path, fc2._filenode) | ||
v = ancestor.ancestor(a, b, parents) | ||||
if v: | ||||
|
r3673 | f, n = v | ||
|
r3135 | return filectx(self._repo, f, fileid=n, filelog=flcache[f]) | ||
|
r3126 | |||
|
r3135 | return None | ||
|
r3217 | |||
|
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 | ||||
|
r3217 | class workingctx(changectx): | ||
"""A workingctx object makes access to data related to | ||||
|
r6705 | the current working directory convenient. | ||
|
r6709 | date - any valid date string or (unixtime, offset), or None. | ||
user - username string, or None. | ||||
|
r6708 | extra - a dictionary of extra values, or None. | ||
|
r6707 | changes - a list of file lists as returned by localrepo.status() | ||
or None to use the repository status. | ||||
|
r6705 | """ | ||
|
r10969 | def __init__(self, repo, text="", user=None, date=None, extra=None, | ||
changes=None): | ||||
|
r3217 | self._repo = repo | ||
self._rev = None | ||||
self._node = None | ||||
|
r6709 | self._text = text | ||
|
r6718 | if date: | ||
|
r6709 | self._date = util.parsedate(date) | ||
|
r6817 | if user: | ||
self._user = user | ||||
|
r6707 | if changes: | ||
|
r11101 | self._status = list(changes[:4]) | ||
self._unknown = changes[4] | ||||
|
r11099 | self._ignored = changes[5] | ||
self._clean = changes[6] | ||||
else: | ||||
|
r11101 | self._unknown = None | ||
|
r11099 | self._ignored = None | ||
self._clean = None | ||||
|
r3217 | |||
|
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' | ||||
|
r3217 | def __str__(self): | ||
|
r3313 | return str(self._parents[0]) + "+" | ||
|
r3217 | |||
def __nonzero__(self): | ||||
return True | ||||
|
r6771 | def __contains__(self, key): | ||
|
r8061 | return self._repo.dirstate[key] not in "?r" | ||
|
r6771 | |||
|
r8157 | @propertycache | ||
|
r7368 | def _manifest(self): | ||
|
r3217 | """generate a manifest corresponding to the working directory""" | ||
|
r11101 | if self._unknown is None: | ||
self.status(unknown=True) | ||||
|
r3218 | man = self._parents[0].manifest().copy() | ||
|
r3217 | copied = self._repo.dirstate.copies() | ||
|
r10921 | if len(self._parents) > 1: | ||
man2 = self.p2().manifest() | ||||
def getman(f): | ||||
if f in man: | ||||
return man | ||||
return man2 | ||||
else: | ||||
getman = lambda f: man | ||||
def cf(f): | ||||
f = copied.get(f, f) | ||||
return getman(f).flags(f) | ||||
|
r6743 | ff = self._repo.dirstate.flagfunc(cf) | ||
|
r11101 | modified, added, removed, deleted = self._status | ||
unknown = self._unknown | ||||
|
r3673 | for i, l in (("a", added), ("m", modified), ("u", unknown)): | ||
|
r3217 | for f in l: | ||
|
r10921 | orig = copied.get(f, f) | ||
man[f] = getman(orig).get(orig, nullid) + i | ||||
|
r3823 | try: | ||
|
r6743 | man.set(f, ff(f)) | ||
|
r3823 | except OSError: | ||
pass | ||||
|
r3217 | |||
for f in deleted + removed: | ||||
|
r3325 | if f in man: | ||
del man[f] | ||||
|
r3217 | |||
|
r7368 | return man | ||
|
r8157 | @propertycache | ||
|
r7368 | def _status(self): | ||
|
r11101 | return self._repo.status()[:4] | ||
|
r7368 | |||
|
r8157 | @propertycache | ||
|
r7368 | def _user(self): | ||
return self._repo.ui.username() | ||||
|
r8157 | @propertycache | ||
|
r7368 | def _date(self): | ||
return util.makedate() | ||||
|
r8157 | @propertycache | ||
|
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 | ||||
|
r3217 | |||
|
r11098 | def status(self, ignored=False, clean=False, unknown=False): | ||
"""Explicit status query | ||||
Unless this method is used to query the working copy status, the | ||||
_status property will implicitly read the status using its default | ||||
arguments.""" | ||||
|
r11099 | stat = self._repo.status(ignored=ignored, clean=clean, unknown=unknown) | ||
|
r11101 | self._unknown = self._ignored = self._clean = None | ||
if unknown: | ||||
self._unknown = stat[4] | ||||
if ignored: | ||||
self._ignored = stat[5] | ||||
if clean: | ||||
self._clean = stat[6] | ||||
self._status = stat[:4] | ||||
return stat | ||||
|
r11098 | |||
|
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 | ||||
|
r3217 | def files(self): | ||
|
r8209 | return sorted(self._status[0] + self._status[1] + self._status[2]) | ||
|
r3217 | |||
|
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): | ||||
|
r11101 | assert self._unknown is not None # must call status first | ||
return self._unknown | ||||
|
r11098 | def ignored(self): | ||
|
r11100 | assert self._ignored is not None # must call status first | ||
|
r11099 | return self._ignored | ||
|
r10282 | def clean(self): | ||
|
r11100 | assert self._clean is not None # must call status first | ||
|
r11099 | return self._clean | ||
|
r10282 | def branch(self): | ||
return self._extra['branch'] | ||||
def extra(self): | ||||
return self._extra | ||||
|
r3217 | |||
|
r4663 | def tags(self): | ||
t = [] | ||||
[t.extend(p.tags()) for p in self.parents()] | ||||
return t | ||||
|
r3217 | def children(self): | ||
return [] | ||||
|
r6743 | def flags(self, path): | ||
|
r5389 | if '_manifest' in self.__dict__: | ||
try: | ||||
return self._manifest.flags(path) | ||||
except KeyError: | ||||
return '' | ||||
|
r5760 | |||
|
r5407 | orig = self._repo.dirstate.copies().get(path, path) | ||
|
r5389 | |||
|
r10921 | def findflag(ctx): | ||
mnode = ctx.changeset()[0] | ||||
node, flag = self._repo.manifest.find(mnode, orig) | ||||
|
r11143 | ff = self._repo.dirstate.flagfunc(lambda x: flag or '') | ||
|
r10921 | try: | ||
|
r10927 | return ff(path) | ||
|
r10921 | except OSError: | ||
pass | ||||
flag = findflag(self._parents[0]) | ||||
if flag is None and len(self.parents()) > 1: | ||||
flag = findflag(self._parents[1]) | ||||
if flag is None or self._repo.dirstate[path] == 'r': | ||||
|
r5389 | return '' | ||
return flag | ||||
|
r3966 | def filectx(self, path, filelog=None): | ||
|
r3217 | """get a file context from the working directory""" | ||
|
r3966 | return workingfilectx(self._repo, path, workingctx=self, | ||
filelog=filelog) | ||||
|
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 | ||||
|
r6764 | def walk(self, match): | ||
|
r10176 | return sorted(self._repo.dirstate.walk(match, self.substate.keys(), | ||
True, False)) | ||||
|
r6764 | |||
|
r8717 | def dirty(self, missing=False): | ||
"check whether a working directory is modified" | ||||
|
r11110 | # check subrepos first | ||
for s in self.substate: | ||||
if self.sub(s).dirty(): | ||||
return True | ||||
# check current working dir | ||||
|
r8717 | return (self.p2() or self.branch() != self.p1().branch() or | ||
self.modified() or self.added() or self.removed() or | ||||
(missing and self.deleted())) | ||||
|
r11303 | def add(self, list): | ||
wlock = self._repo.wlock() | ||||
ui, ds = self._repo.ui, self._repo.dirstate | ||||
try: | ||||
rejected = [] | ||||
for f in list: | ||||
p = self._repo.wjoin(f) | ||||
try: | ||||
st = os.lstat(p) | ||||
except: | ||||
ui.warn(_("%s does not exist!\n") % f) | ||||
rejected.append(f) | ||||
continue | ||||
if st.st_size > 10000000: | ||||
ui.warn(_("%s: up to %d MB of RAM may be required " | ||||
"to manage this file\n" | ||||
"(use 'hg revert %s' to cancel the " | ||||
"pending addition)\n") | ||||
% (f, 3 * st.st_size // 1000000, f)) | ||||
if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)): | ||||
ui.warn(_("%s not added: only files and symlinks " | ||||
"supported currently\n") % f) | ||||
rejected.append(p) | ||||
elif ds[f] in 'amn': | ||||
ui.warn(_("%s already tracked!\n") % f) | ||||
elif ds[f] == 'r': | ||||
ds.normallookup(f) | ||||
else: | ||||
ds.add(f) | ||||
return rejected | ||||
finally: | ||||
wlock.release() | ||||
def forget(self, list): | ||||
wlock = self._repo.wlock() | ||||
try: | ||||
for f in list: | ||||
if self._repo.dirstate[f] != 'a': | ||||
self._repo.ui.warn(_("%s not added!\n") % f) | ||||
else: | ||||
self._repo.dirstate.forget(f) | ||||
finally: | ||||
wlock.release() | ||||
def remove(self, list, unlink=False): | ||||
if unlink: | ||||
for f in list: | ||||
try: | ||||
util.unlink(self._repo.wjoin(f)) | ||||
except OSError, inst: | ||||
if inst.errno != errno.ENOENT: | ||||
raise | ||||
wlock = self._repo.wlock() | ||||
try: | ||||
for f in list: | ||||
if unlink and os.path.exists(self._repo.wjoin(f)): | ||||
self._repo.ui.warn(_("%s still exists!\n") % f) | ||||
elif self._repo.dirstate[f] == 'a': | ||||
self._repo.dirstate.forget(f) | ||||
elif f not in self._repo.dirstate: | ||||
self._repo.ui.warn(_("%s not tracked!\n") % f) | ||||
else: | ||||
self._repo.dirstate.remove(f) | ||||
finally: | ||||
wlock.release() | ||||
def undelete(self, list): | ||||
pctxs = self.parents() | ||||
wlock = self._repo.wlock() | ||||
try: | ||||
for f in list: | ||||
if self._repo.dirstate[f] != 'r': | ||||
self._repo.ui.warn(_("%s not removed!\n") % f) | ||||
else: | ||||
fctx = f in pctxs[0] and pctxs[0] or pctxs[1] | ||||
t = fctx.data() | ||||
self._repo.wwrite(f, t, fctx.flags()) | ||||
self._repo.dirstate.normal(f) | ||||
finally: | ||||
wlock.release() | ||||
def copy(self, source, dest): | ||||
p = self._repo.wjoin(dest) | ||||
if not (os.path.exists(p) or os.path.islink(p)): | ||||
self._repo.ui.warn(_("%s does not exist!\n") % dest) | ||||
elif not (os.path.isfile(p) or os.path.islink(p)): | ||||
self._repo.ui.warn(_("copy failed: %s is not a file or a " | ||||
"symbolic link\n") % dest) | ||||
else: | ||||
wlock = self._repo.wlock() | ||||
try: | ||||
if self._repo.dirstate[dest] in '?r': | ||||
self._repo.dirstate.add(dest) | ||||
self._repo.dirstate.copy(source, dest) | ||||
finally: | ||||
wlock.release() | ||||
|
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 | ||||
|
r8157 | @propertycache | ||
|
r7368 | def _changectx(self): | ||
return workingctx(self._repo) | ||||
|
r3217 | def __nonzero__(self): | ||
return True | ||||
def __str__(self): | ||||
|
r3313 | return "%s@%s" % (self.path(), self._changectx) | ||
|
r3217 | |||
|
r10282 | def data(self): | ||
return self._repo.wread(self._path) | ||||
|
r3217 | def renamed(self): | ||
|
r8528 | rp = self._repo.dirstate.copied(self._path) | ||
if not rp: | ||||
|
r3217 | return None | ||
|
r3965 | return rp, self._changectx._parents[0]._manifest.get(rp, nullid) | ||
|
r3217 | |||
def parents(self): | ||||
'''return parent filectxs, following copies if necessary''' | ||||
|
r8528 | def filenode(ctx, path): | ||
return ctx._manifest.get(path, nullid) | ||||
path = self._path | ||||
|
r3217 | fl = self._filelog | ||
|
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)) | ||||
|
r3217 | |||
|
r3673 | return [filectx(self._repo, p, fileid=n, filelog=l) | ||
|
r10282 | for p, n, l in pl if n != nullid] | ||
|
r3217 | |||
def children(self): | ||||
return [] | ||||
|
r10282 | def size(self): | ||
|
r11605 | return os.lstat(self._repo.wjoin(self._path)).st_size | ||
|
r3962 | def date(self): | ||
t, tz = self._changectx.date() | ||||
try: | ||||
|
r4117 | return (int(os.lstat(self._repo.wjoin(self._path)).st_mtime), tz) | ||
|
r3962 | except OSError, err: | ||
|
r10282 | if err.errno != errno.ENOENT: | ||
raise | ||||
|
r3962 | return (t, tz) | ||
|
r3310 | |||
|
r11702 | def cmp(self, fctx): | ||
"""compare with other file context | ||||
|
r11539 | |||
|
r11702 | returns True if different than fctx. | ||
|
r11539 | """ | ||
|
r11703 | # fctx should be a filectx (not a wfctx) | ||
# invert comparison to reuse the same code path | ||||
return fctx.cmp(self) | ||||
|
r6715 | |||
class memctx(object): | ||||
|
r7077 | """Use memctx to perform in-memory commits via localrepo.commitctx(). | ||
|
r6715 | |||
|
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). | ||||
|
r6715 | |||
|
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. | ||||
|
r6715 | """ | ||
|
r6721 | def __init__(self, repo, parents, text, files, filectxfn, user=None, | ||
|
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() | ||||
|
r6809 | self._user = user | ||
|
r6715 | parents = [(p or nullid) for p in parents] | ||
p1, p2 = parents | ||||
|
r6747 | self._parents = [changectx(self._repo, p) for p in (p1, p2)] | ||
|
r8209 | files = sorted(set(files)) | ||
|
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]) + "+" | ||||
|
r6763 | def __int__(self): | ||
return self._rev | ||||
|
r6715 | def __nonzero__(self): | ||
return True | ||||
|
r8401 | def __getitem__(self, key): | ||
return self.filectx(key) | ||||
|
r10282 | def p1(self): | ||
return self._parents[0] | ||||
def p2(self): | ||||
return self._parents[1] | ||||
|
r8406 | |||
|
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] | ||||
|
r11098 | def ignored(self): | ||
return self._status[5] | ||||
|
r10282 | def clean(self): | ||
|
r11098 | return self._status[6] | ||
|
r10282 | def branch(self): | ||
return self._extra['branch'] | ||||
def extra(self): | ||||
return self._extra | ||||
def flags(self, f): | ||||
return self[f].flags() | ||||
|
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) | ||||
|
r11151 | def commit(self): | ||
"""commit context to the repo""" | ||||
return self._repo.commitctx(self) | ||||
|
r6715 | class memfilectx(object): | ||
|
r7077 | """memfilectx represents an in-memory file to commit. | ||
See memctx for more details. | ||||
|
r6715 | """ | ||
|
r11151 | def __init__(self, path, data, islink=False, isexec=False, copied=None): | ||
|
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.""" | ||||
|
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) | ||||
|
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 | ||||