context.py
3021 lines
| 95.7 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 | |||
|
r27506 | from __future__ import absolute_import | ||
import errno | ||||
|
r34686 | import filecmp | ||
|
r27506 | import os | ||
import stat | ||||
|
r26604 | |||
|
r27506 | from .i18n import _ | ||
from .node import ( | ||||
|
r30361 | addednodeid, | ||
|
r27506 | hex, | ||
|
r30361 | modifiednodeid, | ||
|
r27506 | nullid, | ||
nullrev, | ||||
short, | ||||
|
r37466 | wdirfilenodeids, | ||
|
r42133 | wdirhex, | ||
|
r27506 | ) | ||
|
r43359 | from .pycompat import ( | ||
getattr, | ||||
open, | ||||
) | ||||
|
r27506 | from . import ( | ||
r42935 | copies, | |||
|
r36935 | dagop, | ||
|
r27506 | encoding, | ||
error, | ||||
fileset, | ||||
match as matchmod, | ||||
obsolete as obsmod, | ||||
patch, | ||||
|
r33501 | pathutil, | ||
|
r27506 | phases, | ||
|
r31343 | pycompat, | ||
|
r27506 | repoview, | ||
scmutil, | ||||
|
r33353 | sparse, | ||
|
r27506 | subrepo, | ||
|
r36026 | subrepoutil, | ||
|
r27506 | util, | ||
) | ||||
|
r37102 | from .utils import ( | ||
dateutil, | ||||
stringutil, | ||||
) | ||||
|
r3122 | |||
|
r8207 | propertycache = util.propertycache | ||
|
r7368 | |||
|
r43346 | |||
|
r19537 | class basectx(object): | ||
"""A basectx object represents the common logic for its children: | ||||
changectx: read-only context that is already present in the repo, | ||||
workingctx: a context that represents the working directory and can | ||||
be committed, | ||||
memctx: a context that represents changes in-memory and can also | ||||
be committed.""" | ||||
|
r37192 | def __init__(self, repo): | ||
self._repo = repo | ||||
|
r31344 | def __bytes__(self): | ||
|
r19540 | return short(self.node()) | ||
|
r33022 | __str__ = encoding.strmethod(__bytes__) | ||
|
r19546 | def __repr__(self): | ||
|
r43809 | return "<%s %s>" % (type(self).__name__, str(self)) | ||
|
r19546 | |||
|
r19547 | def __eq__(self, other): | ||
try: | ||||
return type(self) == type(other) and self._rev == other._rev | ||||
except AttributeError: | ||||
return False | ||||
|
r19548 | def __ne__(self, other): | ||
return not (self == other) | ||||
|
r19550 | def __contains__(self, key): | ||
return key in self._manifest | ||||
|
r19551 | def __getitem__(self, key): | ||
return self.filectx(key) | ||||
|
r19552 | def __iter__(self): | ||
|
r24227 | return iter(self._manifest) | ||
|
r19552 | |||
|
r31261 | def _buildstatusmanifest(self, status): | ||
"""Builds a manifest that includes the given status results, if this is | ||||
a working copy context. For non-working copy contexts, it just returns | ||||
the normal manifest.""" | ||||
return self.manifest() | ||||
|
r21880 | |||
|
r23237 | def _matchstatus(self, other, match): | ||
|
r33937 | """This internal method provides a way for child objects to override the | ||
|
r21481 | match operator. | ||
""" | ||||
|
r33937 | return match | ||
|
r21481 | |||
|
r43346 | def _buildstatus( | ||
self, other, s, match, listignored, listclean, listunknown | ||||
): | ||||
|
r21471 | """build a status with respect to another context""" | ||
|
r23257 | # Load earliest manifest first for caching reasons. More specifically, | ||
# if you have revisions 1000 and 1001, 1001 is probably stored as a | ||||
# delta against 1000. Thus, if you read 1000 first, we'll reconstruct | ||||
# 1000 and cache it so that when you read 1001, we just need to apply a | ||||
# delta to what's in the cache. So that's one full reconstruction + one | ||||
# delta application. | ||||
|
r31260 | mf2 = None | ||
|
r23238 | if self.rev() is not None and self.rev() < other.rev(): | ||
|
r31261 | mf2 = self._buildstatusmanifest(s) | ||
mf1 = other._buildstatusmanifest(s) | ||||
|
r31260 | if mf2 is None: | ||
|
r31261 | mf2 = self._buildstatusmanifest(s) | ||
|
r21471 | |||
|
r23755 | modified, added = [], [] | ||
removed = [] | ||||
|
r23757 | clean = [] | ||
|
r23304 | deleted, unknown, ignored = s.deleted, s.unknown, s.ignored | ||
|
r23085 | deletedset = set(deleted) | ||
|
r31261 | d = mf1.diff(mf2, match=match, clean=listclean) | ||
|
r43376 | for fn, value in pycompat.iteritems(d): | ||
|
r23731 | if fn in deletedset: | ||
continue | ||||
|
r23757 | if value is None: | ||
clean.append(fn) | ||||
continue | ||||
(node1, flag1), (node2, flag2) = value | ||||
|
r23755 | if node1 is None: | ||
added.append(fn) | ||||
elif node2 is None: | ||||
removed.append(fn) | ||||
|
r27749 | elif flag1 != flag2: | ||
modified.append(fn) | ||||
|
r37466 | elif node2 not in wdirfilenodeids: | ||
|
r27748 | # When comparing files between two commits, we save time by | ||
# not comparing the file contents when the nodeids differ. | ||||
# Note that this means we incorrectly report a reverted change | ||||
# to a file as a modification. | ||||
|
r27747 | modified.append(fn) | ||
|
r23755 | elif self[fn].cmp(other[fn]): | ||
modified.append(fn) | ||||
|
r23731 | else: | ||
|
r23757 | clean.append(fn) | ||
|
r23755 | |||
|
r21971 | if removed: | ||
# need to filter files if they are already reported as removed | ||||
|
r43346 | unknown = [ | ||
fn | ||||
for fn in unknown | ||||
if fn not in mf1 and (not match or match(fn)) | ||||
] | ||||
ignored = [ | ||||
fn | ||||
for fn in ignored | ||||
if fn not in mf1 and (not match or match(fn)) | ||||
] | ||||
|
r23730 | # if they're deleted, don't report them as removed | ||
removed = [fn for fn in removed if fn not in deletedset] | ||||
|
r21471 | |||
|
r43346 | return scmutil.status( | ||
modified, added, removed, deleted, unknown, ignored, clean | ||||
) | ||||
|
r21471 | |||
|
r19549 | @propertycache | ||
def substate(self): | ||||
|
r36026 | return subrepoutil.state(self, self._repo.ui) | ||
|
r19549 | |||
|
r21586 | def subrev(self, subpath): | ||
return self.substate[subpath][1] | ||||
|
r19541 | def rev(self): | ||
return self._rev | ||||
|
r43346 | |||
|
r19542 | def node(self): | ||
return self._node | ||||
|
r43346 | |||
|
r19543 | def hex(self): | ||
|
r19544 | return hex(self.node()) | ||
|
r43346 | |||
|
r19553 | def manifest(self): | ||
return self._manifest | ||||
|
r43346 | |||
|
r30344 | def manifestctx(self): | ||
return self._manifestctx | ||||
|
r43346 | |||
|
r24300 | def repo(self): | ||
return self._repo | ||||
|
r43346 | |||
|
r19554 | def phasestr(self): | ||
return phases.phasenames[self.phase()] | ||||
|
r43346 | |||
|
r19555 | def mutable(self): | ||
return self.phase() > phases.public | ||||
|
r19541 | |||
|
r38631 | def matchfileset(self, expr, badfn=None): | ||
return fileset.match(self, expr, badfn=badfn) | ||||
|
r20400 | |||
|
r19734 | def obsolete(self): | ||
"""True if the changeset is obsolete""" | ||||
|
r43347 | return self.rev() in obsmod.getrevs(self._repo, b'obsolete') | ||
|
r19734 | |||
def extinct(self): | ||||
"""True if the changeset is extinct""" | ||||
|
r43347 | return self.rev() in obsmod.getrevs(self._repo, b'extinct') | ||
|
r19734 | |||
|
r33693 | def orphan(self): | ||
r39328 | """True if the changeset is not obsolete, but its ancestor is""" | |||
|
r43347 | return self.rev() in obsmod.getrevs(self._repo, b'orphan') | ||
|
r19734 | |||
|
r33695 | def phasedivergent(self): | ||
r39328 | """True if the changeset tries to be a successor of a public changeset | |||
|
r19734 | |||
r39328 | Only non-public and non-obsolete changesets may be phase-divergent. | |||
|
r19734 | """ | ||
|
r43347 | return self.rev() in obsmod.getrevs(self._repo, b'phasedivergent') | ||
|
r19734 | |||
|
r33694 | def contentdivergent(self): | ||
r39328 | """Is a successor of a changeset with multiple possible successor sets | |||
|
r19734 | |||
r39328 | Only non-public and non-obsolete changesets may be content-divergent. | |||
|
r19734 | """ | ||
|
r43347 | return self.rev() in obsmod.getrevs(self._repo, b'contentdivergent') | ||
|
r19734 | |||
|
r33696 | def isunstable(self): | ||
r39328 | """True if the changeset is either orphan, phase-divergent or | |||
content-divergent""" | ||||
|
r33695 | return self.orphan() or self.phasedivergent() or self.contentdivergent() | ||
|
r19734 | |||
|
r33692 | def instabilities(self): | ||
"""return the list of instabilities affecting this changeset. | ||||
Instabilities are returned as strings. possible values are: | ||||
|
r33632 | - orphan, | ||
|
r33652 | - phase-divergent, | ||
|
r33651 | - content-divergent. | ||
|
r19734 | """ | ||
|
r33692 | instabilities = [] | ||
|
r33693 | if self.orphan(): | ||
|
r43347 | instabilities.append(b'orphan') | ||
|
r33695 | if self.phasedivergent(): | ||
|
r43347 | instabilities.append(b'phase-divergent') | ||
|
r33694 | if self.contentdivergent(): | ||
|
r43347 | instabilities.append(b'content-divergent') | ||
|
r33692 | return instabilities | ||
|
r19734 | |||
|
r19556 | def parents(self): | ||
"""return contexts for each parent changeset""" | ||||
return self._parents | ||||
|
r19557 | def p1(self): | ||
return self._parents[0] | ||||
|
r19558 | def p2(self): | ||
|
r27064 | parents = self._parents | ||
if len(parents) == 2: | ||||
return parents[1] | ||||
|
r39993 | return self._repo[nullrev] | ||
|
r19558 | |||
|
r19559 | def _fileinfo(self, path): | ||
|
r43906 | if '_manifest' in self.__dict__: | ||
|
r19559 | try: | ||
return self._manifest[path], self._manifest.flags(path) | ||||
except KeyError: | ||||
|
r43346 | raise error.ManifestLookupError( | ||
|
r43347 | self._node, path, _(b'not found in manifest') | ||
|
r43346 | ) | ||
|
r43906 | if '_manifestdelta' in self.__dict__ or path in self.files(): | ||
|
r19559 | if path in self._manifestdelta: | ||
|
r43346 | return ( | ||
self._manifestdelta[path], | ||||
self._manifestdelta.flags(path), | ||||
) | ||||
|
r30340 | mfl = self._repo.manifestlog | ||
try: | ||||
node, flag = mfl[self._changeset.manifest].find(path) | ||||
except KeyError: | ||||
|
r43346 | raise error.ManifestLookupError( | ||
|
r43347 | self._node, path, _(b'not found in manifest') | ||
|
r43346 | ) | ||
|
r19559 | |||
return node, flag | ||||
|
r19560 | def filenode(self, path): | ||
return self._fileinfo(path)[0] | ||||
|
r19561 | def flags(self, path): | ||
try: | ||||
return self._fileinfo(path)[1] | ||||
except error.LookupError: | ||||
|
r43347 | return b'' | ||
|
r19561 | |||
|
r42477 | @propertycache | ||
def _copies(self): | ||||
r42935 | return copies.computechangesetcopies(self) | |||
|
r43346 | |||
|
r42477 | def p1copies(self): | ||
return self._copies[0] | ||||
|
r43346 | |||
|
r42477 | def p2copies(self): | ||
return self._copies[1] | ||||
|
r29021 | def sub(self, path, allowcreate=True): | ||
|
r25600 | '''return a subrepo for the stored revision of path, never wdir()''' | ||
|
r29021 | return subrepo.subrepo(self, path, allowcreate=allowcreate) | ||
|
r19562 | |||
|
r25417 | def nullsub(self, path, pctx): | ||
return subrepo.nullsubrepo(self, path, pctx) | ||||
|
r25600 | def workingsub(self, path): | ||
'''return a subrepo for the stored revision, or wdir if this is a wdir | ||||
context. | ||||
''' | ||||
return subrepo.subrepo(self, path, allowwdir=True) | ||||
|
r43346 | def match( | ||
self, | ||||
pats=None, | ||||
include=None, | ||||
exclude=None, | ||||
|
r43347 | default=b'glob', | ||
|
r43346 | listsubrepos=False, | ||
badfn=None, | ||||
): | ||||
|
r19563 | r = self._repo | ||
|
r43346 | return matchmod.match( | ||
r.root, | ||||
r.getcwd(), | ||||
pats, | ||||
include, | ||||
exclude, | ||||
default, | ||||
auditor=r.nofsauditor, | ||||
ctx=self, | ||||
listsubrepos=listsubrepos, | ||||
badfn=badfn, | ||||
) | ||||
def diff( | ||||
self, | ||||
ctx2=None, | ||||
match=None, | ||||
changes=None, | ||||
opts=None, | ||||
losedatafn=None, | ||||
pathfn=None, | ||||
copy=None, | ||||
copysourcematch=None, | ||||
hunksfilterfn=None, | ||||
): | ||||
|
r19564 | """Returns a diff generator for the given contexts and matcher""" | ||
if ctx2 is None: | ||||
ctx2 = self.p1() | ||||
|
r19568 | if ctx2 is not None: | ||
|
r19564 | ctx2 = self._repo[ctx2] | ||
|
r43346 | return patch.diff( | ||
self._repo, | ||||
ctx2, | ||||
self, | ||||
match=match, | ||||
changes=changes, | ||||
opts=opts, | ||||
losedatafn=losedatafn, | ||||
pathfn=pathfn, | ||||
copy=copy, | ||||
copysourcematch=copysourcematch, | ||||
hunksfilterfn=hunksfilterfn, | ||||
) | ||||
|
r19564 | |||
|
r24323 | def dirs(self): | ||
return self._manifest.dirs() | ||||
|
r19565 | |||
|
r24325 | def hasdir(self, dir): | ||
return self._manifest.hasdir(dir) | ||||
|
r19566 | |||
|
r43346 | def status( | ||
self, | ||||
other=None, | ||||
match=None, | ||||
listignored=False, | ||||
listclean=False, | ||||
listunknown=False, | ||||
listsubrepos=False, | ||||
): | ||||
|
r21594 | """return status of files between two nodes or node and working | ||
directory. | ||||
If other is None, compare this node with working directory. | ||||
|
r21722 | |||
returns (modified, added, removed, deleted, unknown, ignored, clean) | ||||
|
r21594 | """ | ||
ctx1 = self | ||||
ctx2 = self._repo[other] | ||||
# This next code block is, admittedly, fragile logic that tests for | ||||
# reversing the contexts and wouldn't need to exist if it weren't for | ||||
# the fast (and common) code path of comparing the working directory | ||||
# with its first parent. | ||||
# | ||||
# What we're aiming for here is the ability to call: | ||||
# | ||||
# workingctx.status(parentctx) | ||||
# | ||||
# If we always built the manifest for each context and compared those, | ||||
# then we'd be done. But the special case of the above call means we | ||||
# just copy the manifest of the parent. | ||||
reversed = False | ||||
|
r43346 | if not isinstance(ctx1, changectx) and isinstance(ctx2, changectx): | ||
|
r21594 | reversed = True | ||
ctx1, ctx2 = ctx2, ctx1 | ||||
|
r40119 | match = self._repo.narrowmatch(match) | ||
|
r23237 | match = ctx2._matchstatus(ctx1, match) | ||
|
r23304 | r = scmutil.status([], [], [], [], [], [], []) | ||
|
r43346 | r = ctx2._buildstatus( | ||
ctx1, r, match, listignored, listclean, listunknown | ||||
) | ||||
|
r21594 | |||
if reversed: | ||||
|
r23301 | # Reverse added and removed. Clear deleted, unknown and ignored as | ||
# these make no sense to reverse. | ||||
|
r43346 | r = scmutil.status( | ||
r.modified, r.removed, r.added, [], [], [], r.clean | ||||
) | ||||
|
r21594 | |||
if listsubrepos: | ||||
for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): | ||||
try: | ||||
|
r27183 | rev2 = ctx2.subrev(subpath) | ||
except KeyError: | ||||
# A subrepo that existed in node1 was deleted between | ||||
# node1 and node2 (inclusive). Thus, ctx2's substate | ||||
# won't contain that subpath. The best we can do ignore it. | ||||
rev2 = None | ||||
|
r28017 | submatch = matchmod.subdirmatcher(subpath, match) | ||
|
r43346 | s = sub.status( | ||
rev2, | ||||
match=submatch, | ||||
ignored=listignored, | ||||
clean=listclean, | ||||
unknown=listunknown, | ||||
listsubrepos=True, | ||||
) | ||||
|
r44046 | for k in ( | ||
'modified', | ||||
'added', | ||||
'removed', | ||||
'deleted', | ||||
'unknown', | ||||
'ignored', | ||||
'clean', | ||||
): | ||||
rfiles, sfiles = getattr(r, k), getattr(s, k) | ||||
|
r43347 | rfiles.extend(b"%s/%s" % (subpath, f) for f in sfiles) | ||
|
r21594 | |||
|
r44046 | r.modified.sort() | ||
r.added.sort() | ||||
r.removed.sort() | ||||
r.deleted.sort() | ||||
r.unknown.sort() | ||||
r.ignored.sort() | ||||
r.clean.sort() | ||||
|
r21616 | |||
|
r23301 | return r | ||
|
r21594 | |||
|
r43346 | |||
|
r19537 | class changectx(basectx): | ||
|
r2563 | """A changecontext object makes access to data related to a particular | ||
|
r19951 | changeset convenient. It represents a read-only context already present in | ||
|
r19537 | the repo.""" | ||
|
r43346 | |||
r44199 | def __init__(self, repo, rev, node, maybe_filtered=True): | |||
|
r37192 | super(changectx, self).__init__(repo) | ||
|
r39994 | self._rev = rev | ||
self._node = node | ||||
r44199 | # When maybe_filtered is True, the revision might be affected by | |||
# changelog filtering and operation through the filtered changelog must be used. | ||||
# | ||||
# When maybe_filtered is False, the revision has already been checked | ||||
# against filtering and is not filtered. Operation through the | ||||
# unfiltered changelog might be used in some case. | ||||
self._maybe_filtered = maybe_filtered | ||||
|
r2563 | |||
|
r6469 | def __hash__(self): | ||
try: | ||||
return hash(self._rev) | ||||
except AttributeError: | ||||
return id(self) | ||||
|
r3168 | def __nonzero__(self): | ||
|
r3578 | return self._rev != nullrev | ||
|
r3168 | |||
|
r31476 | __bool__ = __nonzero__ | ||
|
r8157 | @propertycache | ||
|
r7368 | def _changeset(self): | ||
r44199 | if self._maybe_filtered: | |||
repo = self._repo | ||||
else: | ||||
repo = self._repo.unfiltered() | ||||
return repo.changelog.changelogrevision(self.rev()) | ||||
|
r7368 | |||
|
r8157 | @propertycache | ||
|
r7368 | def _manifest(self): | ||
|
r30344 | return self._manifestctx.read() | ||
|
r32519 | @property | ||
|
r30344 | def _manifestctx(self): | ||
return self._repo.manifestlog[self._changeset.manifest] | ||||
|
r7368 | |||
|
r8157 | @propertycache | ||
|
r7368 | def _manifestdelta(self): | ||
|
r30344 | return self._manifestctx.readdelta() | ||
|
r7368 | |||
|
r8157 | @propertycache | ||
|
r7368 | def _parents(self): | ||
|
r27063 | repo = self._repo | ||
r44203 | if self._maybe_filtered: | |||
cl = repo.changelog | ||||
else: | ||||
cl = repo.unfiltered().changelog | ||||
p1, p2 = cl.parentrevs(self._rev) | ||||
|
r27063 | if p2 == nullrev: | ||
|
r39993 | return [repo[p1]] | ||
return [repo[p1], repo[p2]] | ||||
|
r3215 | |||
|
r10282 | def changeset(self): | ||
|
r28488 | c = self._changeset | ||
return ( | ||||
c.manifest, | ||||
c.user, | ||||
c.date, | ||||
c.files, | ||||
c.description, | ||||
c.extra, | ||||
) | ||||
|
r43346 | |||
|
r10282 | def manifestnode(self): | ||
|
r28488 | return self._changeset.manifest | ||
|
r2563 | |||
|
r10282 | def user(self): | ||
|
r28488 | return self._changeset.user | ||
|
r43346 | |||
|
r10282 | def date(self): | ||
|
r28488 | return self._changeset.date | ||
|
r43346 | |||
|
r10282 | def files(self): | ||
|
r28488 | return self._changeset.files | ||
|
r43346 | |||
|
r42566 | def filesmodified(self): | ||
modified = set(self.files()) | ||||
modified.difference_update(self.filesadded()) | ||||
modified.difference_update(self.filesremoved()) | ||||
return sorted(modified) | ||||
r43291 | ||||
|
r42566 | def filesadded(self): | ||
r43291 | filesadded = self._changeset.filesadded | |||
r43416 | compute_on_none = True | |||
if self._repo.filecopiesmode == b'changeset-sidedata': | ||||
compute_on_none = False | ||||
else: | ||||
source = self._repo.ui.config(b'experimental', b'copies.read-from') | ||||
if source == b'changeset-only': | ||||
compute_on_none = False | ||||
elif source != b'compatibility': | ||||
# filelog mode, ignore any changelog content | ||||
filesadded = None | ||||
if filesadded is None: | ||||
if compute_on_none: | ||||
r43417 | filesadded = copies.computechangesetfilesadded(self) | |||
r43416 | else: | |||
r43291 | filesadded = [] | |||
return filesadded | ||||
|
r42566 | def filesremoved(self): | ||
r43292 | filesremoved = self._changeset.filesremoved | |||
r43416 | compute_on_none = True | |||
if self._repo.filecopiesmode == b'changeset-sidedata': | ||||
compute_on_none = False | ||||
else: | ||||
source = self._repo.ui.config(b'experimental', b'copies.read-from') | ||||
if source == b'changeset-only': | ||||
compute_on_none = False | ||||
elif source != b'compatibility': | ||||
# filelog mode, ignore any changelog content | ||||
filesremoved = None | ||||
if filesremoved is None: | ||||
if compute_on_none: | ||||
r43417 | filesremoved = copies.computechangesetfilesremoved(self) | |||
r43416 | else: | |||
r43292 | filesremoved = [] | |||
return filesremoved | ||||
|
r42566 | |||
|
r41921 | @propertycache | ||
def _copies(self): | ||||
|
r42318 | p1copies = self._changeset.p1copies | ||
p2copies = self._changeset.p2copies | ||||
r43416 | compute_on_none = True | |||
if self._repo.filecopiesmode == b'changeset-sidedata': | ||||
compute_on_none = False | ||||
else: | ||||
source = self._repo.ui.config(b'experimental', b'copies.read-from') | ||||
# If config says to get copy metadata only from changeset, then | ||||
# return that, defaulting to {} if there was no copy metadata. In | ||||
# compatibility mode, we return copy data from the changeset if it | ||||
# was recorded there, and otherwise we fall back to getting it from | ||||
# the filelogs (below). | ||||
# | ||||
# If we are in compatiblity mode and there is not data in the | ||||
# changeset), we get the copy metadata from the filelogs. | ||||
# | ||||
# otherwise, when config said to read only from filelog, we get the | ||||
# copy metadata from the filelogs. | ||||
if source == b'changeset-only': | ||||
compute_on_none = False | ||||
elif source != b'compatibility': | ||||
# filelog mode, ignore any changelog content | ||||
p1copies = p2copies = None | ||||
if p1copies is None: | ||||
if compute_on_none: | ||||
r43293 | p1copies, p2copies = super(changectx, self)._copies | |||
r43416 | else: | |||
if p1copies is None: | ||||
p1copies = {} | ||||
if p2copies is None: | ||||
p2copies = {} | ||||
r43293 | return p1copies, p2copies | |||
|
r10282 | def description(self): | ||
|
r28488 | return self._changeset.description | ||
|
r43346 | |||
|
r10282 | def branch(self): | ||
|
r43347 | return encoding.tolocal(self._changeset.extra.get(b"branch")) | ||
|
r43346 | |||
|
r16720 | def closesbranch(self): | ||
|
r43347 | return b'close' in self._changeset.extra | ||
|
r43346 | |||
|
r10282 | def extra(self): | ||
|
r35106 | """Return a dict of extra information.""" | ||
|
r28488 | return self._changeset.extra | ||
|
r43346 | |||
|
r10282 | def tags(self): | ||
|
r35106 | """Return a list of byte tag names""" | ||
|
r10282 | return self._repo.nodetags(self._node) | ||
|
r43346 | |||
|
r13384 | def bookmarks(self): | ||
|
r35106 | """Return a list of byte bookmark names.""" | ||
|
r13384 | return self._repo.nodebookmarks(self._node) | ||
|
r43346 | |||
|
r15421 | def phase(self): | ||
|
r16657 | return self._repo._phasecache.phase(self._repo, self._rev) | ||
|
r43346 | |||
|
r14644 | def hidden(self): | ||
|
r43347 | return self._rev in repoview.filterrevs(self._repo, b'visible') | ||
|
r2563 | |||
|
r34682 | def isinmemory(self): | ||
return False | ||||
|
r2563 | def children(self): | ||
|
r35106 | """return list of changectx contexts for each child changeset. | ||
This returns only the immediate child changesets. Use descendants() to | ||||
recursively walk children. | ||||
""" | ||||
|
r2627 | c = self._repo.changelog.children(self._node) | ||
|
r39993 | return [self._repo[x] for x in c] | ||
|
r2563 | |||
|
r6876 | def ancestors(self): | ||
|
r16866 | for a in self._repo.changelog.ancestors([self._rev]): | ||
|
r39993 | yield self._repo[a] | ||
|
r6876 | |||
def descendants(self): | ||||
|
r35106 | """Recursively yield all children of the changeset. | ||
For just the immediate children, use children() | ||||
""" | ||||
|
r16867 | for d in self._repo.changelog.descendants([self._rev]): | ||
|
r39993 | yield self._repo[d] | ||
|
r6876 | |||
|
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) | ||||
|
r43346 | return filectx( | ||
self._repo, path, fileid=fileid, changectx=self, filelog=filelog | ||||
) | ||||
|
r2563 | |||
|
r21203 | def ancestor(self, c2, warn=False): | ||
|
r22389 | """return the "best" ancestor context of self and c2 | ||
If there are multiple candidates, it will show a message and check | ||||
merge.preferancestor configuration before falling back to the | ||||
revlog ancestor.""" | ||||
|
r9843 | # deal with workingctxs | ||
n2 = c2._node | ||||
|
r13031 | if n2 is None: | ||
|
r9843 | n2 = c2._parents[0]._node | ||
|
r21125 | cahs = self._repo.changelog.commonancestorsheads(self._node, n2) | ||
if not cahs: | ||||
anc = nullid | ||||
elif len(cahs) == 1: | ||||
anc = cahs[0] | ||||
else: | ||||
|
r25844 | # experimental config: merge.preferancestor | ||
|
r43347 | for r in self._repo.ui.configlist(b'merge', b'preferancestor'): | ||
|
r22671 | try: | ||
|
r37372 | ctx = scmutil.revsymbol(self._repo, r) | ||
|
r22671 | except error.RepoLookupError: | ||
|
r22180 | continue | ||
|
r21126 | anc = ctx.node() | ||
if anc in cahs: | ||||
break | ||||
else: | ||||
anc = self._repo.changelog.ancestor(self._node, n2) | ||||
|
r21203 | if warn: | ||
self._repo.ui.status( | ||||
|
r43346 | ( | ||
|
r43347 | _(b"note: using %s as ancestor of %s and %s\n") | ||
|
r43346 | % (short(anc), short(self._node), short(n2)) | ||
) | ||||
|
r43347 | + b''.join( | ||
|
r43346 | _( | ||
|
r43347 | b" alternatively, use --config " | ||
b"merge.preferancestor=%s\n" | ||||
|
r43346 | ) | ||
% short(n) | ||||
for n in sorted(cahs) | ||||
if n != anc | ||||
) | ||||
) | ||||
|
r39993 | return self._repo[anc] | ||
|
r3125 | |||
|
r38692 | def isancestorof(self, other): | ||
"""True if this changeset is an ancestor of other""" | ||||
|
r38690 | return self._repo.changelog.isancestorrev(self._rev, other._rev) | ||
|
r17626 | |||
|
r6764 | def walk(self, match): | ||
|
r24646 | '''Generates matching file names.''' | ||
|
r20292 | |||
|
r25435 | # Wrap match.bad method to have message with nodeid | ||
|
r24646 | def bad(fn, msg): | ||
|
r25193 | # The manifest doesn't know about subrepos, so don't complain about | ||
# paths into valid subrepos. | ||||
|
r43347 | if any(fn == s or fn.startswith(s + b'/') for s in self.substate): | ||
|
r25193 | return | ||
|
r43347 | match.bad(fn, _(b'no such file in rev %s') % self) | ||
|
r20292 | |||
|
r40120 | m = matchmod.badmatch(self._repo.narrowmatch(match), bad) | ||
|
r25435 | return self._manifest.walk(m) | ||
|
r6764 | |||
|
r21985 | def matches(self, match): | ||
return self.walk(match) | ||||
|
r43346 | |||
|
r19572 | class basefilectx(object): | ||
"""A filecontext object represents the common logic for its children: | ||||
filectx: read-only access to a filerevision that is already present | ||||
in the repo, | ||||
workingfilectx: a filecontext that represents files from the working | ||||
directory, | ||||
|
r32239 | memfilectx: a filecontext that represents files in-memory, | ||
""" | ||||
|
r43346 | |||
|
r19573 | @propertycache | ||
def _filelog(self): | ||||
return self._repo.file(self._path) | ||||
|
r19574 | @propertycache | ||
def _changeid(self): | ||||
|
r43906 | if '_changectx' in self.__dict__: | ||
|
r19574 | return self._changectx.rev() | ||
|
r43906 | elif '_descendantrev' in self.__dict__: | ||
|
r23983 | # this file context was created from a revision with a known | ||
# descendant, we can (lazily) correct for linkrev aliases | ||||
|
r30275 | return self._adjustlinkrev(self._descendantrev) | ||
|
r19574 | else: | ||
return self._filelog.linkrev(self._filerev) | ||||
|
r19575 | @propertycache | ||
def _filenode(self): | ||||
|
r43906 | if '_fileid' in self.__dict__: | ||
|
r19575 | return self._filelog.lookup(self._fileid) | ||
else: | ||||
return self._changectx.filenode(self._path) | ||||
|
r19576 | @propertycache | ||
def _filerev(self): | ||||
return self._filelog.rev(self._filenode) | ||||
|
r19577 | @propertycache | ||
def _repopath(self): | ||||
return self._path | ||||
|
r19578 | def __nonzero__(self): | ||
try: | ||||
self._filenode | ||||
return True | ||||
except error.LookupError: | ||||
# file is missing | ||||
return False | ||||
|
r31476 | __bool__ = __nonzero__ | ||
|
r33022 | def __bytes__(self): | ||
|
r30270 | try: | ||
|
r43347 | return b"%s@%s" % (self.path(), self._changectx) | ||
|
r30270 | except error.LookupError: | ||
|
r43347 | return b"%s@???" % self.path() | ||
|
r19579 | |||
|
r33022 | __str__ = encoding.strmethod(__bytes__) | ||
|
r33019 | |||
|
r19580 | def __repr__(self): | ||
|
r43809 | return "<%s %s>" % (type(self).__name__, str(self)) | ||
|
r19580 | |||
|
r19581 | def __hash__(self): | ||
try: | ||||
return hash((self._path, self._filenode)) | ||||
except AttributeError: | ||||
return id(self) | ||||
|
r19582 | def __eq__(self, other): | ||
try: | ||||
|
r43346 | return ( | ||
type(self) == type(other) | ||||
and self._path == other._path | ||||
and self._filenode == other._filenode | ||||
) | ||||
|
r19582 | except AttributeError: | ||
return False | ||||
|
r19583 | def __ne__(self, other): | ||
return not (self == other) | ||||
|
r19584 | def filerev(self): | ||
return self._filerev | ||||
|
r43346 | |||
|
r19585 | def filenode(self): | ||
return self._filenode | ||||
|
r43346 | |||
|
r32234 | @propertycache | ||
def _flags(self): | ||||
return self._changectx.flags(self._path) | ||||
|
r43346 | |||
|
r19586 | def flags(self): | ||
|
r32234 | return self._flags | ||
|
r43346 | |||
|
r19587 | def filelog(self): | ||
return self._filelog | ||||
|
r43346 | |||
|
r19588 | def rev(self): | ||
return self._changeid | ||||
|
r43346 | |||
|
r19589 | def linkrev(self): | ||
return self._filelog.linkrev(self._filerev) | ||||
|
r43346 | |||
|
r19590 | def node(self): | ||
return self._changectx.node() | ||||
|
r43346 | |||
|
r19591 | def hex(self): | ||
return self._changectx.hex() | ||||
|
r43346 | |||
|
r19592 | def user(self): | ||
return self._changectx.user() | ||||
|
r43346 | |||
|
r19593 | def date(self): | ||
return self._changectx.date() | ||||
|
r43346 | |||
|
r19594 | def files(self): | ||
return self._changectx.files() | ||||
|
r43346 | |||
|
r19595 | def description(self): | ||
return self._changectx.description() | ||||
|
r43346 | |||
|
r19596 | def branch(self): | ||
return self._changectx.branch() | ||||
|
r43346 | |||
|
r19597 | def extra(self): | ||
return self._changectx.extra() | ||||
|
r43346 | |||
|
r19598 | def phase(self): | ||
return self._changectx.phase() | ||||
|
r43346 | |||
|
r19599 | def phasestr(self): | ||
return self._changectx.phasestr() | ||||
|
r43346 | |||
r35087 | def obsolete(self): | |||
return self._changectx.obsolete() | ||||
|
r43346 | |||
r35092 | def instabilities(self): | |||
return self._changectx.instabilities() | ||||
|
r43346 | |||
|
r19600 | def manifest(self): | ||
return self._changectx.manifest() | ||||
|
r43346 | |||
|
r19601 | def changectx(self): | ||
return self._changectx | ||||
|
r43346 | |||
|
r32235 | def renamed(self): | ||
return self._copied | ||||
|
r43346 | |||
|
r41934 | def copysource(self): | ||
return self._copied and self._copied[0] | ||||
|
r43346 | |||
|
r24333 | def repo(self): | ||
return self._repo | ||||
|
r43346 | |||
|
r32236 | def size(self): | ||
return len(self.data()) | ||||
|
r19584 | |||
|
r19602 | def path(self): | ||
return self._path | ||||
|
r19603 | def isbinary(self): | ||
try: | ||||
|
r37102 | return stringutil.binary(self.data()) | ||
|
r19603 | except IOError: | ||
return False | ||||
|
r43346 | |||
|
r22054 | def isexec(self): | ||
|
r43347 | return b'x' in self.flags() | ||
|
r43346 | |||
|
r22054 | def islink(self): | ||
|
r43347 | return b'l' in self.flags() | ||
|
r19603 | |||
|
r26978 | def isabsent(self): | ||
"""whether this filectx represents a file not in self._changectx | ||||
This is mainly for merge code to detect change/delete conflicts. This is | ||||
expected to be True for all subclasses of basectx.""" | ||||
return False | ||||
|
r26977 | _customcmp = False | ||
|
r43346 | |||
|
r19604 | def cmp(self, fctx): | ||
"""compare with other file context | ||||
returns True if different than fctx. | ||||
""" | ||||
|
r26977 | if fctx._customcmp: | ||
return fctx.cmp(self) | ||||
|
r41027 | if self._filenode is None: | ||
raise error.ProgrammingError( | ||||
|
r43347 | b'filectx.cmp() must be reimplemented if not backed by revlog' | ||
|
r43346 | ) | ||
|
r41027 | |||
|
r41026 | if fctx._filenode is None: | ||
if self._repo._encodefilterpats: | ||||
# can't rely on size() because wdir content may be decoded | ||||
return self._filelog.cmp(self._filenode, fctx.data()) | ||||
if self.size() - 4 == fctx.size(): | ||||
# size() can match: | ||||
# if file data starts with '\1\n', empty metadata block is | ||||
# prepended, which adds 4 bytes to filelog.size(). | ||||
return self._filelog.cmp(self._filenode, fctx.data()) | ||||
if self.size() == fctx.size(): | ||||
# size() matches: need to compare content | ||||
|
r19604 | return self._filelog.cmp(self._filenode, fctx.data()) | ||
|
r41026 | # size() differs | ||
|
r19604 | return True | ||
|
r40733 | def _adjustlinkrev(self, srcrev, inclusive=False, stoprev=None): | ||
|
r24180 | """return the first ancestor of <srcrev> introducing <fnode> | ||
|
r23979 | |||
If the linkrev of the file revision does not point to an ancestor of | ||||
srcrev, we'll walk down the ancestors until we find one introducing | ||||
this file revision. | ||||
:srcrev: the changeset revision we search ancestors from | ||||
:inclusive: if true, the src revision will also be checked | ||||
|
r40733 | :stoprev: an optional revision to stop the walk at. If no introduction | ||
of this file content could be found before this floor | ||||
revision, the function will returns "None" and stops its | ||||
iteration. | ||||
|
r23979 | """ | ||
repo = self._repo | ||||
cl = repo.unfiltered().changelog | ||||
|
r29939 | mfl = repo.manifestlog | ||
|
r23979 | # fetch the linkrev | ||
|
r30275 | lkr = self.linkrev() | ||
|
r40080 | if srcrev == lkr: | ||
return lkr | ||||
|
r23980 | # hack to reuse ancestor computation when searching for renames | ||
memberanc = getattr(self, '_ancestrycontext', None) | ||||
iteranc = None | ||||
|
r24411 | if srcrev is None: | ||
# wctx case, used by workingfilectx during mergecopy | ||||
revs = [p.rev() for p in self._repo[None].parents()] | ||||
|
r43346 | inclusive = True # we skipped the real (revless) source | ||
|
r24411 | else: | ||
revs = [srcrev] | ||||
|
r23980 | if memberanc is None: | ||
|
r43346 | memberanc = iteranc = cl.ancestors(revs, lkr, inclusive=inclusive) | ||
|
r23979 | # check if this linkrev is an ancestor of srcrev | ||
|
r23980 | if lkr not in memberanc: | ||
if iteranc is None: | ||||
|
r24410 | iteranc = cl.ancestors(revs, lkr, inclusive=inclusive) | ||
|
r30275 | fnode = self._filenode | ||
path = self._path | ||||
|
r23980 | for a in iteranc: | ||
|
r40733 | if stoprev is not None and a < stoprev: | ||
return None | ||||
|
r43346 | ac = cl.read(a) # get changeset data (we avoid object creation) | ||
if path in ac[3]: # checking the 'files' field. | ||||
|
r23979 | # The file has been touched, check if the content is | ||
# similar to the one we search for. | ||||
|
r29939 | if fnode == mfl[ac[0]].readfast().get(path): | ||
|
r23979 | return a | ||
# In theory, we should never get out of that loop without a result. | ||||
# But if manifest uses a buggy file revision (not children of the | ||||
# one it replaces) we could. Such a buggy situation will likely | ||||
# result is crash somewhere else at to some point. | ||||
return lkr | ||||
|
r40730 | def isintroducedafter(self, changelogrev): | ||
"""True if a filectx has been introduced after a given floor revision | ||||
""" | ||||
|
r40732 | if self.linkrev() >= changelogrev: | ||
return True | ||||
|
r40733 | introrev = self._introrev(stoprev=changelogrev) | ||
if introrev is None: | ||||
return False | ||||
|
r40732 | return introrev >= changelogrev | ||
|
r40730 | |||
|
r23703 | def introrev(self): | ||
"""return the rev of the changeset which introduced this file revision | ||||
This method is different from linkrev because it take into account the | ||||
changeset the filectx was created from. It ensures the returned | ||||
revision is one of its ancestors. This prevents bugs from | ||||
'linkrev-shadowing' when a file revision is used by multiple | ||||
changesets. | ||||
""" | ||||
|
r40731 | return self._introrev() | ||
|
r40733 | def _introrev(self, stoprev=None): | ||
""" | ||||
Same as `introrev` but, with an extra argument to limit changelog | ||||
iteration range in some internal usecase. | ||||
If `stoprev` is set, the `introrev` will not be searched past that | ||||
`stoprev` revision and "None" might be returned. This is useful to | ||||
limit the iteration range. | ||||
""" | ||||
|
r40728 | toprev = None | ||
|
r23703 | attrs = vars(self) | ||
|
r43906 | if '_changeid' in attrs: | ||
|
r40728 | # We have a cached value already | ||
toprev = self._changeid | ||||
|
r43906 | elif '_changectx' in attrs: | ||
|
r40728 | # We know which changelog entry we are coming from | ||
toprev = self._changectx.rev() | ||||
if toprev is not None: | ||||
|
r40733 | return self._adjustlinkrev(toprev, inclusive=True, stoprev=stoprev) | ||
|
r43906 | elif '_descendantrev' in attrs: | ||
|
r40733 | introrev = self._adjustlinkrev(self._descendantrev, stoprev=stoprev) | ||
|
r40729 | # be nice and cache the result of the computation | ||
|
r40733 | if introrev is not None: | ||
self._changeid = introrev | ||||
|
r40729 | return introrev | ||
|
r40082 | else: | ||
|
r23703 | return self.linkrev() | ||
|
r35272 | def introfilectx(self): | ||
"""Return filectx having identical contents, but pointing to the | ||||
changeset revision where this filectx was introduced""" | ||||
introrev = self.introrev() | ||||
if self.rev() == introrev: | ||||
return self | ||||
return self.filectx(self.filenode(), changeid=introrev) | ||||
|
r24816 | def _parentfilectx(self, path, fileid, filelog): | ||
"""create parent filectx keeping ancestry info for _adjustlinkrev()""" | ||||
fctx = filectx(self._repo, path, fileid=fileid, filelog=filelog) | ||||
|
r43906 | if '_changeid' in vars(self) or '_changectx' in vars(self): | ||
|
r24816 | # If self is associated with a changeset (probably explicitly | ||
# fed), ensure the created filectx is associated with a | ||||
# changeset that is an ancestor of self.changectx. | ||||
# This lets us later use _adjustlinkrev to get a correct link. | ||||
fctx._descendantrev = self.rev() | ||||
fctx._ancestrycontext = getattr(self, '_ancestrycontext', None) | ||||
|
r43906 | elif '_descendantrev' in vars(self): | ||
|
r24816 | # Otherwise propagate _descendantrev if we have one associated. | ||
fctx._descendantrev = self._descendantrev | ||||
fctx._ancestrycontext = getattr(self, '_ancestrycontext', None) | ||||
return fctx | ||||
|
r19605 | def parents(self): | ||
|
r22201 | _path = self._path | ||
|
r19605 | fl = self._filelog | ||
|
r23688 | parents = self._filelog.parents(self._filenode) | ||
pl = [(_path, node, fl) for node in parents if node != nullid] | ||||
|
r19605 | |||
|
r23702 | r = fl.renamed(self._filenode) | ||
|
r19605 | if r: | ||
|
r23688 | # - In the simple rename case, both parent are nullid, pl is empty. | ||
# - In case of merge, only one of the parent is null id and should | ||||
# be replaced with the rename information. This parent is -always- | ||||
# the first one. | ||||
# | ||||
|
r24180 | # As null id have always been filtered out in the previous list | ||
|
r23688 | # comprehension, inserting to 0 will always result in "replacing | ||
# first nullid parent with rename information. | ||||
|
r23699 | pl.insert(0, (r[0], r[1], self._repo.file(r[0]))) | ||
|
r19605 | |||
|
r24816 | return [self._parentfilectx(path, fnode, l) for path, fnode, l in pl] | ||
|
r19605 | |||
|
r19606 | def p1(self): | ||
return self.parents()[0] | ||||
|
r19607 | def p2(self): | ||
p = self.parents() | ||||
if len(p) == 2: | ||||
return p[1] | ||||
return filectx(self._repo, self._path, fileid=-1, filelog=self._filelog) | ||||
|
r37083 | def annotate(self, follow=False, skiprevs=None, diffopts=None): | ||
|
r37084 | """Returns a list of annotateline objects for each line in the file | ||
- line.fctx is the filectx of the node where that line was last changed | ||||
- line.lineno is the line number at the first appearance in the managed | ||||
|
r37083 | file | ||
|
r37084 | - line.text is the data on that line (including newline character) | ||
|
r37083 | """ | ||
|
r9097 | getlog = util.lrucachefunc(lambda x: self._repo.file(x)) | ||
|
r3172 | |||
def parents(f): | ||||
|
r24862 | # Cut _descendantrev here to mitigate the penalty of lazy linkrev | ||
# adjustment. Otherwise, p._adjustlinkrev() would walk changelog | ||||
# from the topmost introrev (= srcrev) down to p.linkrev() if it | ||||
# isn't an ancestor of the srcrev. | ||||
f._changeid | ||||
|
r19292 | pl = f.parents() | ||
# Don't return renamed parents if we aren't following. | ||||
if not follow: | ||||
pl = [p for p in pl if p.path() == f.path()] | ||||
|
r3172 | |||
|
r19292 | # renamed filectx won't have a filelog yet, so set it | ||
# from the cache to save time | ||||
for p in pl: | ||||
|
r43906 | if not '_filelog' in p.__dict__: | ||
|
r19292 | p._filelog = getlog(p.path()) | ||
|
r3146 | |||
|
r19292 | return pl | ||
|
r3217 | |||
|
r3404 | # use linkrev to find the first changeset where self appeared | ||
|
r35272 | base = self.introfilectx() | ||
|
r24818 | if getattr(base, '_ancestrycontext', None) is None: | ||
cl = self._repo.changelog | ||||
|
r35272 | if base.rev() is None: | ||
|
r24818 | # wctx is not inclusive, but works because _ancestrycontext | ||
# is used to test filelog revisions | ||||
|
r43346 | ac = cl.ancestors( | ||
[p.rev() for p in base.parents()], inclusive=True | ||||
) | ||||
|
r24818 | else: | ||
|
r35272 | ac = cl.ancestors([base.rev()], inclusive=True) | ||
|
r24407 | base._ancestrycontext = ac | ||
|
r3404 | |||
|
r43346 | return dagop.annotate( | ||
base, parents, skiprevs=skiprevs, diffopts=diffopts | ||||
) | ||||
|
r3124 | |||
|
r19610 | def ancestors(self, followfirst=False): | ||
visit = {} | ||||
c = self | ||||
|
r24306 | if followfirst: | ||
cut = 1 | ||||
else: | ||||
cut = None | ||||
|
r19610 | while True: | ||
for parent in c.parents()[:cut]: | ||||
|
r23981 | visit[(parent.linkrev(), parent.filenode())] = parent | ||
|
r19610 | if not visit: | ||
break | ||||
c = visit.pop(max(visit)) | ||||
yield c | ||||
|
r33902 | def decodeddata(self): | ||
"""Returns `data()` after running repository decoding filters. | ||||
This is often equivalent to how the data would be expressed on disk. | ||||
""" | ||||
return self._repo.wwritedata(self.path(), self.data()) | ||||
|
r43346 | |||
|
r19608 | class filectx(basefilectx): | ||
"""A filecontext object makes access to data related to a particular | ||||
filerevision convenient.""" | ||||
|
r43346 | |||
def __init__( | ||||
self, | ||||
repo, | ||||
path, | ||||
changeid=None, | ||||
fileid=None, | ||||
filelog=None, | ||||
changectx=None, | ||||
): | ||||
|
r40098 | """changeid must be a revision number, if specified. | ||
|
r19608 | fileid can be a file revision or node.""" | ||
self._repo = repo | ||||
self._path = path | ||||
|
r43346 | assert ( | ||
changeid is not None or fileid is not None or changectx is not None | ||||
r43663 | ), ( | |||
b"bad args: changeid=%r, fileid=%r, changectx=%r" | ||||
% (changeid, fileid, changectx,) | ||||
|
r43346 | ) | ||
|
r19608 | |||
if filelog is not None: | ||||
self._filelog = filelog | ||||
if changeid is not None: | ||||
self._changeid = changeid | ||||
if changectx is not None: | ||||
self._changectx = changectx | ||||
if fileid is not None: | ||||
self._fileid = fileid | ||||
@propertycache | ||||
def _changectx(self): | ||||
try: | ||||
|
r39993 | return self._repo[self._changeid] | ||
|
r23687 | except error.FilteredRepoLookupError: | ||
|
r19608 | # Linkrev may point to any revision in the repository. When the | ||
# repository is filtered this may lead to `filectx` trying to build | ||||
# `changectx` for filtered revision. In such case we fallback to | ||||
# creating `changectx` on the unfiltered version of the reposition. | ||||
# This fallback should not be an issue because `changectx` from | ||||
# `filectx` are not used in complex operations that care about | ||||
# filtering. | ||||
# | ||||
# This fallback is a cheap and dirty fix that prevent several | ||||
# crashes. It does not ensure the behavior is correct. However the | ||||
# behavior was not correct before filtering either and "incorrect | ||||
# behavior" is seen as better as "crash" | ||||
# | ||||
# Linkrevs have several serious troubles with filtering that are | ||||
# complicated to solve. Proper handling of the issue here should be | ||||
# considered when solving linkrev issue are on the table. | ||||
|
r39993 | return self._repo.unfiltered()[self._changeid] | ||
|
r19608 | |||
|
r23770 | def filectx(self, fileid, changeid=None): | ||
|
r19608 | '''opens an arbitrary revision of the file without | ||
opening a new filelog''' | ||||
|
r43346 | return filectx( | ||
self._repo, | ||||
self._path, | ||||
fileid=fileid, | ||||
filelog=self._filelog, | ||||
changeid=changeid, | ||||
) | ||||
|
r19608 | |||
|
r30743 | def rawdata(self): | ||
r43037 | return self._filelog.rawdata(self._filenode) | |||
|
r30743 | |||
|
r32237 | def rawflags(self): | ||
"""low-level revlog flags""" | ||||
return self._filelog.flags(self._filerev) | ||||
|
r19608 | def data(self): | ||
|
r22932 | try: | ||
return self._filelog.read(self._filenode) | ||||
except error.CensoredNodeError: | ||||
|
r43347 | if self._repo.ui.config(b"censor", b"policy") == b"ignore": | ||
return b"" | ||||
|
r43346 | raise error.Abort( | ||
|
r43347 | _(b"censored node: %s") % short(self._filenode), | ||
hint=_(b"set censor.policy to ignore errors"), | ||||
|
r43346 | ) | ||
|
r22932 | |||
|
r19608 | def size(self): | ||
return self._filelog.size(self._filerev) | ||||
|
r32235 | @propertycache | ||
def _copied(self): | ||||
|
r19608 | """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: | ||||
|
r39746 | return None | ||
|
r19608 | |||
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 | ||||
except error.LookupError: | ||||
pass | ||||
return renamed | ||||
def children(self): | ||||
# hard for renames | ||||
c = self._filelog.children(self._filenode) | ||||
|
r43346 | return [ | ||
filectx(self._repo, self._path, fileid=x, filelog=self._filelog) | ||||
for x in c | ||||
] | ||||
|
r19608 | |||
|
r19733 | class committablectx(basectx): | ||
"""A committablectx object provides common functionality for a context that | ||||
|
r19664 | wants the ability to commit, e.g. workingctx or memctx.""" | ||
|
r43346 | |||
def __init__( | ||||
self, | ||||
repo, | ||||
|
r43347 | text=b"", | ||
|
r43346 | user=None, | ||
date=None, | ||||
extra=None, | ||||
changes=None, | ||||
branch=None, | ||||
): | ||||
|
r37192 | super(committablectx, self).__init__(repo) | ||
|
r3217 | self._rev = None | ||
self._node = None | ||||
|
r6709 | self._text = text | ||
|
r6718 | if date: | ||
|
r36625 | self._date = dateutil.parsedate(date) | ||
|
r6817 | if user: | ||
self._user = user | ||||
|
r6707 | if changes: | ||
|
r21592 | self._status = changes | ||
|
r3217 | |||
|
r6708 | self._extra = {} | ||
if extra: | ||||
self._extra = extra.copy() | ||||
|
r42482 | if branch is not None: | ||
|
r43347 | self._extra[b'branch'] = encoding.fromlocal(branch) | ||
if not self._extra.get(b'branch'): | ||||
self._extra[b'branch'] = b'default' | ||||
|
r6708 | |||
|
r32643 | def __bytes__(self): | ||
|
r43347 | return bytes(self._parents[0]) + b"+" | ||
|
r19666 | |||
|
r33022 | __str__ = encoding.strmethod(__bytes__) | ||
|
r19667 | def __nonzero__(self): | ||
return True | ||||
|
r31476 | __bool__ = __nonzero__ | ||
|
r15337 | @propertycache | ||
|
r19672 | def _status(self): | ||
|
r21592 | return self._repo.status() | ||
|
r19672 | |||
|
r19674 | @propertycache | ||
def _user(self): | ||||
return self._repo.ui.username() | ||||
|
r19676 | @propertycache | ||
def _date(self): | ||||
|
r32409 | ui = self._repo.ui | ||
|
r43347 | date = ui.configdate(b'devel', b'default-date') | ||
|
r32409 | if date is None: | ||
|
r36625 | date = dateutil.makedate() | ||
|
r32409 | return date | ||
|
r19676 | |||
|
r21587 | def subrev(self, subpath): | ||
return None | ||||
|
r24719 | def manifestnode(self): | ||
return None | ||||
|
r43346 | |||
|
r19675 | def user(self): | ||
return self._user or self._repo.ui.username() | ||||
|
r43346 | |||
|
r19677 | def date(self): | ||
return self._date | ||||
|
r43346 | |||
|
r19678 | def description(self): | ||
return self._text | ||||
|
r43346 | |||
|
r19679 | def files(self): | ||
|
r43346 | return sorted( | ||
self._status.modified + self._status.added + self._status.removed | ||||
) | ||||
|
r41955 | def modified(self): | ||
return self._status.modified | ||||
|
r43346 | |||
|
r41955 | def added(self): | ||
return self._status.added | ||||
|
r43346 | |||
|
r41955 | def removed(self): | ||
return self._status.removed | ||||
|
r43346 | |||
|
r41955 | def deleted(self): | ||
return self._status.deleted | ||||
|
r43346 | |||
|
r42566 | filesmodified = modified | ||
filesadded = added | ||||
filesremoved = removed | ||||
|
r19687 | def branch(self): | ||
|
r43347 | return encoding.tolocal(self._extra[b'branch']) | ||
|
r43346 | |||
|
r19688 | def closesbranch(self): | ||
|
r43347 | return b'close' in self._extra | ||
|
r43346 | |||
|
r19689 | def extra(self): | ||
return self._extra | ||||
|
r19680 | |||
|
r34682 | def isinmemory(self): | ||
return False | ||||
|
r19690 | def tags(self): | ||
|
r25688 | return [] | ||
|
r19690 | |||
|
r19691 | def bookmarks(self): | ||
b = [] | ||||
for p in self.parents(): | ||||
b.extend(p.bookmarks()) | ||||
return b | ||||
|
r19692 | def phase(self): | ||
|
r43346 | phase = phases.draft # default phase to draft | ||
|
r19692 | for p in self.parents(): | ||
phase = max(phase, p.phase()) | ||||
return phase | ||||
|
r19693 | def hidden(self): | ||
return False | ||||
|
r19694 | def children(self): | ||
return [] | ||||
|
r19696 | def ancestor(self, c2): | ||
|
r22389 | """return the "best" ancestor context of self and c2""" | ||
|
r43346 | return self._parents[0].ancestor(c2) # punt on two parents for now | ||
|
r19696 | |||
|
r19698 | def ancestors(self): | ||
|
r23616 | for p in self._parents: | ||
yield p | ||||
|
r19698 | for a in self._repo.changelog.ancestors( | ||
|
r43346 | [p.rev() for p in self._parents] | ||
): | ||||
|
r39993 | yield self._repo[a] | ||
|
r19698 | |||
|
r19699 | def markcommitted(self, node): | ||
"""Perform post-commit cleanup necessary after committing this ctx | ||||
Specifically, this updates backing stores this working context | ||||
wraps to reflect the fact that the changes reflected by this | ||||
workingctx have been committed. For example, it marks | ||||
modified and added files as normal in the dirstate. | ||||
""" | ||||
|
r32610 | def dirty(self, missing=False, merge=True, branch=True): | ||
return False | ||||
|
r43346 | |||
|
r19733 | class workingctx(committablectx): | ||
|
r19671 | """A workingctx object makes access to data related to | ||
the current working directory convenient. | ||||
date - any valid date string or (unixtime, offset), or None. | ||||
user - username string, or None. | ||||
extra - a dictionary of extra values, or None. | ||||
changes - a list of file lists as returned by localrepo.status() | ||||
or None to use the repository status. | ||||
""" | ||||
|
r43346 | |||
def __init__( | ||||
|
r43347 | self, repo, text=b"", user=None, date=None, extra=None, changes=None | ||
|
r43346 | ): | ||
|
r42483 | branch = None | ||
|
r43347 | if not extra or b'branch' not in extra: | ||
|
r42483 | try: | ||
branch = repo.dirstate.branch() | ||||
except UnicodeDecodeError: | ||||
|
r43347 | raise error.Abort(_(b'branch name not in UTF-8!')) | ||
|
r43346 | super(workingctx, self).__init__( | ||
repo, text, user, date, extra, changes, branch=branch | ||||
) | ||||
|
r19671 | |||
|
r14129 | def __iter__(self): | ||
d = self._repo.dirstate | ||||
for f in d: | ||||
|
r43347 | if d[f] != b'r': | ||
|
r14129 | yield f | ||
|
r21845 | def __contains__(self, key): | ||
|
r43347 | return self._repo.dirstate[key] not in b"?r" | ||
|
r21845 | |||
|
r25590 | def hex(self): | ||
|
r42133 | return wdirhex | ||
|
r25590 | |||
|
r8157 | @propertycache | ||
|
r7368 | def _parents(self): | ||
p = self._repo.dirstate.parents() | ||||
if p[1] == nullid: | ||||
p = p[:-1] | ||||
|
r39995 | # use unfiltered repo to delay/avoid loading obsmarkers | ||
unfi = self._repo.unfiltered() | ||||
r44206 | return [ | |||
changectx( | ||||
self._repo, unfi.changelog.rev(n), n, maybe_filtered=False | ||||
) | ||||
for n in p | ||||
] | ||||
|
r3217 | |||
|
r37465 | def _fileinfo(self, path): | ||
# populate __dict__['_manifest'] as workingctx has no _manifestdelta | ||||
self._manifest | ||||
return super(workingctx, self)._fileinfo(path) | ||||
|
r42478 | def _buildflagfunc(self): | ||
# Create a fallback function for getting file flags when the | ||||
# filesystem doesn't support them | ||||
copiesget = self._repo.dirstate.copies().get | ||||
parents = self.parents() | ||||
if len(parents) < 2: | ||||
# when we have one parent, it's easy: copy from parent | ||||
man = parents[0].manifest() | ||||
|
r43346 | |||
|
r42478 | def func(f): | ||
f = copiesget(f, f) | ||||
return man.flags(f) | ||||
|
r43346 | |||
|
r42478 | else: | ||
# merges are tricky: we try to reconstruct the unstored | ||||
# result from the merge (issue1802) | ||||
p1, p2 = parents | ||||
pa = p1.ancestor(p2) | ||||
m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest() | ||||
def func(f): | ||||
|
r43346 | f = copiesget(f, f) # may be wrong for merges with copies | ||
|
r42478 | fl1, fl2, fla = m1.flags(f), m2.flags(f), ma.flags(f) | ||
if fl1 == fl2: | ||||
return fl1 | ||||
if fl1 == fla: | ||||
return fl2 | ||||
if fl2 == fla: | ||||
return fl1 | ||||
|
r43347 | return b'' # punt for conflicts | ||
|
r42478 | |||
return func | ||||
@propertycache | ||||
def _flagfunc(self): | ||||
return self._repo.dirstate.flagfunc(self._buildflagfunc) | ||||
def flags(self, path): | ||||
|
r43906 | if '_manifest' in self.__dict__: | ||
|
r42478 | try: | ||
return self._manifest.flags(path) | ||||
except KeyError: | ||||
|
r43347 | return b'' | ||
|
r42478 | |||
try: | ||||
return self._flagfunc(path) | ||||
except OSError: | ||||
|
r43347 | return b'' | ||
|
r42478 | |||
|
r3966 | def filectx(self, path, filelog=None): | ||
|
r3217 | """get a file context from the working directory""" | ||
|
r43346 | return workingfilectx( | ||
self._repo, path, workingctx=self, filelog=filelog | ||||
) | ||||
|
r3217 | |||
|
r16491 | def dirty(self, missing=False, merge=True, branch=True): | ||
|
r44226 | """check whether a working directory is modified""" | ||
|
r11110 | # check subrepos first | ||
|
r18364 | for s in sorted(self.substate): | ||
|
r33364 | if self.sub(s).dirty(missing=missing): | ||
|
r11110 | return True | ||
# check current working dir | ||||
|
r43346 | return ( | ||
(merge and self.p2()) | ||||
or (branch and self.branch() != self.p1().branch()) | ||||
or self.modified() | ||||
or self.added() | ||||
or self.removed() | ||||
or (missing and self.deleted()) | ||||
) | ||||
|
r8717 | |||
|
r43347 | def add(self, list, prefix=b""): | ||
|
r27809 | with self._repo.wlock(): | ||
ui, ds = self._repo.ui, self._repo.dirstate | ||||
|
r33501 | uipath = lambda f: ds.pathto(pathutil.join(prefix, f)) | ||
|
r11303 | rejected = [] | ||
|
r19900 | lstat = self._repo.wvfs.lstat | ||
|
r11303 | for f in list: | ||
|
r33501 | # ds.pathto() returns an absolute file when this is invoked from | ||
# the keyword extension. That gets flagged as non-portable on | ||||
# Windows, since it contains the drive letter and colon. | ||||
scmutil.checkportable(ui, os.path.join(prefix, f)) | ||||
|
r11303 | try: | ||
|
r19900 | st = lstat(f) | ||
|
r14004 | except OSError: | ||
|
r43347 | ui.warn(_(b"%s does not exist!\n") % uipath(f)) | ||
|
r11303 | rejected.append(f) | ||
continue | ||||
|
r43347 | limit = ui.configbytes(b'ui', b'large-file-limit') | ||
|
r38619 | if limit != 0 and st.st_size > limit: | ||
|
r43346 | ui.warn( | ||
_( | ||||
|
r43347 | b"%s: up to %d MB of RAM may be required " | ||
b"to manage this file\n" | ||||
b"(use 'hg revert %s' to cancel the " | ||||
b"pending addition)\n" | ||||
|
r43346 | ) | ||
% (f, 3 * st.st_size // 1000000, uipath(f)) | ||||
) | ||||
|
r11303 | if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)): | ||
|
r43346 | ui.warn( | ||
_( | ||||
|
r43347 | b"%s not added: only files and symlinks " | ||
b"supported currently\n" | ||||
|
r43346 | ) | ||
% uipath(f) | ||||
) | ||||
|
r19900 | rejected.append(f) | ||
|
r43347 | elif ds[f] in b'amn': | ||
ui.warn(_(b"%s already tracked!\n") % uipath(f)) | ||||
elif ds[f] == b'r': | ||||
|
r11303 | ds.normallookup(f) | ||
else: | ||||
ds.add(f) | ||||
return rejected | ||||
|
r43347 | def forget(self, files, prefix=b""): | ||
|
r27810 | with self._repo.wlock(): | ||
|
r33501 | ds = self._repo.dirstate | ||
uipath = lambda f: ds.pathto(pathutil.join(prefix, f)) | ||||
|
r15912 | rejected = [] | ||
|
r14435 | for f in files: | ||
|
r41763 | if f not in ds: | ||
|
r43347 | self._repo.ui.warn(_(b"%s not tracked!\n") % uipath(f)) | ||
|
r15912 | rejected.append(f) | ||
|
r43347 | elif ds[f] != b'a': | ||
|
r41763 | ds.remove(f) | ||
|
r11303 | else: | ||
|
r41763 | ds.drop(f) | ||
|
r15912 | return rejected | ||
|
r11303 | |||
def copy(self, source, dest): | ||||
|
r19902 | try: | ||
st = self._repo.wvfs.lstat(dest) | ||||
|
r25660 | except OSError as err: | ||
|
r19902 | if err.errno != errno.ENOENT: | ||
raise | ||||
|
r43346 | self._repo.ui.warn( | ||
|
r43347 | _(b"%s does not exist!\n") % self._repo.dirstate.pathto(dest) | ||
|
r43346 | ) | ||
|
r19902 | return | ||
if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)): | ||||
|
r43346 | self._repo.ui.warn( | ||
|
r43387 | _(b"copy failed: %s is not a file or a symbolic link\n") | ||
|
r43346 | % self._repo.dirstate.pathto(dest) | ||
) | ||||
|
r11303 | else: | ||
|
r27812 | with self._repo.wlock(): | ||
|
r41763 | ds = self._repo.dirstate | ||
|
r43347 | if ds[dest] in b'?': | ||
|
r41763 | ds.add(dest) | ||
|
r43347 | elif ds[dest] in b'r': | ||
|
r41763 | ds.normallookup(dest) | ||
ds.copy(source, dest) | ||||
|
r11303 | |||
|
r43346 | def match( | ||
self, | ||||
pats=None, | ||||
include=None, | ||||
exclude=None, | ||||
|
r43347 | default=b'glob', | ||
|
r43346 | listsubrepos=False, | ||
badfn=None, | ||||
): | ||||
|
r24790 | r = self._repo | ||
# Only a case insensitive filesystem needs magic to translate user input | ||||
# to actual case in the filesystem. | ||||
|
r32400 | icasefs = not util.fscasesensitive(r.root) | ||
|
r43346 | return matchmod.match( | ||
r.root, | ||||
r.getcwd(), | ||||
pats, | ||||
include, | ||||
exclude, | ||||
default, | ||||
auditor=r.auditor, | ||||
ctx=self, | ||||
listsubrepos=listsubrepos, | ||||
badfn=badfn, | ||||
icasefs=icasefs, | ||||
) | ||||
|
r24790 | |||
|
r21393 | def _filtersuspectsymlink(self, files): | ||
if not files or self._repo.dirstate._checklink: | ||||
return files | ||||
# Symlink placeholders may get non-symlink-like contents | ||||
# via user error or dereferencing by NFS or Samba servers, | ||||
# so we filter out any placeholders that don't look like a | ||||
# symlink | ||||
sane = [] | ||||
for f in files: | ||||
|
r43347 | if self.flags(f) == b'l': | ||
|
r21393 | d = self[f].data() | ||
|
r43346 | if ( | ||
|
r43347 | d == b'' | ||
|
r43346 | or len(d) >= 1024 | ||
|
r43347 | or b'\n' in d | ||
|
r43346 | or stringutil.binary(d) | ||
): | ||||
self._repo.ui.debug( | ||||
|
r43387 | b'ignoring suspect symlink placeholder "%s"\n' % f | ||
|
r43346 | ) | ||
|
r21393 | continue | ||
sane.append(f) | ||||
return sane | ||||
|
r21395 | def _checklookup(self, files): | ||
# check for any possibly clean files | ||||
if not files: | ||||
|
r32651 | return [], [], [] | ||
|
r21395 | |||
modified = [] | ||||
|
r32651 | deleted = [] | ||
|
r21395 | fixup = [] | ||
pctx = self._parents[0] | ||||
# do a full compare of any files that might have changed | ||||
for f in sorted(files): | ||||
|
r32651 | try: | ||
# This will return True for a file that got replaced by a | ||||
# directory in the interim, but fixing that is pretty hard. | ||||
|
r43346 | if ( | ||
f not in pctx | ||||
or self.flags(f) != pctx.flags(f) | ||||
or pctx[f].cmp(self[f]) | ||||
): | ||||
|
r32651 | modified.append(f) | ||
else: | ||||
fixup.append(f) | ||||
except (IOError, OSError): | ||||
# A file become inaccessible in between? Mark it as deleted, | ||||
# matching dirstate behavior (issue5584). | ||||
# The dirstate has more complex behavior around whether a | ||||
# missing file matches a directory, etc, but we don't need to | ||||
# bother with that: if f has made it to this point, we're sure | ||||
# it's in the dirstate. | ||||
deleted.append(f) | ||||
|
r21395 | |||
|
r32812 | return modified, deleted, fixup | ||
|
r32813 | def _poststatusfixup(self, status, fixup): | ||
|
r32812 | """update dirstate for files that are actually clean""" | ||
|
r32814 | poststatus = self._repo.postdsstatus() | ||
if fixup or poststatus: | ||||
|
r21395 | try: | ||
|
r32752 | oldid = self._repo.dirstate.identity() | ||
|
r21395 | # updating the dirstate is optional | ||
# so we don't wait on the lock | ||||
|
r21990 | # wlock can invalidate the dirstate, so cache normal _after_ | ||
# taking the lock | ||||
|
r27813 | with self._repo.wlock(False): | ||
|
r32752 | if self._repo.dirstate.identity() == oldid: | ||
|
r32814 | if fixup: | ||
normal = self._repo.dirstate.normal | ||||
for f in fixup: | ||||
normal(f) | ||||
# write changes out explicitly, because nesting | ||||
# wlock at runtime may prevent 'wlock.release()' | ||||
# after this block from doing so for subsequent | ||||
# changing files | ||||
tr = self._repo.currenttransaction() | ||||
self._repo.dirstate.write(tr) | ||||
if poststatus: | ||||
for ps in poststatus: | ||||
ps(self, status) | ||||
|
r32752 | else: | ||
# in this case, writing changes out breaks | ||||
# consistency, because .hg/dirstate was | ||||
# already changed simultaneously after last | ||||
# caching (see also issue5584 for detail) | ||||
|
r43346 | self._repo.ui.debug( | ||
|
r43387 | b'skip updating dirstate: identity mismatch\n' | ||
|
r43346 | ) | ||
|
r21395 | except error.LockError: | ||
pass | ||||
|
r32814 | finally: | ||
# Even if the wlock couldn't be grabbed, clear out the list. | ||||
self._repo.clearpostdsstatus() | ||||
|
r21395 | |||
|
r33938 | def _dirstatestatus(self, match, ignored=False, clean=False, unknown=False): | ||
|
r21397 | '''Gets the status from the dirstate -- internal use only.''' | ||
subrepos = [] | ||||
|
r43347 | if b'.hgsub' in self: | ||
|
r21397 | subrepos = sorted(self.substate) | ||
|
r43346 | cmp, s = self._repo.dirstate.status( | ||
match, subrepos, ignored=ignored, clean=clean, unknown=unknown | ||||
) | ||||
|
r21397 | |||
# check for any possibly clean files | ||||
|
r32812 | fixup = [] | ||
|
r21397 | if cmp: | ||
|
r32651 | modified2, deleted2, fixup = self._checklookup(cmp) | ||
|
r23303 | s.modified.extend(modified2) | ||
|
r32651 | s.deleted.extend(deleted2) | ||
|
r21397 | |||
|
r34345 | if fixup and clean: | ||
|
r23303 | s.clean.extend(fixup) | ||
|
r21397 | |||
|
r32813 | self._poststatusfixup(s, fixup) | ||
|
r32812 | |||
|
r23776 | if match.always(): | ||
# cache for performance | ||||
if s.unknown or s.ignored or s.clean: | ||||
# "_status" is cached with list*=False in the normal route | ||||
|
r43346 | self._status = scmutil.status( | ||
s.modified, s.added, s.removed, s.deleted, [], [], [] | ||||
) | ||||
|
r23776 | else: | ||
self._status = s | ||||
|
r23303 | return s | ||
|
r21397 | |||
|
r31259 | @propertycache | ||
|
r42477 | def _copies(self): | ||
p1copies = {} | ||||
p2copies = {} | ||||
parents = self._repo.dirstate.parents() | ||||
p1manifest = self._repo[parents[0]].manifest() | ||||
p2manifest = self._repo[parents[1]].manifest() | ||||
|
r43125 | changedset = set(self.added()) | set(self.modified()) | ||
|
r42477 | narrowmatch = self._repo.narrowmatch() | ||
for dst, src in self._repo.dirstate.copies().items(): | ||||
|
r43125 | if dst not in changedset or not narrowmatch(dst): | ||
|
r42477 | continue | ||
if src in p1manifest: | ||||
p1copies[dst] = src | ||||
elif src in p2manifest: | ||||
p2copies[dst] = src | ||||
return p1copies, p2copies | ||||
@propertycache | ||||
|
r31259 | def _manifest(self): | ||
"""generate a manifest corresponding to the values in self._status | ||||
This reuse the file nodeid from parent, but we use special node | ||||
identifiers for added and modified files. This is used by manifests | ||||
merge to see that files are different and by update logic to avoid | ||||
deleting newly added files. | ||||
""" | ||||
return self._buildstatusmanifest(self._status) | ||||
def _buildstatusmanifest(self, status): | ||||
"""Builds a manifest that includes the given status results.""" | ||||
parents = self.parents() | ||||
man = parents[0].manifest().copy() | ||||
ff = self._flagfunc | ||||
|
r43346 | for i, l in ( | ||
(addednodeid, status.added), | ||||
(modifiednodeid, status.modified), | ||||
): | ||||
|
r31259 | for f in l: | ||
man[f] = i | ||||
try: | ||||
man.setflag(f, ff(f)) | ||||
except OSError: | ||||
pass | ||||
for f in status.deleted + status.removed: | ||||
if f in man: | ||||
del man[f] | ||||
return man | ||||
|
r43346 | def _buildstatus( | ||
self, other, s, match, listignored, listclean, listunknown | ||||
): | ||||
|
r21480 | """build a status with respect to another context | ||
This includes logic for maintaining the fast path of status when | ||||
comparing the working directory against its parent, which is to skip | ||||
building a new manifest if self (working directory) is not comparing | ||||
against its parent (repo['.']). | ||||
""" | ||||
|
r23239 | s = self._dirstatestatus(match, listignored, listclean, listunknown) | ||
|
r23543 | # Filter out symlinks that, in the case of FAT32 and NTFS filesystems, | ||
|
r23242 | # might have accidentally ended up with the entire contents of the file | ||
|
r23543 | # they are supposed to be linking to. | ||
|
r23302 | s.modified[:] = self._filtersuspectsymlink(s.modified) | ||
|
r43347 | if other != self._repo[b'.']: | ||
|
r43346 | s = super(workingctx, self)._buildstatus( | ||
other, s, match, listignored, listclean, listunknown | ||||
) | ||||
|
r21480 | return s | ||
|
r23237 | def _matchstatus(self, other, match): | ||
|
r21482 | """override the match method with a filter for directory patterns | ||
We use inheritance to customize the match.bad method only in cases of | ||||
workingctx since it belongs only to the working directory when | ||||
comparing against the parent changeset. | ||||
If we aren't comparing against the working directory's parent, then we | ||||
just use the default match object sent to us. | ||||
""" | ||||
|
r43347 | if other != self._repo[b'.']: | ||
|
r43346 | |||
|
r21482 | def bad(f, msg): | ||
# 'f' may be a directory pattern from 'match.files()', | ||||
# so 'f not in ctx1' is not enough | ||||
|
r24326 | if f not in other and not other.hasdir(f): | ||
|
r43346 | self._repo.ui.warn( | ||
|
r43347 | b'%s: %s\n' % (self._repo.dirstate.pathto(f), msg) | ||
|
r43346 | ) | ||
|
r21482 | match.bad = bad | ||
return match | ||||
|
r42479 | def walk(self, match): | ||
'''Generates matching file names.''' | ||||
|
r43346 | return sorted( | ||
self._repo.dirstate.walk( | ||||
self._repo.narrowmatch(match), | ||||
subrepos=sorted(self.substate), | ||||
unknown=True, | ||||
ignored=False, | ||||
) | ||||
) | ||||
|
r42479 | |||
def matches(self, match): | ||||
match = self._repo.narrowmatch(match) | ||||
ds = self._repo.dirstate | ||||
|
r43347 | return sorted(f for f in ds.matches(match) if ds[f] != b'r') | ||
|
r42479 | |||
|
r33353 | def markcommitted(self, node): | ||
|
r42481 | with self._repo.dirstate.parentchange(): | ||
for f in self.modified() + self.added(): | ||||
self._repo.dirstate.normal(f) | ||||
for f in self.removed(): | ||||
self._repo.dirstate.drop(f) | ||||
self._repo.dirstate.setparents(node) | ||||
# write changes out explicitly, because nesting wlock at | ||||
# runtime may prevent 'wlock.release()' in 'repo.commit()' | ||||
# from immediately doing so for subsequent changing files | ||||
self._repo.dirstate.write(self._repo.currenttransaction()) | ||||
|
r33353 | |||
sparse.aftercommit(self._repo, node) | ||||
|
r43346 | |||
|
r19733 | class committablefilectx(basefilectx): | ||
"""A committablefilectx provides common functionality for a file context | ||||
that wants the ability to commit, e.g. workingfilectx or memfilectx.""" | ||||
|
r43346 | |||
|
r19701 | def __init__(self, repo, path, filelog=None, ctx=None): | ||
|
r3217 | self._repo = repo | ||
self._path = path | ||||
self._changeid = None | ||||
self._filerev = self._filenode = None | ||||
|
r19149 | if filelog is not None: | ||
|
r3217 | self._filelog = filelog | ||
|
r19702 | if ctx: | ||
self._changectx = ctx | ||||
|
r19703 | def __nonzero__(self): | ||
return True | ||||
|
r31476 | __bool__ = __nonzero__ | ||
|
r24420 | def linkrev(self): | ||
# linked to self._changectx no matter if file is modified or not | ||||
return self.rev() | ||||
|
r41936 | def renamed(self): | ||
path = self.copysource() | ||||
if not path: | ||||
return None | ||||
return path, self._changectx._parents[0]._manifest.get(path, nullid) | ||||
|
r3217 | def parents(self): | ||
'''return parent filectxs, following copies if necessary''' | ||||
|
r43346 | |||
|
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 | |||
|
r43346 | return [ | ||
self._parentfilectx(p, fileid=n, filelog=l) | ||||
for p, n, l in pl | ||||
if n != nullid | ||||
] | ||||
|
r3217 | |||
|
r19705 | def children(self): | ||
return [] | ||||
|
r43346 | |||
|
r19733 | class workingfilectx(committablefilectx): | ||
|
r19704 | """A workingfilectx object makes access to data related to a particular | ||
file in the working directory convenient.""" | ||||
|
r43346 | |||
|
r19704 | def __init__(self, repo, path, filelog=None, workingctx=None): | ||
super(workingfilectx, self).__init__(repo, path, filelog, workingctx) | ||||
@propertycache | ||||
def _changectx(self): | ||||
return workingctx(self._repo) | ||||
def data(self): | ||||
return self._repo.wread(self._path) | ||||
|
r43346 | |||
|
r41934 | def copysource(self): | ||
return self._repo.dirstate.copied(self._path) | ||||
|
r19704 | |||
|
r10282 | def size(self): | ||
|
r19901 | return self._repo.wvfs.lstat(self._path).st_size | ||
|
r43346 | |||
|
r42656 | def lstat(self): | ||
return self._repo.wvfs.lstat(self._path) | ||||
|
r43346 | |||
|
r3962 | def date(self): | ||
t, tz = self._changectx.date() | ||||
try: | ||||
|
r36799 | return (self._repo.wvfs.lstat(self._path)[stat.ST_MTIME], tz) | ||
|
r25660 | except OSError as err: | ||
|
r10282 | if err.errno != errno.ENOENT: | ||
raise | ||||
|
r3962 | return (t, tz) | ||
|
r3310 | |||
|
r33283 | def exists(self): | ||
return self._repo.wvfs.exists(self._path) | ||||
def lexists(self): | ||||
return self._repo.wvfs.lexists(self._path) | ||||
|
r33086 | def audit(self): | ||
return self._repo.wvfs.audit(self._path) | ||||
|
r11702 | def cmp(self, fctx): | ||
"""compare with other file context | ||||
|
r11539 | |||
|
r11702 | returns True if different than fctx. | ||
|
r11539 | """ | ||
|
r17425 | # fctx should be a filectx (not a workingfilectx) | ||
|
r11703 | # invert comparison to reuse the same code path | ||
return fctx.cmp(self) | ||||
|
r6715 | |||
|
r22073 | def remove(self, ignoremissing=False): | ||
"""wraps unlink for a repo's working directory""" | ||||
|
r43347 | rmdir = self._repo.ui.configbool(b'experimental', b'removeemptydirs') | ||
|
r43346 | self._repo.wvfs.unlinkpath( | ||
self._path, ignoremissing=ignoremissing, rmdir=rmdir | ||||
) | ||||
|
r22073 | |||
|
r35743 | def write(self, data, flags, backgroundclose=False, **kwargs): | ||
|
r22073 | """wraps repo.wwrite""" | ||
|
r43346 | return self._repo.wwrite( | ||
self._path, data, flags, backgroundclose=backgroundclose, **kwargs | ||||
) | ||||
|
r22073 | |||
|
r34788 | def markcopied(self, src): | ||
"""marks this file a copy of `src`""" | ||||
|
r42509 | self._repo.dirstate.copy(src, self._path) | ||
|
r34788 | |||
|
r34039 | def clearunknown(self): | ||
"""Removes conflicting items in the working directory so that | ||||
``write()`` can be called successfully. | ||||
""" | ||||
wvfs = self._repo.wvfs | ||||
|
r34557 | f = self._path | ||
|
r34834 | wvfs.audit(f) | ||
|
r43347 | if self._repo.ui.configbool( | ||
b'experimental', b'merge.checkpathconflicts' | ||||
): | ||||
|
r39232 | # remove files under the directory as they should already be | ||
# warned and backed up | ||||
if wvfs.isdir(f) and not wvfs.islink(f): | ||||
wvfs.rmtree(f, forcibly=True) | ||||
|
r44032 | for p in reversed(list(pathutil.finddirs(f))): | ||
|
r37119 | if wvfs.isfileorlink(p): | ||
wvfs.unlink(p) | ||||
break | ||||
|
r39232 | else: | ||
# don't remove files if path conflicts are not processed | ||||
if wvfs.isdir(f) and not wvfs.islink(f): | ||||
wvfs.removedirs(f) | ||||
|
r34039 | |||
|
r33084 | def setflags(self, l, x): | ||
self._repo.wvfs.setflags(self._path, l, x) | ||||
|
r43346 | |||
|
r35324 | class overlayworkingctx(committablectx): | ||
"""Wraps another mutable context with a write-back cache that can be | ||||
converted into a commit context. | ||||
|
r34106 | |||
self._cache[path] maps to a dict with keys: { | ||||
'exists': bool? | ||||
'date': date? | ||||
'data': str? | ||||
'flags': str? | ||||
|
r35294 | 'copied': str? (path or None) | ||
|
r34106 | } | ||
If `exists` is True, `flags` must be non-None and 'date' is non-None. If it | ||||
is `False`, the file was deleted. | ||||
""" | ||||
|
r35290 | def __init__(self, repo): | ||
|
r34106 | super(overlayworkingctx, self).__init__(repo) | ||
|
r35287 | self.clean() | ||
|
r35290 | |||
def setbase(self, wrappedctx): | ||||
|
r34106 | self._wrappedctx = wrappedctx | ||
|
r35290 | self._parents = [wrappedctx] | ||
|
r35328 | # Drop old manifest cache as it is now out of date. | ||
# This is necessary when, e.g., rebasing several nodes with one | ||||
# ``overlayworkingctx`` (e.g. with --collapse). | ||||
|
r43347 | util.clearcachedproperty(self, b'_manifest') | ||
|
r34106 | |||
def data(self, path): | ||||
if self.isdirty(path): | ||||
|
r43347 | if self._cache[path][b'exists']: | ||
if self._cache[path][b'data'] is not None: | ||||
return self._cache[path][b'data'] | ||||
|
r34106 | else: | ||
# Must fallback here, too, because we only set flags. | ||||
return self._wrappedctx[path].data() | ||||
else: | ||||
|
r43346 | raise error.ProgrammingError( | ||
|
r43347 | b"No such file or directory: %s" % path | ||
|
r43346 | ) | ||
|
r34106 | else: | ||
return self._wrappedctx[path].data() | ||||
|
r35322 | @propertycache | ||
def _manifest(self): | ||||
parents = self.parents() | ||||
man = parents[0].manifest().copy() | ||||
flag = self._flagfunc | ||||
for path in self.added(): | ||||
man[path] = addednodeid | ||||
man.setflag(path, flag(path)) | ||||
for path in self.modified(): | ||||
man[path] = modifiednodeid | ||||
man.setflag(path, flag(path)) | ||||
for path in self.removed(): | ||||
del man[path] | ||||
return man | ||||
@propertycache | ||||
def _flagfunc(self): | ||||
def f(path): | ||||
|
r43347 | return self._cache[path][b'flags'] | ||
|
r43346 | |||
|
r35322 | return f | ||
def files(self): | ||||
return sorted(self.added() + self.modified() + self.removed()) | ||||
def modified(self): | ||||
|
r43346 | return [ | ||
f | ||||
for f in self._cache.keys() | ||||
|
r43347 | if self._cache[f][b'exists'] and self._existsinparent(f) | ||
|
r43346 | ] | ||
|
r35322 | |||
def added(self): | ||||
|
r43346 | return [ | ||
f | ||||
for f in self._cache.keys() | ||||
|
r43347 | if self._cache[f][b'exists'] and not self._existsinparent(f) | ||
|
r43346 | ] | ||
|
r35322 | |||
def removed(self): | ||||
|
r43346 | return [ | ||
f | ||||
for f in self._cache.keys() | ||||
|
r43347 | if not self._cache[f][b'exists'] and self._existsinparent(f) | ||
|
r43346 | ] | ||
|
r35322 | |||
|
r41921 | def p1copies(self): | ||
copies = self._repo._wrappedctx.p1copies().copy() | ||||
narrowmatch = self._repo.narrowmatch() | ||||
for f in self._cache.keys(): | ||||
if not narrowmatch(f): | ||||
continue | ||||
|
r43346 | copies.pop(f, None) # delete if it exists | ||
|
r43347 | source = self._cache[f][b'copied'] | ||
|
r41921 | if source: | ||
copies[f] = source | ||||
return copies | ||||
def p2copies(self): | ||||
copies = self._repo._wrappedctx.p2copies().copy() | ||||
narrowmatch = self._repo.narrowmatch() | ||||
for f in self._cache.keys(): | ||||
if not narrowmatch(f): | ||||
continue | ||||
|
r43346 | copies.pop(f, None) # delete if it exists | ||
|
r43347 | source = self._cache[f][b'copied'] | ||
|
r41921 | if source: | ||
copies[f] = source | ||||
return copies | ||||
|
r34682 | def isinmemory(self): | ||
return True | ||||
|
r34106 | def filedate(self, path): | ||
if self.isdirty(path): | ||||
|
r43347 | return self._cache[path][b'date'] | ||
|
r34106 | else: | ||
return self._wrappedctx[path].date() | ||||
|
r35294 | def markcopied(self, path, origin): | ||
|
r43346 | self._markdirty( | ||
path, | ||||
exists=True, | ||||
date=self.filedate(path), | ||||
flags=self.flags(path), | ||||
copied=origin, | ||||
) | ||||
|
r35294 | |||
def copydata(self, path): | ||||
if self.isdirty(path): | ||||
|
r43347 | return self._cache[path][b'copied'] | ||
|
r35294 | else: | ||
|
r42474 | return None | ||
|
r35294 | |||
|
r34106 | def flags(self, path): | ||
if self.isdirty(path): | ||||
|
r43347 | if self._cache[path][b'exists']: | ||
return self._cache[path][b'flags'] | ||||
|
r34106 | else: | ||
|
r43346 | raise error.ProgrammingError( | ||
|
r43347 | b"No such file or directory: %s" % self._path | ||
|
r43346 | ) | ||
|
r34106 | else: | ||
return self._wrappedctx[path].flags() | ||||
|
r40839 | def __contains__(self, key): | ||
if key in self._cache: | ||||
|
r43347 | return self._cache[key][b'exists'] | ||
|
r40839 | return key in self.p1() | ||
|
r35296 | def _existsinparent(self, path): | ||
try: | ||||
# ``commitctx` raises a ``ManifestLookupError`` if a path does not | ||||
# exist, unlike ``workingctx``, which returns a ``workingfilectx`` | ||||
# with an ``exists()`` function. | ||||
self._wrappedctx[path] | ||||
return True | ||||
except error.ManifestLookupError: | ||||
return False | ||||
|
r35325 | def _auditconflicts(self, path): | ||
"""Replicates conflict checks done by wvfs.write(). | ||||
Since we never write to the filesystem and never call `applyupdates` in | ||||
IMM, we'll never check that a path is actually writable -- e.g., because | ||||
it adds `a/foo`, but `a` is actually a file in the other commit. | ||||
""" | ||||
|
r43346 | |||
|
r35325 | def fail(path, component): | ||
# p1() is the base and we're receiving "writes" for p2()'s | ||||
# files. | ||||
|
r43347 | if b'l' in self.p1()[component].flags(): | ||
|
r43346 | raise error.Abort( | ||
|
r43347 | b"error: %s conflicts with symlink %s " | ||
b"in %d." % (path, component, self.p1().rev()) | ||||
|
r43346 | ) | ||
|
r35325 | else: | ||
|
r43346 | raise error.Abort( | ||
|
r43347 | b"error: '%s' conflicts with file '%s' in " | ||
b"%d." % (path, component, self.p1().rev()) | ||||
|
r43346 | ) | ||
|
r35325 | |||
# Test that each new directory to be created to write this path from p2 | ||||
# is not a file in p1. | ||||
|
r43347 | components = path.split(b'/') | ||
|
r38806 | for i in pycompat.xrange(len(components)): | ||
|
r43347 | component = b"/".join(components[0:i]) | ||
|
r40839 | if component in self: | ||
|
r35325 | fail(path, component) | ||
# Test the other direction -- that this path from p2 isn't a directory | ||||
|
r40852 | # in p1 (test that p1 doesn't have any paths matching `path/*`). | ||
|
r42271 | match = self.match([path], default=b'path') | ||
|
r35325 | matches = self.p1().manifest().matches(match) | ||
|
r39612 | mfiles = matches.keys() | ||
if len(mfiles) > 0: | ||||
if len(mfiles) == 1 and mfiles[0] == path: | ||||
return | ||||
# omit the files which are deleted in current IMM wctx | ||||
|
r40839 | mfiles = [m for m in mfiles if m in self] | ||
|
r39612 | if not mfiles: | ||
|
r35325 | return | ||
|
r43346 | raise error.Abort( | ||
|
r43347 | b"error: file '%s' cannot be written because " | ||
b" '%s/' is a directory in %s (containing %d " | ||||
b"entries: %s)" | ||||
% (path, path, self.p1(), len(mfiles), b', '.join(mfiles)) | ||||
|
r43346 | ) | ||
|
r35325 | |||
|
r43347 | def write(self, path, data, flags=b'', **kwargs): | ||
|
r34106 | if data is None: | ||
|
r43347 | raise error.ProgrammingError(b"data must be non-None") | ||
|
r35325 | self._auditconflicts(path) | ||
|
r43346 | self._markdirty( | ||
path, exists=True, data=data, date=dateutil.makedate(), flags=flags | ||||
) | ||||
|
r34106 | |||
def setflags(self, path, l, x): | ||||
|
r43347 | flag = b'' | ||
|
r39101 | if l: | ||
|
r43347 | flag = b'l' | ||
|
r39101 | elif x: | ||
|
r43347 | flag = b'x' | ||
|
r43346 | self._markdirty(path, exists=True, date=dateutil.makedate(), flags=flag) | ||
|
r34106 | |||
def remove(self, path): | ||||
self._markdirty(path, exists=False) | ||||
def exists(self, path): | ||||
"""exists behaves like `lexists`, but needs to follow symlinks and | ||||
return False if they are broken. | ||||
""" | ||||
if self.isdirty(path): | ||||
# If this path exists and is a symlink, "follow" it by calling | ||||
# exists on the destination path. | ||||
|
r43346 | if ( | ||
|
r43347 | self._cache[path][b'exists'] | ||
and b'l' in self._cache[path][b'flags'] | ||||
|
r43346 | ): | ||
|
r43347 | return self.exists(self._cache[path][b'data'].strip()) | ||
|
r34106 | else: | ||
|
r43347 | return self._cache[path][b'exists'] | ||
|
r35296 | |||
return self._existsinparent(path) | ||||
|
r34106 | |||
def lexists(self, path): | ||||
"""lexists returns True if the path exists""" | ||||
if self.isdirty(path): | ||||
|
r43347 | return self._cache[path][b'exists'] | ||
|
r35296 | |||
return self._existsinparent(path) | ||||
|
r34106 | |||
def size(self, path): | ||||
if self.isdirty(path): | ||||
|
r43347 | if self._cache[path][b'exists']: | ||
return len(self._cache[path][b'data']) | ||||
|
r34106 | else: | ||
|
r43346 | raise error.ProgrammingError( | ||
|
r43347 | b"No such file or directory: %s" % self._path | ||
|
r43346 | ) | ||
|
r34106 | return self._wrappedctx[path].size() | ||
|
r43346 | def tomemctx( | ||
self, | ||||
text, | ||||
branch=None, | ||||
extra=None, | ||||
date=None, | ||||
parents=None, | ||||
user=None, | ||||
editor=None, | ||||
): | ||||
|
r35326 | """Converts this ``overlayworkingctx`` into a ``memctx`` ready to be | ||
committed. | ||||
``text`` is the commit message. | ||||
``parents`` (optional) are rev numbers. | ||||
""" | ||||
# Default parents to the wrapped contexts' if not passed. | ||||
if parents is None: | ||||
parents = self._wrappedctx.parents() | ||||
if len(parents) == 1: | ||||
parents = (parents[0], None) | ||||
# ``parents`` is passed as rev numbers; convert to ``commitctxs``. | ||||
if parents[1] is None: | ||||
parents = (self._repo[parents[0]], None) | ||||
else: | ||||
parents = (self._repo[parents[0]], self._repo[parents[1]]) | ||||
|
r42476 | files = self.files() | ||
|
r43346 | |||
|
r35326 | def getfile(repo, memctx, path): | ||
|
r43347 | if self._cache[path][b'exists']: | ||
|
r43346 | return memfilectx( | ||
repo, | ||||
memctx, | ||||
path, | ||||
|
r43347 | self._cache[path][b'data'], | ||
b'l' in self._cache[path][b'flags'], | ||||
b'x' in self._cache[path][b'flags'], | ||||
self._cache[path][b'copied'], | ||||
|
r43346 | ) | ||
|
r35326 | else: | ||
# Returning None, but including the path in `files`, is | ||||
# necessary for memctx to register a deletion. | ||||
return None | ||||
|
r43346 | |||
return memctx( | ||||
self._repo, | ||||
parents, | ||||
text, | ||||
files, | ||||
getfile, | ||||
date=date, | ||||
extra=extra, | ||||
user=user, | ||||
branch=branch, | ||||
editor=editor, | ||||
) | ||||
|
r35326 | |||
|
r34106 | def isdirty(self, path): | ||
return path in self._cache | ||||
|
r35320 | def isempty(self): | ||
# We need to discard any keys that are actually clean before the empty | ||||
# commit check. | ||||
self._compact() | ||||
return len(self._cache) == 0 | ||||
|
r35287 | def clean(self): | ||
|
r34106 | self._cache = {} | ||
|
r35327 | def _compact(self): | ||
"""Removes keys from the cache that are actually clean, by comparing | ||||
them with the underlying context. | ||||
This can occur during the merge process, e.g. by passing --tool :local | ||||
to resolve a conflict. | ||||
""" | ||||
keys = [] | ||||
|
r41189 | # This won't be perfect, but can help performance significantly when | ||
# using things like remotefilelog. | ||||
scmutil.prefetchfiles( | ||||
|
r43346 | self.repo(), | ||
[self.p1().rev()], | ||||
scmutil.matchfiles(self.repo(), self._cache.keys()), | ||||
) | ||||
|
r41189 | |||
|
r35327 | for path in self._cache.keys(): | ||
cache = self._cache[path] | ||||
try: | ||||
underlying = self._wrappedctx[path] | ||||
|
r43346 | if ( | ||
|
r43347 | underlying.data() == cache[b'data'] | ||
and underlying.flags() == cache[b'flags'] | ||||
|
r43346 | ): | ||
|
r35327 | keys.append(path) | ||
except error.ManifestLookupError: | ||||
# Path not in the underlying manifest (created). | ||||
continue | ||||
for path in keys: | ||||
del self._cache[path] | ||||
return keys | ||||
|
r43346 | def _markdirty( | ||
|
r43347 | self, path, exists, data=None, date=None, flags=b'', copied=None | ||
|
r43346 | ): | ||
|
r39163 | # data not provided, let's see if we already have some; if not, let's | ||
# grab it from our underlying context, so that we always have data if | ||||
# the file is marked as existing. | ||||
if exists and data is None: | ||||
oldentry = self._cache.get(path) or {} | ||||
|
r43347 | data = oldentry.get(b'data') | ||
|
r42728 | if data is None: | ||
data = self._wrappedctx[path].data() | ||||
|
r39163 | |||
|
r34106 | self._cache[path] = { | ||
|
r43347 | b'exists': exists, | ||
b'data': data, | ||||
b'date': date, | ||||
b'flags': flags, | ||||
b'copied': copied, | ||||
|
r34106 | } | ||
def filectx(self, path, filelog=None): | ||||
|
r43346 | return overlayworkingfilectx( | ||
self._repo, path, parent=self, filelog=filelog | ||||
) | ||||
|
r34106 | |||
|
r35324 | class overlayworkingfilectx(committablefilectx): | ||
|
r34106 | """Wrap a ``workingfilectx`` but intercepts all writes into an in-memory | ||
cache, which can be flushed through later by calling ``flush()``.""" | ||||
def __init__(self, repo, path, filelog=None, parent=None): | ||||
|
r43346 | super(overlayworkingfilectx, self).__init__(repo, path, filelog, parent) | ||
|
r34106 | self._repo = repo | ||
self._parent = parent | ||||
self._path = path | ||||
|
r34784 | def cmp(self, fctx): | ||
return self.data() != fctx.data() | ||||
|
r35282 | def changectx(self): | ||
|
r34106 | return self._parent | ||
def data(self): | ||||
return self._parent.data(self._path) | ||||
def date(self): | ||||
return self._parent.filedate(self._path) | ||||
def exists(self): | ||||
return self.lexists() | ||||
def lexists(self): | ||||
return self._parent.exists(self._path) | ||||
|
r41934 | def copysource(self): | ||
return self._parent.copydata(self._path) | ||||
|
r34106 | def size(self): | ||
return self._parent.size(self._path) | ||||
|
r35294 | def markcopied(self, origin): | ||
self._parent.markcopied(self._path, origin) | ||||
|
r34106 | def audit(self): | ||
pass | ||||
def flags(self): | ||||
return self._parent.flags(self._path) | ||||
def setflags(self, islink, isexec): | ||||
return self._parent.setflags(self._path, islink, isexec) | ||||
|
r35743 | def write(self, data, flags, backgroundclose=False, **kwargs): | ||
return self._parent.write(self._path, data, flags, **kwargs) | ||||
|
r34106 | |||
def remove(self, ignoremissing=False): | ||||
return self._parent.remove(self._path) | ||||
|
r35323 | def clearunknown(self): | ||
pass | ||||
|
r43346 | |||
|
r23710 | class workingcommitctx(workingctx): | ||
"""A workingcommitctx object makes access to data related to | ||||
the revision being committed convenient. | ||||
This hides changes in the working directory, if they aren't | ||||
committed in this context. | ||||
""" | ||||
|
r43346 | |||
def __init__( | ||||
|
r43347 | self, repo, changes, text=b"", user=None, date=None, extra=None | ||
|
r43346 | ): | ||
super(workingcommitctx, self).__init__( | ||||
repo, text, user, date, extra, changes | ||||
) | ||||
|
r23710 | |||
|
r33938 | def _dirstatestatus(self, match, ignored=False, clean=False, unknown=False): | ||
|
r23712 | """Return matched files only in ``self._status`` | ||
Uncommitted files appear "clean" via this context, even if | ||||
they aren't actually so in the working directory. | ||||
""" | ||||
if clean: | ||||
clean = [f for f in self._manifest if f not in self._changedset] | ||||
else: | ||||
clean = [] | ||||
|
r43346 | return scmutil.status( | ||
[f for f in self._status.modified if match(f)], | ||||
[f for f in self._status.added if match(f)], | ||||
[f for f in self._status.removed if match(f)], | ||||
[], | ||||
[], | ||||
[], | ||||
clean, | ||||
) | ||||
|
r23712 | |||
@propertycache | ||||
def _changedset(self): | ||||
"""Return the set of files changed in this context | ||||
""" | ||||
changed = set(self._status.modified) | ||||
changed.update(self._status.added) | ||||
changed.update(self._status.removed) | ||||
return changed | ||||
|
r43346 | |||
|
r27906 | def makecachingfilectxfn(func): | ||
"""Create a filectxfn that caches based on the path. | ||||
We can't use util.cachefunc because it uses all arguments as the cache | ||||
key and this creates a cycle since the arguments include the repo and | ||||
memctx. | ||||
""" | ||||
cache = {} | ||||
def getfilectx(repo, memctx, path): | ||||
if path not in cache: | ||||
cache[path] = func(repo, memctx, path) | ||||
return cache[path] | ||||
return getfilectx | ||||
|
r43346 | |||
|
r32763 | def memfilefromctx(ctx): | ||
"""Given a context return a memfilectx for ctx[path] | ||||
This is a convenience method for building a memctx based on another | ||||
context. | ||||
""" | ||||
|
r43346 | |||
|
r32763 | def getfilectx(repo, memctx, path): | ||
fctx = ctx[path] | ||||
|
r42161 | copysource = fctx.copysource() | ||
|
r43346 | return memfilectx( | ||
repo, | ||||
memctx, | ||||
path, | ||||
fctx.data(), | ||||
islink=fctx.islink(), | ||||
isexec=fctx.isexec(), | ||||
copysource=copysource, | ||||
) | ||||
|
r32763 | |||
return getfilectx | ||||
|
r43346 | |||
|
r32764 | def memfilefrompatch(patchstore): | ||
"""Given a patch (e.g. patchstore object) return a memfilectx | ||||
This is a convenience method for building a memctx based on a patchstore. | ||||
""" | ||||
|
r43346 | |||
|
r32764 | def getfilectx(repo, memctx, path): | ||
|
r42161 | data, mode, copysource = patchstore.getfile(path) | ||
|
r32764 | if data is None: | ||
return None | ||||
islink, isexec = mode | ||||
|
r43346 | return memfilectx( | ||
repo, | ||||
memctx, | ||||
path, | ||||
data, | ||||
islink=islink, | ||||
isexec=isexec, | ||||
copysource=copysource, | ||||
) | ||||
|
r32764 | |||
return getfilectx | ||||
|
r43346 | |||
|
r21665 | class memctx(committablectx): | ||
|
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 | ||||
|
r31612 | object. If the file was removed, filectxfn return None for recent | ||
Mercurial. Moved files are represented by marking the source file | ||||
|
r7077 | 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 | ||||
|
r36625 | supported by dateutil.parsedate() and defaults to current date, extra | ||
|
r7077 | is a dictionary of metadata or is left empty. | ||
|
r6715 | """ | ||
|
r22313 | |||
# Mercurial <= 3.1 expects the filectxfn to raise IOError for missing files. | ||||
# Extensions that need to retain compatibility across Mercurial 3.1 can use | ||||
# this field to determine what to do in filectxfn. | ||||
_returnnoneformissingfiles = True | ||||
|
r43346 | def __init__( | ||
self, | ||||
repo, | ||||
parents, | ||||
text, | ||||
files, | ||||
filectxfn, | ||||
user=None, | ||||
date=None, | ||||
extra=None, | ||||
branch=None, | ||||
editor=False, | ||||
): | ||||
super(memctx, self).__init__( | ||||
repo, text, user, date, extra, branch=branch | ||||
) | ||||
|
r6715 | self._rev = None | ||
self._node = None | ||||
parents = [(p or nullid) for p in parents] | ||||
p1, p2 = parents | ||||
|
r37190 | self._parents = [self._repo[p] for p in (p1, p2)] | ||
|
r8209 | files = sorted(set(files)) | ||
|
r23587 | self._files = files | ||
|
r21938 | self.substate = {} | ||
|
r6715 | |||
|
r32765 | if isinstance(filectxfn, patch.filestore): | ||
|
r32781 | filectxfn = memfilefrompatch(filectxfn) | ||
|
r32765 | elif not callable(filectxfn): | ||
# if store is not callable, wrap it in a function | ||||
|
r32781 | filectxfn = memfilefromctx(filectxfn) | ||
# memoizing increases performance for e.g. vcs convert scenarios. | ||||
self._filectxfn = makecachingfilectxfn(filectxfn) | ||||
|
r22072 | |||
|
r21238 | if editor: | ||
self._text = editor(self._repo, self, []) | ||||
self._repo.savecommitmessage(self._text) | ||||
|
r6715 | def filectx(self, path, filelog=None): | ||
|
r22296 | """get a file context from the working directory | ||
Returns None if file doesn't exist and should be removed.""" | ||||
|
r6715 | return self._filectxfn(self._repo, self, path) | ||
|
r11151 | def commit(self): | ||
"""commit context to the repo""" | ||||
return self._repo.commitctx(self) | ||||
|
r21835 | @propertycache | ||
def _manifest(self): | ||||
"""generate a manifest based on the return values of filectxfn""" | ||||
# keep this simple for now; just worry about p1 | ||||
pctx = self._parents[0] | ||||
man = pctx.manifest().copy() | ||||
|
r23603 | for f in self._status.modified: | ||
|
r39749 | man[f] = modifiednodeid | ||
|
r21835 | |||
|
r23588 | for f in self._status.added: | ||
|
r39749 | man[f] = addednodeid | ||
|
r23588 | |||
|
r23589 | for f in self._status.removed: | ||
if f in man: | ||||
del man[f] | ||||
|
r21835 | |||
return man | ||||
|
r23587 | @propertycache | ||
def _status(self): | ||||
"""Calculate exact status from ``files`` specified at construction | ||||
""" | ||||
man1 = self.p1().manifest() | ||||
p2 = self._parents[1] | ||||
# "1 < len(self._parents)" can't be used for checking | ||||
# existence of the 2nd parent, because "memctx._parents" is | ||||
# explicitly initialized by the list, of which length is 2. | ||||
if p2.node() != nullid: | ||||
man2 = p2.manifest() | ||||
managing = lambda f: f in man1 or f in man2 | ||||
else: | ||||
managing = lambda f: f in man1 | ||||
modified, added, removed = [], [], [] | ||||
for f in self._files: | ||||
if not managing(f): | ||||
added.append(f) | ||||
elif self[f]: | ||||
modified.append(f) | ||||
else: | ||||
removed.append(f) | ||||
return scmutil.status(modified, added, removed, [], [], [], []) | ||||
|
r21835 | |||
|
r43346 | |||
|
r21688 | class memfilectx(committablefilectx): | ||
|
r7077 | """memfilectx represents an in-memory file to commit. | ||
|
r23139 | See memctx and committablefilectx for more details. | ||
|
r6715 | """ | ||
|
r43346 | |||
def __init__( | ||||
self, | ||||
repo, | ||||
changectx, | ||||
path, | ||||
data, | ||||
islink=False, | ||||
isexec=False, | ||||
copysource=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.""" | ||||
|
r35401 | super(memfilectx, self).__init__(repo, path, None, changectx) | ||
|
r6715 | self._data = data | ||
|
r38784 | if islink: | ||
|
r43347 | self._flags = b'l' | ||
|
r38784 | elif isexec: | ||
|
r43347 | self._flags = b'x' | ||
|
r38784 | else: | ||
|
r43347 | self._flags = b'' | ||
|
r42162 | self._copysource = copysource | ||
def copysource(self): | ||||
return self._copysource | ||||
|
r6715 | |||
|
r41022 | def cmp(self, fctx): | ||
return self.data() != fctx.data() | ||||
|
r10282 | def data(self): | ||
return self._data | ||||
|
r22074 | |||
def remove(self, ignoremissing=False): | ||||
"""wraps unlink for a repo's working directory""" | ||||
# need to figure out what to do here | ||||
del self._changectx[self._path] | ||||
|
r35743 | def write(self, data, flags, **kwargs): | ||
|
r22074 | """wraps repo.wwrite""" | ||
self._data = data | ||||
|
r30567 | |||
|
r32239 | |||
|
r30567 | class metadataonlyctx(committablectx): | ||
"""Like memctx but it's reusing the manifest of different commit. | ||||
Intended to be used by lightweight operations that are creating | ||||
metadata-only changes. | ||||
Revision information is supplied at initialization time. 'repo' is the | ||||
current localrepo, 'ctx' is original revision which manifest we're reuisng | ||||
'parents' is a sequence of two parent revisions identifiers (pass None for | ||||
every missing parent), 'text' is the commit. | ||||
user receives the committer name and defaults to current repository | ||||
username, date is the commit date in any format supported by | ||||
|
r36625 | dateutil.parsedate() and defaults to current date, extra is a dictionary of | ||
|
r30567 | metadata or is left empty. | ||
""" | ||||
|
r43346 | |||
def __init__( | ||||
self, | ||||
repo, | ||||
originalctx, | ||||
parents=None, | ||||
text=None, | ||||
user=None, | ||||
date=None, | ||||
extra=None, | ||||
editor=False, | ||||
): | ||||
|
r34000 | if text is None: | ||
text = originalctx.description() | ||||
|
r30567 | super(metadataonlyctx, self).__init__(repo, text, user, date, extra) | ||
self._rev = None | ||||
self._node = None | ||||
self._originalctx = originalctx | ||||
self._manifestnode = originalctx.manifestnode() | ||||
|
r34000 | if parents is None: | ||
parents = originalctx.parents() | ||||
else: | ||||
parents = [repo[p] for p in parents if p is not None] | ||||
parents = parents[:] | ||||
while len(parents) < 2: | ||||
parents.append(repo[nullid]) | ||||
p1, p2 = self._parents = parents | ||||
|
r30567 | |||
# sanity check to ensure that the reused manifest parents are | ||||
# manifests of our commit parents | ||||
mp1, mp2 = self.manifestctx().parents | ||||
|
r31840 | if p1 != nullid and p1.manifestnode() != mp1: | ||
|
r43346 | raise RuntimeError( | ||
r"can't reuse the manifest: its p1 " | ||||
r"doesn't match the new ctx p1" | ||||
) | ||||
|
r31840 | if p2 != nullid and p2.manifestnode() != mp2: | ||
|
r43346 | raise RuntimeError( | ||
r"can't reuse the manifest: " | ||||
r"its p2 doesn't match the new ctx p2" | ||||
) | ||||
|
r30567 | |||
self._files = originalctx.files() | ||||
self.substate = {} | ||||
if editor: | ||||
self._text = editor(self._repo, self, []) | ||||
self._repo.savecommitmessage(self._text) | ||||
def manifestnode(self): | ||||
return self._manifestnode | ||||
|
r32519 | @property | ||
|
r30567 | def _manifestctx(self): | ||
return self._repo.manifestlog[self._manifestnode] | ||||
def filectx(self, path, filelog=None): | ||||
return self._originalctx.filectx(path, filelog=filelog) | ||||
def commit(self): | ||||
"""commit context to the repo""" | ||||
return self._repo.commitctx(self) | ||||
@property | ||||
def _manifest(self): | ||||
return self._originalctx.manifest() | ||||
@propertycache | ||||
def _status(self): | ||||
"""Calculate exact status from ``files`` specified in the ``origctx`` | ||||
and parents manifests. | ||||
""" | ||||
man1 = self.p1().manifest() | ||||
p2 = self._parents[1] | ||||
# "1 < len(self._parents)" can't be used for checking | ||||
# existence of the 2nd parent, because "metadataonlyctx._parents" is | ||||
# explicitly initialized by the list, of which length is 2. | ||||
if p2.node() != nullid: | ||||
man2 = p2.manifest() | ||||
managing = lambda f: f in man1 or f in man2 | ||||
else: | ||||
managing = lambda f: f in man1 | ||||
modified, added, removed = [], [], [] | ||||
for f in self._files: | ||||
if not managing(f): | ||||
added.append(f) | ||||
|
r34001 | elif f in self: | ||
|
r30567 | modified.append(f) | ||
else: | ||||
removed.append(f) | ||||
return scmutil.status(modified, added, removed, [], [], [], []) | ||||
|
r34053 | |||
|
r43346 | |||
|
r34053 | class arbitraryfilectx(object): | ||
"""Allows you to use filectx-like functions on a file in an arbitrary | ||||
location on disk, possibly not in the working directory. | ||||
""" | ||||
|
r43346 | |||
|
r34686 | def __init__(self, path, repo=None): | ||
# Repo is optional because contrib/simplemerge uses this class. | ||||
self._repo = repo | ||||
|
r34053 | self._path = path | ||
|
r34686 | def cmp(self, fctx): | ||
|
r34836 | # filecmp follows symlinks whereas `cmp` should not, so skip the fast | ||
# path if either side is a symlink. | ||||
|
r43347 | symlinks = b'l' in self.flags() or b'l' in fctx.flags() | ||
|
r34836 | if not symlinks and isinstance(fctx, workingfilectx) and self._repo: | ||
|
r34686 | # Add a fast-path for merge if both sides are disk-backed. | ||
|
r34836 | # Note that filecmp uses the opposite return values (True if same) | ||
# from our cmp functions (True if different). | ||||
|
r34686 | return not filecmp.cmp(self.path(), self._repo.wjoin(fctx.path())) | ||
return self.data() != fctx.data() | ||||
|
r34053 | |||
def path(self): | ||||
return self._path | ||||
def flags(self): | ||||
|
r43347 | return b'' | ||
|
r34053 | |||
def data(self): | ||||
return util.readfile(self._path) | ||||
def decodeddata(self): | ||||
|
r43347 | with open(self._path, b"rb") as f: | ||
|
r34053 | return f.read() | ||
def remove(self): | ||||
util.unlink(self._path) | ||||
|
r35743 | def write(self, data, flags, **kwargs): | ||
|
r34053 | assert not flags | ||
|
r43347 | with open(self._path, b"wb") as f: | ||
|
r34053 | f.write(data) | ||