##// END OF EJS Templates
formatting: run black version 19.10b0 on the codebase...
formatting: run black version 19.10b0 on the codebase The latest version of black is out and contains the change we needed. So we can start using it now. note: `test-check-format.t` will complains about this changes because it still use `grey` and need to be migrated to `black`. See next changesets for this.

File last commit:

r43655:0604287a stable
r43655:0604287a stable
Show More
context.py
2986 lines | 94.5 KiB | text/x-python | PythonLexer
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 # context.py - changeset and file context objects for mercurial
#
Thomas Arendsen Hein
Updated copyright notices and add "and others" to "hg version"
r4635 # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 #
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Gregory Szorc
context: use absolute_import
r27506 from __future__ import absolute_import
import errno
Phil Cohen
context: add a fast-comparision for arbitraryfilectx and workingfilectx...
r34686 import filecmp
Gregory Szorc
context: use absolute_import
r27506 import os
import stat
Mads Kiilerich
context: don't hex encode all unknown 20 char revision specs (issue4890)...
r26604
Gregory Szorc
context: use absolute_import
r27506 from .i18n import _
from .node import (
Durham Goode
dirstate: change added/modified placeholder hash length to 20 bytes...
r30361 addednodeid,
Gregory Szorc
context: use absolute_import
r27506 hex,
Durham Goode
dirstate: change added/modified placeholder hash length to 20 bytes...
r30361 modifiednodeid,
Gregory Szorc
context: use absolute_import
r27506 nullid,
nullrev,
short,
Yuya Nishihara
node: rename wdirnodes to clarify they are for manifest/filelogs...
r37466 wdirfilenodeids,
Martin von Zweigbergk
context: use wdirhex constant instead of calculating it...
r42133 wdirhex,
Gregory Szorc
context: use absolute_import
r27506 )
Gregory Szorc
py3: manually import getattr where it is needed...
r43359 from .pycompat import (
getattr,
open,
)
Gregory Szorc
context: use absolute_import
r27506 from . import (
copies: extract an explicit `computechangesetcopie` method from context...
r42935 copies,
Yuya Nishihara
dagop: move annotateline and _annotatepair from context.py...
r36935 dagop,
Gregory Szorc
context: use absolute_import
r27506 encoding,
error,
fileset,
match as matchmod,
obsolete as obsmod,
patch,
Matt Harbison
context: name files relative to cwd in warning messages...
r33501 pathutil,
Gregory Szorc
context: use absolute_import
r27506 phases,
Augie Fackler
context: work around `long` not existing on Python 3...
r31343 pycompat,
Gregory Szorc
context: use absolute_import
r27506 repoview,
scmutil,
Gregory Szorc
sparse: move post commit actions into core...
r33353 sparse,
Gregory Szorc
context: use absolute_import
r27506 subrepo,
Yuya Nishihara
subrepo: split non-core functions to new module...
r36026 subrepoutil,
Gregory Szorc
context: use absolute_import
r27506 util,
)
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 from .utils import (
dateutil,
stringutil,
)
Matt Mackall
filectx: add rename traversal for parents()
r3122
Matt Mackall
util: take propertycache from context.py
r8207 propertycache = util.propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basectx: add an empty class that will be used as a parent of all contexts...
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."""
Martin von Zweigbergk
context: set repo property in basectx...
r37192 def __init__(self, repo):
self._repo = repo
Augie Fackler
context: implement both __bytes__ and __str__ for Python 3...
r31344 def __bytes__(self):
Sean Farley
basectx: move __str__ from changectx
r19540 return short(self.node())
Yuya Nishihara
py3: add utility to forward __str__() to __bytes__()...
r33022 __str__ = encoding.strmethod(__bytes__)
Sean Farley
basectx: move __repr__ from changectx...
r19546 def __repr__(self):
Pulkit Goyal
py3: make sure we return strings from __str__ and __repr__...
r32613 return r"<%s %s>" % (type(self).__name__, str(self))
Sean Farley
basectx: move __repr__ from changectx...
r19546
Sean Farley
basectx: move __eq__ from changectx...
r19547 def __eq__(self, other):
try:
return type(self) == type(other) and self._rev == other._rev
except AttributeError:
return False
Sean Farley
basectx: move __ne__ from changectx
r19548 def __ne__(self, other):
return not (self == other)
Sean Farley
basectx: move __contains__ from changectx
r19550 def __contains__(self, key):
return key in self._manifest
Sean Farley
basectx: move __getitem__ from changectx
r19551 def __getitem__(self, key):
return self.filectx(key)
Sean Farley
basectx: move __iter__ from changectx
r19552 def __iter__(self):
Augie Fackler
context: don't sort manifest entries...
r24227 return iter(self._manifest)
Sean Farley
basectx: move __iter__ from changectx
r19552
Durham Goode
context: remove uses of manifest.matches...
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()
Siddharth Agarwal
context: generate filtered manifest efficiently for exact matchers...
r21880
Martin von Zweigbergk
context.status: remove unused arguments from _matchstatus()
r23237 def _matchstatus(self, other, match):
Martin von Zweigbergk
context: always pass a matcher into _matchstatus() (API)...
r33937 """This internal method provides a way for child objects to override the
Sean Farley
basectx: add _matchstatus method for factoring out last of parentworking logic...
r21481 match operator.
"""
Martin von Zweigbergk
context: always pass a matcher into _matchstatus() (API)...
r33937 return match
Sean Farley
basectx: add _matchstatus method for factoring out last of parentworking logic...
r21481
Augie Fackler
formatting: blacken the codebase...
r43346 def _buildstatus(
self, other, s, match, listignored, listclean, listunknown
):
Sean Farley
context: add _buildstatus method...
r21471 """build a status with respect to another context"""
Martin von Zweigbergk
context.status: explain "caching reasons" more fully...
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.
Durham Goode
context: remove assumptions about manifest creation during _buildstatus...
r31260 mf2 = None
Martin von Zweigbergk
context.status: move manifest caching trick to _buildstatus()...
r23238 if self.rev() is not None and self.rev() < other.rev():
Durham Goode
context: remove uses of manifest.matches...
r31261 mf2 = self._buildstatusmanifest(s)
mf1 = other._buildstatusmanifest(s)
Durham Goode
context: remove assumptions about manifest creation during _buildstatus...
r31260 if mf2 is None:
Durham Goode
context: remove uses of manifest.matches...
r31261 mf2 = self._buildstatusmanifest(s)
Sean Farley
context: add _buildstatus method...
r21471
Augie Fackler
context: use manifest.diff() to compute most of status...
r23755 modified, added = [], []
removed = []
Augie Fackler
context: use new manifest.diff(clean=True) support...
r23757 clean = []
Martin von Zweigbergk
context.status: pass status tuple into _buildstatus...
r23304 deleted, unknown, ignored = s.deleted, s.unknown, s.ignored
Martin von Zweigbergk
status: make 'hg status --rev' faster when there are deleted files...
r23085 deletedset = set(deleted)
Durham Goode
context: remove uses of manifest.matches...
r31261 d = mf1.diff(mf2, match=match, clean=listclean)
Gregory Szorc
py3: finish porting iteritems() to pycompat and remove source transformer...
r43376 for fn, value in pycompat.iteritems(d):
Martin von Zweigbergk
status: don't list files as both clean and deleted...
r23731 if fn in deletedset:
continue
Augie Fackler
context: use new manifest.diff(clean=True) support...
r23757 if value is None:
clean.append(fn)
continue
(node1, flag1), (node2, flag2) = value
Augie Fackler
context: use manifest.diff() to compute most of status...
r23755 if node1 is None:
added.append(fn)
elif node2 is None:
removed.append(fn)
Martin von Zweigbergk
context: check for differing flags a little earlier...
r27749 elif flag1 != flag2:
modified.append(fn)
Yuya Nishihara
node: rename wdirnodes to clarify they are for manifest/filelogs...
r37466 elif node2 not in wdirfilenodeids:
Martin von Zweigbergk
context: clarify why we don't compare file contents when nodeid differs...
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.
Martin von Zweigbergk
status: back out changeset 89f49813526c...
r27747 modified.append(fn)
Augie Fackler
context: use manifest.diff() to compute most of status...
r23755 elif self[fn].cmp(other[fn]):
modified.append(fn)
Martin von Zweigbergk
status: don't list files as both clean and deleted...
r23731 else:
Augie Fackler
context: use new manifest.diff(clean=True) support...
r23757 clean.append(fn)
Augie Fackler
context: use manifest.diff() to compute most of status...
r23755
Pierre-Yves David
status: explicitly exclude removed file from unknown and ignored...
r21971 if removed:
# need to filter files if they are already reported as removed
Augie Fackler
formatting: blacken the codebase...
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))
]
Martin von Zweigbergk
status: don't list files as both removed and deleted...
r23730 # if they're deleted, don't report them as removed
removed = [fn for fn in removed if fn not in deletedset]
Sean Farley
context: add _buildstatus method...
r21471
Augie Fackler
formatting: blacken the codebase...
r43346 return scmutil.status(
modified, added, removed, deleted, unknown, ignored, clean
)
Sean Farley
context: add _buildstatus method...
r21471
Sean Farley
basectx: move substate from changectx
r19549 @propertycache
def substate(self):
Yuya Nishihara
subrepo: split non-core functions to new module...
r36026 return subrepoutil.state(self, self._repo.ui)
Sean Farley
basectx: move substate from changectx
r19549
Sean Farley
basectx: add subrev method to return the rev of a subrepo given a subpath...
r21586 def subrev(self, subpath):
return self.substate[subpath][1]
Sean Farley
basectx: move rev from changectx
r19541 def rev(self):
return self._rev
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basectx: move node from changectx
r19542 def node(self):
return self._node
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basectx: move hex from changectx
r19543 def hex(self):
Sean Farley
basectx: change _node to node() in hex...
r19544 return hex(self.node())
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basectx: move manifest from changectx
r19553 def manifest(self):
return self._manifest
Augie Fackler
formatting: blacken the codebase...
r43346
Durham Goode
context: add manifestctx property on changectx...
r30344 def manifestctx(self):
return self._manifestctx
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Harbison
context: add a repo accessor...
r24300 def repo(self):
return self._repo
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basectx: move phasestr from changectx
r19554 def phasestr(self):
return phases.phasenames[self.phase()]
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basectx: move mutable from changectx
r19555 def mutable(self):
return self.phase() > phases.public
Sean Farley
basectx: move rev from changectx
r19541
Yuya Nishihara
fileset: restrict getfileset() to not return a computed set (API)...
r38631 def matchfileset(self, expr, badfn=None):
return fileset.match(self, expr, badfn=badfn)
Augie Fackler
context: add a getfileset() method so fewer things need fileset directly...
r20400
Sean Farley
context: move evolution functions from changectx to basectx...
r19734 def obsolete(self):
"""True if the changeset is obsolete"""
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return self.rev() in obsmod.getrevs(self._repo, b'obsolete')
Sean Farley
context: move evolution functions from changectx to basectx...
r19734
def extinct(self):
"""True if the changeset is extinct"""
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return self.rev() in obsmod.getrevs(self._repo, b'extinct')
Sean Farley
context: move evolution functions from changectx to basectx...
r19734
Boris Feld
context: rename unstable into orphan...
r33693 def orphan(self):
av6
context: use new names for unstable changesets in docstrings...
r39328 """True if the changeset is not obsolete, but its ancestor is"""
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return self.rev() in obsmod.getrevs(self._repo, b'orphan')
Sean Farley
context: move evolution functions from changectx to basectx...
r19734
Boris Feld
context: rename bumped into phasedivergent...
r33695 def phasedivergent(self):
av6
context: use new names for unstable changesets in docstrings...
r39328 """True if the changeset tries to be a successor of a public changeset
Sean Farley
context: move evolution functions from changectx to basectx...
r19734
av6
context: use new names for unstable changesets in docstrings...
r39328 Only non-public and non-obsolete changesets may be phase-divergent.
Sean Farley
context: move evolution functions from changectx to basectx...
r19734 """
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return self.rev() in obsmod.getrevs(self._repo, b'phasedivergent')
Sean Farley
context: move evolution functions from changectx to basectx...
r19734
Boris Feld
context: rename divergent into contentdivergent...
r33694 def contentdivergent(self):
av6
context: use new names for unstable changesets in docstrings...
r39328 """Is a successor of a changeset with multiple possible successor sets
Sean Farley
context: move evolution functions from changectx to basectx...
r19734
av6
context: use new names for unstable changesets in docstrings...
r39328 Only non-public and non-obsolete changesets may be content-divergent.
Sean Farley
context: move evolution functions from changectx to basectx...
r19734 """
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return self.rev() in obsmod.getrevs(self._repo, b'contentdivergent')
Sean Farley
context: move evolution functions from changectx to basectx...
r19734
Boris Feld
context: rename troubled into isunstable...
r33696 def isunstable(self):
av6
context: use new names for unstable changesets in docstrings...
r39328 """True if the changeset is either orphan, phase-divergent or
content-divergent"""
Boris Feld
context: rename bumped into phasedivergent...
r33695 return self.orphan() or self.phasedivergent() or self.contentdivergent()
Sean Farley
context: move evolution functions from changectx to basectx...
r19734
Boris Feld
context: rename troubles into instabilities...
r33692 def instabilities(self):
"""return the list of instabilities affecting this changeset.
Instabilities are returned as strings. possible values are:
Boris Feld
evolution: rename unstable to orphan...
r33632 - orphan,
Boris Feld
evolution: rename bumped to phase-divergent...
r33652 - phase-divergent,
Boris Feld
evolution: rename divergent to content-divergent...
r33651 - content-divergent.
Sean Farley
context: move evolution functions from changectx to basectx...
r19734 """
Boris Feld
context: rename troubles into instabilities...
r33692 instabilities = []
Boris Feld
context: rename unstable into orphan...
r33693 if self.orphan():
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 instabilities.append(b'orphan')
Boris Feld
context: rename bumped into phasedivergent...
r33695 if self.phasedivergent():
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 instabilities.append(b'phase-divergent')
Boris Feld
context: rename divergent into contentdivergent...
r33694 if self.contentdivergent():
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 instabilities.append(b'content-divergent')
Boris Feld
context: rename troubles into instabilities...
r33692 return instabilities
Sean Farley
context: move evolution functions from changectx to basectx...
r19734
Sean Farley
basectx: move parents from changectx
r19556 def parents(self):
"""return contexts for each parent changeset"""
return self._parents
Sean Farley
basectx: move p1 from changectx
r19557 def p1(self):
return self._parents[0]
Sean Farley
basectx: move p2 from changectx
r19558 def p2(self):
Gregory Szorc
context: avoid extra parents lookups...
r27064 parents = self._parents
if len(parents) == 2:
return parents[1]
Martin von Zweigbergk
context: reduce dependence of changectx constructor...
r39993 return self._repo[nullrev]
Sean Farley
basectx: move p2 from changectx
r19558
Sean Farley
basectx: move _fileinfo from changectx
r19559 def _fileinfo(self, path):
Pulkit Goyal
py3: use raw strings while accessing class.__dict__...
r32148 if r'_manifest' in self.__dict__:
Sean Farley
basectx: move _fileinfo from changectx
r19559 try:
return self._manifest[path], self._manifest.flags(path)
except KeyError:
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.ManifestLookupError(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self._node, path, _(b'not found in manifest')
Augie Fackler
formatting: blacken the codebase...
r43346 )
Pulkit Goyal
py3: use raw strings while accessing class.__dict__...
r32148 if r'_manifestdelta' in self.__dict__ or path in self.files():
Sean Farley
basectx: move _fileinfo from changectx
r19559 if path in self._manifestdelta:
Augie Fackler
formatting: blacken the codebase...
r43346 return (
self._manifestdelta[path],
self._manifestdelta.flags(path),
)
Durham Goode
manifest: remove manifest.find...
r30340 mfl = self._repo.manifestlog
try:
node, flag = mfl[self._changeset.manifest].find(path)
except KeyError:
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.ManifestLookupError(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self._node, path, _(b'not found in manifest')
Augie Fackler
formatting: blacken the codebase...
r43346 )
Sean Farley
basectx: move _fileinfo from changectx
r19559
return node, flag
Sean Farley
basectx: move filenode from changectx
r19560 def filenode(self, path):
return self._fileinfo(path)[0]
Sean Farley
basectx: move flags from changectx
r19561 def flags(self, path):
try:
return self._fileinfo(path)[1]
except error.LookupError:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b''
Sean Farley
basectx: move flags from changectx
r19561
Martin von Zweigbergk
context: reuse changectx._copies() in all but workingctx...
r42477 @propertycache
def _copies(self):
copies: extract an explicit `computechangesetcopie` method from context...
r42935 return copies.computechangesetcopies(self)
Augie Fackler
formatting: blacken the codebase...
r43346
Martin von Zweigbergk
context: reuse changectx._copies() in all but workingctx...
r42477 def p1copies(self):
return self._copies[0]
Augie Fackler
formatting: blacken the codebase...
r43346
Martin von Zweigbergk
context: reuse changectx._copies() in all but workingctx...
r42477 def p2copies(self):
return self._copies[1]
Matt Harbison
verify: don't init subrepo when missing one is referenced (issue5128) (API)...
r29021 def sub(self, path, allowcreate=True):
Matt Harbison
subrepo: allow a representation of the working directory subrepo...
r25600 '''return a subrepo for the stored revision of path, never wdir()'''
Matt Harbison
verify: don't init subrepo when missing one is referenced (issue5128) (API)...
r29021 return subrepo.subrepo(self, path, allowcreate=allowcreate)
Sean Farley
basectx: move sub from changectx
r19562
Matt Harbison
context: introduce the nullsub() method...
r25417 def nullsub(self, path, pctx):
return subrepo.nullsubrepo(self, path, pctx)
Matt Harbison
subrepo: allow a representation of the working directory subrepo...
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)
Augie Fackler
formatting: blacken the codebase...
r43346 def match(
self,
pats=None,
include=None,
exclude=None,
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 default=b'glob',
Augie Fackler
formatting: blacken the codebase...
r43346 listsubrepos=False,
badfn=None,
):
Sean Farley
basectx: move match from changectx
r19563 r = self._repo
Augie Fackler
formatting: blacken the codebase...
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,
):
Sean Farley
basectx: move diff from changectx
r19564 """Returns a diff generator for the given contexts and matcher"""
if ctx2 is None:
ctx2 = self.p1()
Sean Farley
basectx: remove unnecessary check of instance...
r19568 if ctx2 is not None:
Sean Farley
basectx: move diff from changectx
r19564 ctx2 = self._repo[ctx2]
Augie Fackler
formatting: blacken the codebase...
r43346 return patch.diff(
self._repo,
ctx2,
self,
match=match,
changes=changes,
opts=opts,
losedatafn=losedatafn,
pathfn=pathfn,
copy=copy,
copysourcematch=copysourcematch,
hunksfilterfn=hunksfilterfn,
)
Sean Farley
basectx: move diff from changectx
r19564
Drew Gottlieb
manifest: have context's dirs() call its manifest's dirs()...
r24323 def dirs(self):
return self._manifest.dirs()
Sean Farley
basectx: move _dirs from changectx
r19565
Drew Gottlieb
manifest: add hasdir() to context...
r24325 def hasdir(self, dir):
return self._manifest.hasdir(dir)
Sean Farley
basectx: move dirs from changectx
r19566
Augie Fackler
formatting: blacken the codebase...
r43346 def status(
self,
other=None,
match=None,
listignored=False,
listclean=False,
listunknown=False,
listsubrepos=False,
):
Sean Farley
basectx: copy localrepo.status method...
r21594 """return status of files between two nodes or node and working
directory.
If other is None, compare this node with working directory.
Pierre-Yves David
status: document the content of the returned tuple in the docstring...
r21722
returns (modified, added, removed, deleted, unknown, ignored, clean)
Sean Farley
basectx: copy localrepo.status method...
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
Augie Fackler
formatting: blacken the codebase...
r43346 if not isinstance(ctx1, changectx) and isinstance(ctx2, changectx):
Sean Farley
basectx: copy localrepo.status method...
r21594 reversed = True
ctx1, ctx2 = ctx2, ctx1
Martin von Zweigbergk
status: intersect matcher with narrow matcher instead of filtering afterwards...
r40119 match = self._repo.narrowmatch(match)
Martin von Zweigbergk
context.status: remove unused arguments from _matchstatus()
r23237 match = ctx2._matchstatus(ctx1, match)
Martin von Zweigbergk
context.status: pass status tuple into _buildstatus...
r23304 r = scmutil.status([], [], [], [], [], [], [])
Augie Fackler
formatting: blacken the codebase...
r43346 r = ctx2._buildstatus(
ctx1, r, match, listignored, listclean, listunknown
)
Sean Farley
basectx: copy localrepo.status method...
r21594
if reversed:
Martin von Zweigbergk
context.status: wipe deleted/unknown/ignored fields when reversed...
r23301 # Reverse added and removed. Clear deleted, unknown and ignored as
# these make no sense to reverse.
Augie Fackler
formatting: blacken the codebase...
r43346 r = scmutil.status(
r.modified, r.removed, r.added, [], [], [], r.clean
)
Sean Farley
basectx: copy localrepo.status method...
r21594
if listsubrepos:
for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
try:
Andrew Zwicky
extdiff: correctly handle deleted subrepositories (issue3153)...
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
Martin von Zweigbergk
match: rename "narrowmatcher" to "subdirmatcher" (API)...
r28017 submatch = matchmod.subdirmatcher(subpath, match)
Augie Fackler
formatting: blacken the codebase...
r43346 s = sub.status(
rev2,
match=submatch,
ignored=listignored,
clean=listclean,
unknown=listunknown,
listsubrepos=True,
)
Andrew Zwicky
extdiff: correctly handle deleted subrepositories (issue3153)...
r27183 for rfiles, sfiles in zip(r, s):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 rfiles.extend(b"%s/%s" % (subpath, f) for f in sfiles)
Sean Farley
basectx: copy localrepo.status method...
r21594
for l in r:
l.sort()
Sean Farley
context: explicitly return a tuple...
r21616
Martin von Zweigbergk
context.status: wipe deleted/unknown/ignored fields when reversed...
r23301 return r
Sean Farley
basectx: copy localrepo.status method...
r21594
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basectx: add an empty class that will be used as a parent of all contexts...
r19537 class changectx(basectx):
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 """A changecontext object makes access to data related to a particular
Mads Kiilerich
spelling: random spell checker fixes
r19951 changeset convenient. It represents a read-only context already present in
Sean Farley
basectx: add an empty class that will be used as a parent of all contexts...
r19537 the repo."""
Augie Fackler
formatting: blacken the codebase...
r43346
Martin von Zweigbergk
context: move logic from changectx.__init__ to localrepo.__getitem__ (API)...
r39994 def __init__(self, repo, rev, node):
Martin von Zweigbergk
context: set repo property in basectx...
r37192 super(changectx, self).__init__(repo)
Martin von Zweigbergk
context: move logic from changectx.__init__ to localrepo.__getitem__ (API)...
r39994 self._rev = rev
self._node = node
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Paul Moore
python 2.6 compatibility: add __hash__ to classes that have __eq__
r6469 def __hash__(self):
try:
return hash(self._rev)
except AttributeError:
return id(self)
Matt Mackall
context: add __nonzero__ methods
r3168 def __nonzero__(self):
Thomas Arendsen Hein
Define and use nullrev (revision of nullid) instead of -1.
r3578 return self._rev != nullrev
Matt Mackall
context: add __nonzero__ methods
r3168
Gregory Szorc
py3: add __bool__ to every class defining __nonzero__...
r31476 __bool__ = __nonzero__
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _changeset(self):
Gregory Szorc
context: use changelogrevision...
r28488 return self._repo.changelog.changelogrevision(self.rev())
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _manifest(self):
Durham Goode
context: add manifestctx property on changectx...
r30344 return self._manifestctx.read()
Jun Wu
context: do not cache manifestctx...
r32519 @property
Durham Goode
context: add manifestctx property on changectx...
r30344 def _manifestctx(self):
return self._repo.manifestlog[self._changeset.manifest]
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _manifestdelta(self):
Durham Goode
context: add manifestctx property on changectx...
r30344 return self._manifestctx.readdelta()
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _parents(self):
Gregory Szorc
context: optimize _parents()...
r27063 repo = self._repo
p1, p2 = repo.changelog.parentrevs(self._rev)
if p2 == nullrev:
Martin von Zweigbergk
context: reduce dependence of changectx constructor...
r39993 return [repo[p1]]
return [repo[p1], repo[p2]]
Matt Mackall
contexts: use __getattr__ rather than try/except in changectx
r3215
Matt Mackall
many, many trivial check-code fixups
r10282 def changeset(self):
Gregory Szorc
context: use changelogrevision...
r28488 c = self._changeset
return (
c.manifest,
c.user,
c.date,
c.files,
c.description,
c.extra,
)
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Mackall
many, many trivial check-code fixups
r10282 def manifestnode(self):
Gregory Szorc
context: use changelogrevision...
r28488 return self._changeset.manifest
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Matt Mackall
many, many trivial check-code fixups
r10282 def user(self):
Gregory Szorc
context: use changelogrevision...
r28488 return self._changeset.user
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Mackall
many, many trivial check-code fixups
r10282 def date(self):
Gregory Szorc
context: use changelogrevision...
r28488 return self._changeset.date
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Mackall
many, many trivial check-code fixups
r10282 def files(self):
Gregory Szorc
context: use changelogrevision...
r28488 return self._changeset.files
Augie Fackler
formatting: blacken the codebase...
r43346
Martin von Zweigbergk
context: add ctx.files{modified,added,removed}() methods...
r42566 def filesmodified(self):
modified = set(self.files())
modified.difference_update(self.filesadded())
modified.difference_update(self.filesremoved())
return sorted(modified)
context: clarify the various mode in the filesadded method...
r43291
Martin von Zweigbergk
context: add ctx.files{modified,added,removed}() methods...
r42566 def filesadded(self):
context: clarify the various mode in the filesadded method...
r43291 filesadded = self._changeset.filesadded
sidedatacopies: read rename information from sidedata...
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:
sidedatacopies: move various copies related function to the copies modules...
r43417 filesadded = copies.computechangesetfilesadded(self)
sidedatacopies: read rename information from sidedata...
r43416 else:
context: clarify the various mode in the filesadded method...
r43291 filesadded = []
return filesadded
Martin von Zweigbergk
context: add ctx.files{modified,added,removed}() methods...
r42566 def filesremoved(self):
context: clarify the various mode in the filesremoved method...
r43292 filesremoved = self._changeset.filesremoved
sidedatacopies: read rename information from sidedata...
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:
sidedatacopies: move various copies related function to the copies modules...
r43417 filesremoved = copies.computechangesetfilesremoved(self)
sidedatacopies: read rename information from sidedata...
r43416 else:
context: clarify the various mode in the filesremoved method...
r43292 filesremoved = []
return filesremoved
Martin von Zweigbergk
context: add ctx.files{modified,added,removed}() methods...
r42566
Martin von Zweigbergk
context: introduce p[12]copies() methods and debugp[12]copies commands...
r41921 @propertycache
def _copies(self):
Martin von Zweigbergk
changelog: parse copy metadata if available in extras...
r42318 p1copies = self._changeset.p1copies
p2copies = self._changeset.p2copies
sidedatacopies: read rename information from sidedata...
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:
context: clarify the various mode in the _copies property cache...
r43293 p1copies, p2copies = super(changectx, self)._copies
sidedatacopies: read rename information from sidedata...
r43416 else:
if p1copies is None:
p1copies = {}
if p2copies is None:
p2copies = {}
context: clarify the various mode in the _copies property cache...
r43293 return p1copies, p2copies
Matt Mackall
many, many trivial check-code fixups
r10282 def description(self):
Gregory Szorc
context: use changelogrevision...
r28488 return self._changeset.description
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Mackall
many, many trivial check-code fixups
r10282 def branch(self):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return encoding.tolocal(self._changeset.extra.get(b"branch"))
Augie Fackler
formatting: blacken the codebase...
r43346
Brodie Rao
context: add changectx.closesbranch() method...
r16720 def closesbranch(self):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b'close' in self._changeset.extra
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Mackall
many, many trivial check-code fixups
r10282 def extra(self):
rlevasseur@google.com
docs: add args/returns docs for some cmdutil, context, and registrar functions...
r35106 """Return a dict of extra information."""
Gregory Szorc
context: use changelogrevision...
r28488 return self._changeset.extra
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Mackall
many, many trivial check-code fixups
r10282 def tags(self):
rlevasseur@google.com
docs: add args/returns docs for some cmdutil, context, and registrar functions...
r35106 """Return a list of byte tag names"""
Matt Mackall
many, many trivial check-code fixups
r10282 return self._repo.nodetags(self._node)
Augie Fackler
formatting: blacken the codebase...
r43346
David Soria Parra
context: add method to return all bookmarks pointing to a node
r13384 def bookmarks(self):
rlevasseur@google.com
docs: add args/returns docs for some cmdutil, context, and registrar functions...
r35106 """Return a list of byte bookmark names."""
David Soria Parra
context: add method to return all bookmarks pointing to a node
r13384 return self._repo.nodebookmarks(self._node)
Augie Fackler
formatting: blacken the codebase...
r43346
Pierre-Yves David
phases: add a phase method to context
r15421 def phase(self):
Patrick Mezard
phases: introduce phasecache...
r16657 return self._repo._phasecache.phase(self._repo, self._rev)
Augie Fackler
formatting: blacken the codebase...
r43346
Pierre-Yves David
hidden: Add ``hidden`` method for context
r14644 def hidden(self):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return self._rev in repoview.filterrevs(self._repo, b'visible')
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Phil Cohen
context: add is `isinmemory()` to filectx...
r34682 def isinmemory(self):
return False
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 def children(self):
rlevasseur@google.com
docs: add args/returns docs for some cmdutil, context, and registrar functions...
r35106 """return list of changectx contexts for each child changeset.
This returns only the immediate child changesets. Use descendants() to
recursively walk children.
"""
Benoit Boissinot
context.py: self.repo is not defined, change to self._repo
r2627 c = self._repo.changelog.children(self._node)
Martin von Zweigbergk
context: reduce dependence of changectx constructor...
r39993 return [self._repo[x] for x in c]
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Matt Mackall
Merge with stable...
r6876 def ancestors(self):
Bryan O'Sullivan
revlog: ancestors(*revs) becomes ancestors(revs) (API)...
r16866 for a in self._repo.changelog.ancestors([self._rev]):
Martin von Zweigbergk
context: reduce dependence of changectx constructor...
r39993 yield self._repo[a]
Matt Mackall
Merge with stable...
r6876
def descendants(self):
rlevasseur@google.com
docs: add args/returns docs for some cmdutil, context, and registrar functions...
r35106 """Recursively yield all children of the changeset.
For just the immediate children, use children()
"""
Bryan O'Sullivan
revlog: descendants(*revs) becomes descendants(revs) (API)...
r16867 for d in self._repo.changelog.descendants([self._rev]):
Martin von Zweigbergk
context: reduce dependence of changectx constructor...
r39993 yield self._repo[d]
Matt Mackall
Merge with stable...
r6876
Benoit Boissinot
context: create a filectxt with filelog reuse
r3966 def filectx(self, path, fileid=None, filelog=None):
Matt Mackall
Add context.py: changeset and file revision contexts
r2563 """get a file context from this changeset"""
Benoit Boissinot
context.py: filectxs was using a keyword arg, add it to filectx
r2628 if fileid is None:
fileid = self.filenode(path)
Augie Fackler
formatting: blacken the codebase...
r43346 return filectx(
self._repo, path, fileid=fileid, changectx=self, filelog=filelog
)
Matt Mackall
Add context.py: changeset and file revision contexts
r2563
Matt Mackall
ancestor: silence multiple ancestor warning outside of merge (issue4234)...
r21203 def ancestor(self, c2, warn=False):
Mads Kiilerich
comments: describe ancestor consistently - avoid 'least common ancestor'...
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."""
Matt Mackall
merge: fix changectx.ancestor(workingctx) (issue1327)
r9843 # deal with workingctxs
n2 = c2._node
Martin Geisler
code style: prefer 'is' and 'is not' tests with singletons
r13031 if n2 is None:
Matt Mackall
merge: fix changectx.ancestor(workingctx) (issue1327)
r9843 n2 = c2._parents[0]._node
Mads Kiilerich
context: tell when .ancestor picks one of multiple common ancestors heads...
r21125 cahs = self._repo.changelog.commonancestorsheads(self._node, n2)
if not cahs:
anc = nullid
elif len(cahs) == 1:
anc = cahs[0]
else:
Matt Mackall
merge: make merge.preferancestor type and default consistent...
r25844 # experimental config: merge.preferancestor
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 for r in self._repo.ui.configlist(b'merge', b'preferancestor'):
Mads Kiilerich
changectx: skip all invalid merge.preferancestor values...
r22671 try:
Martin von Zweigbergk
context: use revsymbol() in "merge.preferancestor" code...
r37372 ctx = scmutil.revsymbol(self._repo, r)
Mads Kiilerich
changectx: skip all invalid merge.preferancestor values...
r22671 except error.RepoLookupError:
Mads Kiilerich
changectx: ancestor should only prefer merge.preferancestor if it is a revision...
r22180 continue
Mads Kiilerich
context: introduce merge.preferancestor for controlling which ancestor to pick...
r21126 anc = ctx.node()
if anc in cahs:
break
else:
anc = self._repo.changelog.ancestor(self._node, n2)
Matt Mackall
ancestor: silence multiple ancestor warning outside of merge (issue4234)...
r21203 if warn:
self._repo.ui.status(
Augie Fackler
formatting: blacken the codebase...
r43346 (
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b"note: using %s as ancestor of %s and %s\n")
Augie Fackler
formatting: blacken the codebase...
r43346 % (short(anc), short(self._node), short(n2))
)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 + b''.join(
Augie Fackler
formatting: blacken the codebase...
r43346 _(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b" alternatively, use --config "
b"merge.preferancestor=%s\n"
Augie Fackler
formatting: blacken the codebase...
r43346 )
% short(n)
for n in sorted(cahs)
if n != anc
)
)
Martin von Zweigbergk
context: reduce dependence of changectx constructor...
r39993 return self._repo[anc]
Matt Mackall
changectx: add ancestor function
r3125
Martin von Zweigbergk
context: rename descendant() to isancestorof()...
r38692 def isancestorof(self, other):
"""True if this changeset is an ancestor of other"""
Martin von Zweigbergk
revlog: delete isdescendantrev() in favor of isancestorrev()...
r38690 return self._repo.changelog.isancestorrev(self._rev, other._rev)
FUJIWARA Katsunori
context: add "descendant()" to changectx for efficient descendant examination...
r17626
Matt Mackall
context: add walk method
r6764 def walk(self, match):
Drew Gottlieb
manifest: move changectx.walk() to manifests...
r24646 '''Generates matching file names.'''
Durham Goode
changectx: increase perf of walk function...
r20292
Matt Harbison
context: replace match.bad() monkey patching with match.badmatch()...
r25435 # Wrap match.bad method to have message with nodeid
Drew Gottlieb
manifest: move changectx.walk() to manifests...
r24646 def bad(fn, msg):
Matt Harbison
context: don't complain about a matcher's subrepo paths in changectx.walk()...
r25193 # The manifest doesn't know about subrepos, so don't complain about
# paths into valid subrepos.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if any(fn == s or fn.startswith(s + b'/') for s in self.substate):
Matt Harbison
context: don't complain about a matcher's subrepo paths in changectx.walk()...
r25193 return
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 match.bad(fn, _(b'no such file in rev %s') % self)
Durham Goode
changectx: increase perf of walk function...
r20292
Martin von Zweigbergk
narrow: only walk files within narrowspec also for committed revisions...
r40120 m = matchmod.badmatch(self._repo.narrowmatch(match), bad)
Matt Harbison
context: replace match.bad() monkey patching with match.badmatch()...
r25435 return self._manifest.walk(m)
Matt Mackall
context: add walk method
r6764
Siddharth Agarwal
context: add a method to efficiently filter by match if possible...
r21985 def matches(self, match):
return self.walk(match)
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: add an empty class that will be used as a parent of file contexts...
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,
Jun Wu
filectx: add an overlayfilectx class...
r32239 memfilectx: a filecontext that represents files in-memory,
"""
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move _filelog from filectx
r19573 @propertycache
def _filelog(self):
return self._repo.file(self._path)
Sean Farley
basefilectx: move _changeid from filectx
r19574 @propertycache
def _changeid(self):
Martin von Zweigbergk
context: remove seemingly impossible code branch...
r40707 if r'_changectx' in self.__dict__:
Sean Farley
basefilectx: move _changeid from filectx
r19574 return self._changectx.rev()
Pulkit Goyal
py3: use raw strings while accessing class.__dict__...
r32148 elif r'_descendantrev' in self.__dict__:
Matt Mackall
filectx: if we have a _descendantrev, use it to adjust linkrev...
r23983 # this file context was created from a revision with a known
# descendant, we can (lazily) correct for linkrev aliases
Jun Wu
adjustlinkrev: remove unnecessary parameters...
r30275 return self._adjustlinkrev(self._descendantrev)
Sean Farley
basefilectx: move _changeid from filectx
r19574 else:
return self._filelog.linkrev(self._filerev)
Sean Farley
basefilectx: move _filenode from filectx
r19575 @propertycache
def _filenode(self):
Pulkit Goyal
py3: use raw strings while accessing class.__dict__...
r32148 if r'_fileid' in self.__dict__:
Sean Farley
basefilectx: move _filenode from filectx
r19575 return self._filelog.lookup(self._fileid)
else:
return self._changectx.filenode(self._path)
Sean Farley
basefilectx: move _filerev from filectx
r19576 @propertycache
def _filerev(self):
return self._filelog.rev(self._filenode)
Sean Farley
basefilectx: move _repopath from filectx
r19577 @propertycache
def _repopath(self):
return self._path
Sean Farley
basefilectx: move __nonzero__ from filectx
r19578 def __nonzero__(self):
try:
self._filenode
return True
except error.LookupError:
# file is missing
return False
Gregory Szorc
py3: add __bool__ to every class defining __nonzero__...
r31476 __bool__ = __nonzero__
Yuya Nishihara
py3: add utility to forward __str__() to __bytes__()...
r33022 def __bytes__(self):
Mads Kiilerich
context: make sure __str__ works, also when there is no _changectx...
r30270 try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b"%s@%s" % (self.path(), self._changectx)
Mads Kiilerich
context: make sure __str__ works, also when there is no _changectx...
r30270 except error.LookupError:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b"%s@???" % self.path()
Sean Farley
basefilectx: move __str__ from filectx
r19579
Yuya Nishihara
py3: add utility to forward __str__() to __bytes__()...
r33022 __str__ = encoding.strmethod(__bytes__)
Pulkit Goyal
py3: define __bytes__ for basefilectx class...
r33019
Sean Farley
basefilectx: move __repr__ from filectx...
r19580 def __repr__(self):
Pulkit Goyal
py3: make sure __repr__ returns a str...
r36721 return r"<%s %s>" % (type(self).__name__, str(self))
Sean Farley
basefilectx: move __repr__ from filectx...
r19580
Sean Farley
basefilectx: move __hash__ from filectx
r19581 def __hash__(self):
try:
return hash((self._path, self._filenode))
except AttributeError:
return id(self)
Sean Farley
basefilectx: move __eq__ from filectx...
r19582 def __eq__(self, other):
try:
Augie Fackler
formatting: blacken the codebase...
r43346 return (
type(self) == type(other)
and self._path == other._path
and self._filenode == other._filenode
)
Sean Farley
basefilectx: move __eq__ from filectx...
r19582 except AttributeError:
return False
Sean Farley
basefilectx: move __ne__ from filectx
r19583 def __ne__(self, other):
return not (self == other)
Sean Farley
basefilectx: move filerev from filectx
r19584 def filerev(self):
return self._filerev
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move filenode from filectx
r19585 def filenode(self):
return self._filenode
Augie Fackler
formatting: blacken the codebase...
r43346
Jun Wu
filectx: make flags a property cache...
r32234 @propertycache
def _flags(self):
return self._changectx.flags(self._path)
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move flags from filectx
r19586 def flags(self):
Jun Wu
filectx: make flags a property cache...
r32234 return self._flags
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move filelog from filectx
r19587 def filelog(self):
return self._filelog
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move rev from filectx
r19588 def rev(self):
return self._changeid
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move linkrev from filectx
r19589 def linkrev(self):
return self._filelog.linkrev(self._filerev)
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move node from filectx
r19590 def node(self):
return self._changectx.node()
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move hex from filectx...
r19591 def hex(self):
return self._changectx.hex()
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move user from filectx
r19592 def user(self):
return self._changectx.user()
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move date from filectx
r19593 def date(self):
return self._changectx.date()
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move files from filectx
r19594 def files(self):
return self._changectx.files()
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move description from filectx
r19595 def description(self):
return self._changectx.description()
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move branch from filectx
r19596 def branch(self):
return self._changectx.branch()
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move extra from filectx
r19597 def extra(self):
return self._changectx.extra()
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move phase from filectx
r19598 def phase(self):
return self._changectx.phase()
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move phasestr from filectx
r19599 def phasestr(self):
return self._changectx.phasestr()
Augie Fackler
formatting: blacken the codebase...
r43346
av6
context: add obsolete() method to basefilectx...
r35087 def obsolete(self):
return self._changectx.obsolete()
Augie Fackler
formatting: blacken the codebase...
r43346
av6
context: add instabilities() method to basefilectx...
r35092 def instabilities(self):
return self._changectx.instabilities()
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move manifest from filectx
r19600 def manifest(self):
return self._changectx.manifest()
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move changectx from filectx
r19601 def changectx(self):
return self._changectx
Augie Fackler
formatting: blacken the codebase...
r43346
Jun Wu
filectx: make renamed a property cache...
r32235 def renamed(self):
return self._copied
Augie Fackler
formatting: blacken the codebase...
r43346
Martin von Zweigbergk
context: add specialized way of getting copy source file only...
r41934 def copysource(self):
return self._copied and self._copied[0]
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Harbison
filectx: add a repo accessor...
r24333 def repo(self):
return self._repo
Augie Fackler
formatting: blacken the codebase...
r43346
Jun Wu
filectx: move size to basefilectx...
r32236 def size(self):
return len(self.data())
Sean Farley
basefilectx: move filerev from filectx
r19584
Sean Farley
basefilectx: move path from filectx
r19602 def path(self):
return self._path
Sean Farley
basefilectx: move isbinary from filectx
r19603 def isbinary(self):
try:
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 return stringutil.binary(self.data())
Sean Farley
basefilectx: move isbinary from filectx
r19603 except IOError:
return False
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move isexec and islink from memfilectx...
r22054 def isexec(self):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b'x' in self.flags()
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move isexec and islink from memfilectx...
r22054 def islink(self):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b'l' in self.flags()
Sean Farley
basefilectx: move isbinary from filectx
r19603
Siddharth Agarwal
filectx: add isabsent method...
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
Siddharth Agarwal
filectx: allow custom comparators...
r26977 _customcmp = False
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move cmp from filectx
r19604 def cmp(self, fctx):
"""compare with other file context
returns True if different than fctx.
"""
Siddharth Agarwal
filectx: allow custom comparators...
r26977 if fctx._customcmp:
return fctx.cmp(self)
Yuya Nishihara
context: error out if basefilectx.cmp() is called without self._filenode...
r41027 if self._filenode is None:
raise error.ProgrammingError(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'filectx.cmp() must be reimplemented if not backed by revlog'
Augie Fackler
formatting: blacken the codebase...
r43346 )
Yuya Nishihara
context: error out if basefilectx.cmp() is called without self._filenode...
r41027
Yuya Nishihara
context: collapse complex condition to see if filelog have to be compared...
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
Sean Farley
basefilectx: move cmp from filectx
r19604 return self._filelog.cmp(self._filenode, fctx.data())
Yuya Nishihara
context: collapse complex condition to see if filelog have to be compared...
r41026 # size() differs
Sean Farley
basefilectx: move cmp from filectx
r19604 return True
Boris Feld
context: floor adjustlinkrev graph walk during copy tracing...
r40733 def _adjustlinkrev(self, srcrev, inclusive=False, stoprev=None):
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r24180 """return the first ancestor of <srcrev> introducing <fnode>
Pierre-Yves David
filectx: move _adjustlinkrev to a method...
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
Boris Feld
context: floor adjustlinkrev graph walk during copy tracing...
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.
Pierre-Yves David
filectx: move _adjustlinkrev to a method...
r23979 """
repo = self._repo
cl = repo.unfiltered().changelog
Durham Goode
manifest: adds manifestctx.readfast...
r29939 mfl = repo.manifestlog
Pierre-Yves David
filectx: move _adjustlinkrev to a method...
r23979 # fetch the linkrev
Jun Wu
adjustlinkrev: remove unnecessary parameters...
r30275 lkr = self.linkrev()
Boris Feld
context: fast path linkrev adjustement in trivial case...
r40080 if srcrev == lkr:
return lkr
Pierre-Yves David
_adjustlinkrev: reuse ancestors set during rename detection (issue4514)...
r23980 # hack to reuse ancestor computation when searching for renames
memberanc = getattr(self, '_ancestrycontext', None)
iteranc = None
Pierre-Yves David
adjustlinkrev: handle 'None' value as source...
r24411 if srcrev is None:
# wctx case, used by workingfilectx during mergecopy
revs = [p.rev() for p in self._repo[None].parents()]
Augie Fackler
formatting: blacken the codebase...
r43346 inclusive = True # we skipped the real (revless) source
Pierre-Yves David
adjustlinkrev: handle 'None' value as source...
r24411 else:
revs = [srcrev]
Pierre-Yves David
_adjustlinkrev: reuse ancestors set during rename detection (issue4514)...
r23980 if memberanc is None:
Augie Fackler
formatting: blacken the codebase...
r43346 memberanc = iteranc = cl.ancestors(revs, lkr, inclusive=inclusive)
Pierre-Yves David
filectx: move _adjustlinkrev to a method...
r23979 # check if this linkrev is an ancestor of srcrev
Pierre-Yves David
_adjustlinkrev: reuse ancestors set during rename detection (issue4514)...
r23980 if lkr not in memberanc:
if iteranc is None:
Pierre-Yves David
adjustlinkrev: prepare source revs for ancestry only once...
r24410 iteranc = cl.ancestors(revs, lkr, inclusive=inclusive)
Jun Wu
adjustlinkrev: remove unnecessary parameters...
r30275 fnode = self._filenode
path = self._path
Pierre-Yves David
_adjustlinkrev: reuse ancestors set during rename detection (issue4514)...
r23980 for a in iteranc:
Boris Feld
context: floor adjustlinkrev graph walk during copy tracing...
r40733 if stoprev is not None and a < stoprev:
return None
Augie Fackler
formatting: blacken the codebase...
r43346 ac = cl.read(a) # get changeset data (we avoid object creation)
if path in ac[3]: # checking the 'files' field.
Pierre-Yves David
filectx: move _adjustlinkrev to a method...
r23979 # The file has been touched, check if the content is
# similar to the one we search for.
Durham Goode
manifest: adds manifestctx.readfast...
r29939 if fnode == mfl[ac[0]].readfast().get(path):
Pierre-Yves David
filectx: move _adjustlinkrev to a method...
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
Boris Feld
context: introduce an `isintroducedafter` method and use it in copies...
r40730 def isintroducedafter(self, changelogrev):
"""True if a filectx has been introduced after a given floor revision
"""
Boris Feld
context: small refactoring of `isintroducedafter`...
r40732 if self.linkrev() >= changelogrev:
return True
Boris Feld
context: floor adjustlinkrev graph walk during copy tracing...
r40733 introrev = self._introrev(stoprev=changelogrev)
if introrev is None:
return False
Boris Feld
context: small refactoring of `isintroducedafter`...
r40732 return introrev >= changelogrev
Boris Feld
context: introduce an `isintroducedafter` method and use it in copies...
r40730
Pierre-Yves David
linkrev: introduce an 'introrev' method on filectx...
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.
"""
Boris Feld
context: split `introrev` logic in a sub function...
r40731 return self._introrev()
Boris Feld
context: floor adjustlinkrev graph walk during copy tracing...
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.
"""
Boris Feld
context: spell out the logic around linkrev adjustement starting point...
r40728 toprev = None
Pierre-Yves David
linkrev: introduce an 'introrev' method on filectx...
r23703 attrs = vars(self)
Boris Feld
context: spell out the logic around linkrev adjustement starting point...
r40728 if r'_changeid' in attrs:
# We have a cached value already
toprev = self._changeid
elif r'_changectx' in attrs:
# We know which changelog entry we are coming from
toprev = self._changectx.rev()
if toprev is not None:
Boris Feld
context: floor adjustlinkrev graph walk during copy tracing...
r40733 return self._adjustlinkrev(toprev, inclusive=True, stoprev=stoprev)
Boris Feld
context: take advantage of `_descendantrev` in introrev if available...
r40729 elif r'_descendantrev' in attrs:
Boris Feld
context: floor adjustlinkrev graph walk during copy tracing...
r40733 introrev = self._adjustlinkrev(self._descendantrev, stoprev=stoprev)
Boris Feld
context: take advantage of `_descendantrev` in introrev if available...
r40729 # be nice and cache the result of the computation
Boris Feld
context: floor adjustlinkrev graph walk during copy tracing...
r40733 if introrev is not None:
self._changeid = introrev
Boris Feld
context: take advantage of `_descendantrev` in introrev if available...
r40729 return introrev
Boris Feld
context: reverse conditional branch order in introrev...
r40082 else:
Pierre-Yves David
linkrev: introduce an 'introrev' method on filectx...
r23703 return self.linkrev()
Yuya Nishihara
filectx: extract helper method to obtain filectx pointing to its introrev
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)
Yuya Nishihara
filectx: extract function to create parent fctx keeping ancestry info...
r24816 def _parentfilectx(self, path, fileid, filelog):
"""create parent filectx keeping ancestry info for _adjustlinkrev()"""
fctx = filectx(self._repo, path, fileid=fileid, filelog=filelog)
Yuya Nishihara
py3: fix some membership tests on linkrev adjustment
r36657 if r'_changeid' in vars(self) or r'_changectx' in vars(self):
Yuya Nishihara
filectx: extract function to create parent fctx keeping ancestry info...
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)
Yuya Nishihara
py3: fix some membership tests on linkrev adjustment
r36657 elif r'_descendantrev' in vars(self):
Yuya Nishihara
filectx: extract function to create parent fctx keeping ancestry info...
r24816 # Otherwise propagate _descendantrev if we have one associated.
fctx._descendantrev = self._descendantrev
fctx._ancestrycontext = getattr(self, '_ancestrycontext', None)
return fctx
Sean Farley
basefilectx: move parents from filectx
r19605 def parents(self):
Mads Kiilerich
cleanup: fix some list comprehension redefinitions of existing vars...
r22201 _path = self._path
Sean Farley
basefilectx: move parents from filectx
r19605 fl = self._filelog
Pierre-Yves David
filectx.parents: filter nullrev parent sooner...
r23688 parents = self._filelog.parents(self._filenode)
pl = [(_path, node, fl) for node in parents if node != nullid]
Sean Farley
basefilectx: move parents from filectx
r19605
Pierre-Yves David
filectx.parents: enforce changeid of parent to be in own changectx ancestors...
r23702 r = fl.renamed(self._filenode)
Sean Farley
basefilectx: move parents from filectx
r19605 if r:
Pierre-Yves David
filectx.parents: filter nullrev parent sooner...
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.
#
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r24180 # As null id have always been filtered out in the previous list
Pierre-Yves David
filectx.parents: filter nullrev parent sooner...
r23688 # comprehension, inserting to 0 will always result in "replacing
# first nullid parent with rename information.
Pierre-Yves David
filectx.parents: also fetch the filelog of rename source too...
r23699 pl.insert(0, (r[0], r[1], self._repo.file(r[0])))
Sean Farley
basefilectx: move parents from filectx
r19605
Yuya Nishihara
filectx: extract function to create parent fctx keeping ancestry info...
r24816 return [self._parentfilectx(path, fnode, l) for path, fnode, l in pl]
Sean Farley
basefilectx: move parents from filectx
r19605
Sean Farley
basefilectx: move p1 from filectx
r19606 def p1(self):
return self.parents()[0]
Sean Farley
basefilectx: move p2 from filectx
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)
Yuya Nishihara
annotate: drop linenumber flag from fctx.annotate() (API)...
r37083 def annotate(self, follow=False, skiprevs=None, diffopts=None):
Yuya Nishihara
annotate: pack line content into annotateline object (API)...
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
Yuya Nishihara
annotate: drop linenumber flag from fctx.annotate() (API)...
r37083 file
Yuya Nishihara
annotate: pack line content into annotateline object (API)...
r37084 - line.text is the data on that line (including newline character)
Yuya Nishihara
annotate: drop linenumber flag from fctx.annotate() (API)...
r37083 """
Matt Mackall
fix memory usage of revlog caches by limiting cache size [issue1639]
r9097 getlog = util.lrucachefunc(lambda x: self._repo.file(x))
Brendan Cully
Refactor annotate copy support.
r3172
def parents(f):
Yuya Nishihara
annotate: always adjust linkrev before walking down to parents (issue4623)...
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
Durham Goode
annotate: simplify annotate parent function...
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()]
Brendan Cully
Refactor annotate copy support.
r3172
Durham Goode
annotate: simplify annotate parent function...
r19292 # renamed filectx won't have a filelog yet, so set it
# from the cache to save time
for p in pl:
Augie Fackler
context: use native string when peeking in __dict__...
r35852 if not r'_filelog' in p.__dict__:
Durham Goode
annotate: simplify annotate parent function...
r19292 p._filelog = getlog(p.path())
Brendan Cully
filectx.annotate: return filectx for each line instead of rev
r3146
Durham Goode
annotate: simplify annotate parent function...
r19292 return pl
Matt Mackall
contexts: add working dir and working file contexts...
r3217
Brendan Cully
Fix annotate where linkrev != rev without exporting linkrev
r3404 # use linkrev to find the first changeset where self appeared
Yuya Nishihara
filectx: extract helper method to obtain filectx pointing to its introrev
r35272 base = self.introfilectx()
Yuya Nishihara
annotate: prepare ancestry context of workingfilectx...
r24818 if getattr(base, '_ancestrycontext', None) is None:
cl = self._repo.changelog
Yuya Nishihara
filectx: extract helper method to obtain filectx pointing to its introrev
r35272 if base.rev() is None:
Yuya Nishihara
annotate: prepare ancestry context of workingfilectx...
r24818 # wctx is not inclusive, but works because _ancestrycontext
# is used to test filelog revisions
Augie Fackler
formatting: blacken the codebase...
r43346 ac = cl.ancestors(
[p.rev() for p in base.parents()], inclusive=True
)
Yuya Nishihara
annotate: prepare ancestry context of workingfilectx...
r24818 else:
Yuya Nishihara
filectx: extract helper method to obtain filectx pointing to its introrev
r35272 ac = cl.ancestors([base.rev()], inclusive=True)
Pierre-Yves David
annotate: reuse ancestry context when adjusting linkrev (issue4532)...
r24407 base._ancestrycontext = ac
Brendan Cully
Fix annotate where linkrev != rev without exporting linkrev
r3404
Augie Fackler
formatting: blacken the codebase...
r43346 return dagop.annotate(
base, parents, skiprevs=skiprevs, diffopts=diffopts
)
Matt Mackall
filectx: allow passing filelog in init to avoid opening new filelogs
r3124
Sean Farley
basefilectx: move ancestors from filectx
r19610 def ancestors(self, followfirst=False):
visit = {}
c = self
Jordi Gutiérrez Hermoso
style: kill ersatz if-else ternary operators...
r24306 if followfirst:
cut = 1
else:
cut = None
Sean Farley
basefilectx: move ancestors from filectx
r19610 while True:
for parent in c.parents()[:cut]:
Matt Mackall
filectx: use linkrev to sort ancestors...
r23981 visit[(parent.linkrev(), parent.filenode())] = parent
Sean Farley
basefilectx: move ancestors from filectx
r19610 if not visit:
break
c = visit.pop(max(visit))
yield c
Phil Cohen
context: add `decodeddata()` to basefilectx...
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())
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
basefilectx: move annotate from filectx
r19608 class filectx(basefilectx):
"""A filecontext object makes access to data related to a particular
filerevision convenient."""
Augie Fackler
formatting: blacken the codebase...
r43346
def __init__(
self,
repo,
path,
changeid=None,
fileid=None,
filelog=None,
changectx=None,
):
Martin von Zweigbergk
filectx: correct docstring about "changeid"...
r40098 """changeid must be a revision number, if specified.
Sean Farley
basefilectx: move annotate from filectx
r19608 fileid can be a file revision or node."""
self._repo = repo
self._path = path
Augie Fackler
formatting: blacken the codebase...
r43346 assert (
changeid is not None or fileid is not None or changectx is not None
formatting: run black version 19.10b0 on the codebase...
r43655 ), (
b"bad args: changeid=%r, fileid=%r, changectx=%r"
% (changeid, fileid, changectx,)
Augie Fackler
formatting: blacken the codebase...
r43346 )
Sean Farley
basefilectx: move annotate from filectx
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:
Martin von Zweigbergk
context: reduce dependence of changectx constructor...
r39993 return self._repo[self._changeid]
Pierre-Yves David
context: catch FilteredRepoLookupError instead of RepoLookupError...
r23687 except error.FilteredRepoLookupError:
Sean Farley
basefilectx: move annotate from filectx
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.
Martin von Zweigbergk
context: reduce dependence of changectx constructor...
r39993 return self._repo.unfiltered()[self._changeid]
Sean Farley
basefilectx: move annotate from filectx
r19608
Durham Goode
filectx: fix annotate to not directly instantiate filectx...
r23770 def filectx(self, fileid, changeid=None):
Sean Farley
basefilectx: move annotate from filectx
r19608 '''opens an arbitrary revision of the file without
opening a new filelog'''
Augie Fackler
formatting: blacken the codebase...
r43346 return filectx(
self._repo,
self._path,
fileid=fileid,
filelog=self._filelog,
changeid=changeid,
)
Sean Farley
basefilectx: move annotate from filectx
r19608
Remi Chaintron
revlog: add 'raw' argument to revision and _addrevision...
r30743 def rawdata(self):
rawdata: update callers in context...
r43037 return self._filelog.rawdata(self._filenode)
Remi Chaintron
revlog: add 'raw' argument to revision and _addrevision...
r30743
Jun Wu
filectx: add a rawflags method...
r32237 def rawflags(self):
"""low-level revlog flags"""
return self._filelog.flags(self._filerev)
Sean Farley
basefilectx: move annotate from filectx
r19608 def data(self):
Mike Edgar
context: handle censored data in an on-disk file context based on config...
r22932 try:
return self._filelog.read(self._filenode)
except error.CensoredNodeError:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if self._repo.ui.config(b"censor", b"policy") == b"ignore":
return b""
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.Abort(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b"censored node: %s") % short(self._filenode),
hint=_(b"set censor.policy to ignore errors"),
Augie Fackler
formatting: blacken the codebase...
r43346 )
Mike Edgar
context: handle censored data in an on-disk file context based on config...
r22932
Sean Farley
basefilectx: move annotate from filectx
r19608 def size(self):
return self._filelog.size(self._filerev)
Jun Wu
filectx: make renamed a property cache...
r32235 @propertycache
def _copied(self):
Sean Farley
basefilectx: move annotate from filectx
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:
Sean Farley
filectx: fix return of renamed...
r39746 return None
Sean Farley
basefilectx: move annotate from filectx
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)
Augie Fackler
formatting: blacken the codebase...
r43346 return [
filectx(self._repo, self._path, fileid=x, filelog=self._filelog)
for x in c
]
Sean Farley
basefilectx: move annotate from filectx
r19608
Sean Farley
context: use correct spelling of committable
r19733 class committablectx(basectx):
"""A committablectx object provides common functionality for a context that
Sean Farley
commitablectx: add a class that will be used as a parent of mutable contexts...
r19664 wants the ability to commit, e.g. workingctx or memctx."""
Augie Fackler
formatting: blacken the codebase...
r43346
def __init__(
self,
repo,
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 text=b"",
Augie Fackler
formatting: blacken the codebase...
r43346 user=None,
date=None,
extra=None,
changes=None,
branch=None,
):
Martin von Zweigbergk
context: set repo property in basectx...
r37192 super(committablectx, self).__init__(repo)
Matt Mackall
contexts: add working dir and working file contexts...
r3217 self._rev = None
self._node = None
Patrick Mezard
context: let workingctx.date(), .user() and description() be overriden
r6709 self._text = text
Christian Ebert
Fix commit date (issue1193)...
r6718 if date:
Boris Feld
util: extract all date-related utils in utils/dateutil module...
r36625 self._date = dateutil.parsedate(date)
Matt Mackall
minor status fixups
r6817 if user:
self._user = user
Patrick Mezard
localrepo: hide commit() file selection behind workingctx
r6707 if changes:
Sean Farley
committablectx: simplify caching the status...
r21592 self._status = changes
Matt Mackall
contexts: add working dir and working file contexts...
r3217
Patrick Mezard
localrepo: let commit() get extra data from workingctx
r6708 self._extra = {}
if extra:
self._extra = extra.copy()
Martin von Zweigbergk
context: let caller pass in branch to committablectx.__init__()...
r42482 if branch is not None:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self._extra[b'branch'] = encoding.fromlocal(branch)
if not self._extra.get(b'branch'):
self._extra[b'branch'] = b'default'
Patrick Mezard
localrepo: let commit() get extra data from workingctx
r6708
Pulkit Goyal
py3: implement __bytes__ for committablectx...
r32643 def __bytes__(self):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return bytes(self._parents[0]) + b"+"
Sean Farley
commitablectx: move __str__ from workingctx
r19666
Yuya Nishihara
py3: add utility to forward __str__() to __bytes__()...
r33022 __str__ = encoding.strmethod(__bytes__)
Sean Farley
commitablectx: move __nonzero__ from workingctx
r19667 def __nonzero__(self):
return True
Gregory Szorc
py3: add __bool__ to every class defining __nonzero__...
r31476 __bool__ = __nonzero__
Matt Mackall
windows: recompute flags when committing a merge (issue1802)...
r15337 @propertycache
Sean Farley
commitablectx: move _status from workingctx
r19672 def _status(self):
Sean Farley
committablectx: simplify caching the status...
r21592 return self._repo.status()
Sean Farley
commitablectx: move _status from workingctx
r19672
Sean Farley
commitablectx: move _user from workingctx
r19674 @propertycache
def _user(self):
return self._repo.ui.username()
Sean Farley
commitablectx: move _date from workingctx
r19676 @propertycache
def _date(self):
Boris Feld
devel: add a config field to force dates to timestamp 0...
r32409 ui = self._repo.ui
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 date = ui.configdate(b'devel', b'default-date')
Boris Feld
devel: add a config field to force dates to timestamp 0...
r32409 if date is None:
Boris Feld
util: extract all date-related utils in utils/dateutil module...
r36625 date = dateutil.makedate()
Boris Feld
devel: add a config field to force dates to timestamp 0...
r32409 return date
Sean Farley
commitablectx: move _date from workingctx
r19676
Sean Farley
committablectx: add subrev method to return None...
r21587 def subrev(self, subpath):
return None
Yuya Nishihara
committablectx: override manifestnode() to return None...
r24719 def manifestnode(self):
return None
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
commitablectx: move user from workingctx
r19675 def user(self):
return self._user or self._repo.ui.username()
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
commitablectx: move date from workingctx
r19677 def date(self):
return self._date
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
commitablectx: move description from workingctx
r19678 def description(self):
return self._text
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
commitablectx: move files from workingctx
r19679 def files(self):
Augie Fackler
formatting: blacken the codebase...
r43346 return sorted(
self._status.modified + self._status.added + self._status.removed
)
Martin von Zweigbergk
committablectx: move status-related methods closer together...
r41955 def modified(self):
return self._status.modified
Augie Fackler
formatting: blacken the codebase...
r43346
Martin von Zweigbergk
committablectx: move status-related methods closer together...
r41955 def added(self):
return self._status.added
Augie Fackler
formatting: blacken the codebase...
r43346
Martin von Zweigbergk
committablectx: move status-related methods closer together...
r41955 def removed(self):
return self._status.removed
Augie Fackler
formatting: blacken the codebase...
r43346
Martin von Zweigbergk
committablectx: move status-related methods closer together...
r41955 def deleted(self):
return self._status.deleted
Augie Fackler
formatting: blacken the codebase...
r43346
Martin von Zweigbergk
context: add ctx.files{modified,added,removed}() methods...
r42566 filesmodified = modified
filesadded = added
filesremoved = removed
Sean Farley
commitablectx: move branch from workingctx
r19687 def branch(self):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return encoding.tolocal(self._extra[b'branch'])
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
commitablectx: move closesbranch from workingctx
r19688 def closesbranch(self):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b'close' in self._extra
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
commitablectx: move extra from workingctx
r19689 def extra(self):
return self._extra
Sean Farley
commitablectx: move modified from workingctx
r19680
Phil Cohen
context: add is `isinmemory()` to filectx...
r34682 def isinmemory(self):
return False
Sean Farley
commitablectx: move tags from workingctx
r19690 def tags(self):
Matt Harbison
workingctx: don't report the tags for its parents...
r25688 return []
Sean Farley
commitablectx: move tags from workingctx
r19690
Sean Farley
commitablectx: move bookmarks from workingctx
r19691 def bookmarks(self):
b = []
for p in self.parents():
b.extend(p.bookmarks())
return b
Sean Farley
commitablectx: move phase from workingctx
r19692 def phase(self):
Augie Fackler
formatting: blacken the codebase...
r43346 phase = phases.draft # default phase to draft
Sean Farley
commitablectx: move phase from workingctx
r19692 for p in self.parents():
phase = max(phase, p.phase())
return phase
Sean Farley
commitablectx: move hidden from workingctx
r19693 def hidden(self):
return False
Sean Farley
commitablectx: move children from workingctx
r19694 def children(self):
return []
Sean Farley
commitablectx: move ancestor from workingctx
r19696 def ancestor(self, c2):
Mads Kiilerich
comments: describe ancestor consistently - avoid 'least common ancestor'...
r22389 """return the "best" ancestor context of self and c2"""
Augie Fackler
formatting: blacken the codebase...
r43346 return self._parents[0].ancestor(c2) # punt on two parents for now
Sean Farley
commitablectx: move ancestor from workingctx
r19696
Sean Farley
commitablectx: move ancestors from workingctx
r19698 def ancestors(self):
Durham Goode
context: return dirstate parents in workingctx.ancestors()...
r23616 for p in self._parents:
yield p
Sean Farley
commitablectx: move ancestors from workingctx
r19698 for a in self._repo.changelog.ancestors(
Augie Fackler
formatting: blacken the codebase...
r43346 [p.rev() for p in self._parents]
):
Martin von Zweigbergk
context: reduce dependence of changectx constructor...
r39993 yield self._repo[a]
Sean Farley
commitablectx: move ancestors from workingctx
r19698
Sean Farley
commitablectx: move markcommitted from workingctx
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.
"""
Sean Farley
context: move dirty() to committablectx...
r32610 def dirty(self, missing=False, merge=True, branch=True):
return False
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
context: use correct spelling of committable
r19733 class workingctx(committablectx):
Sean Farley
commitablectx: move _manifest from workingctx
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.
"""
Augie Fackler
formatting: blacken the codebase...
r43346
def __init__(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self, repo, text=b"", user=None, date=None, extra=None, changes=None
Augie Fackler
formatting: blacken the codebase...
r43346 ):
Martin von Zweigbergk
context: default to using branch from dirstate only in workingctx...
r42483 branch = None
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if not extra or b'branch' not in extra:
Martin von Zweigbergk
context: default to using branch from dirstate only in workingctx...
r42483 try:
branch = repo.dirstate.branch()
except UnicodeDecodeError:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.Abort(_(b'branch name not in UTF-8!'))
Augie Fackler
formatting: blacken the codebase...
r43346 super(workingctx, self).__init__(
repo, text, user, date, extra, changes, branch=branch
)
Sean Farley
commitablectx: move _manifest from workingctx
r19671
Matt Mackall
context: provide an efficient iterator for workingctx...
r14129 def __iter__(self):
d = self._repo.dirstate
for f in d:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if d[f] != b'r':
Matt Mackall
context: provide an efficient iterator for workingctx...
r14129 yield f
Sean Farley
committablectx: move __contains__ into workingctx...
r21845 def __contains__(self, key):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return self._repo.dirstate[key] not in b"?r"
Sean Farley
committablectx: move __contains__ into workingctx...
r21845
Matt Harbison
context: override workingctx.hex() to avoid a crash...
r25590 def hex(self):
Martin von Zweigbergk
context: use wdirhex constant instead of calculating it...
r42133 return wdirhex
Matt Harbison
context: override workingctx.hex() to avoid a crash...
r25590
Martin Geisler
context: use Python 2.4 decorator syntax
r8157 @propertycache
Dirkjan Ochtman
context: use descriptors to speed up lazy attributes
r7368 def _parents(self):
p = self._repo.dirstate.parents()
if p[1] == nullid:
p = p[:-1]
Martin von Zweigbergk
repo: move unfiltered-repo optimization to workingctx...
r39995 # use unfiltered repo to delay/avoid loading obsmarkers
unfi = self._repo.unfiltered()
return [changectx(self._repo, unfi.changelog.rev(n), n) for n in p]
Matt Mackall
contexts: add working dir and working file contexts...
r3217
Yuya Nishihara
workingctx: build _manifest on filenode() or flags() request...
r37465 def _fileinfo(self, path):
# populate __dict__['_manifest'] as workingctx has no _manifestdelta
self._manifest
return super(workingctx, self)._fileinfo(path)
Martin von Zweigbergk
context: move flags overrides from committablectx to workingctx...
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()
Augie Fackler
formatting: blacken the codebase...
r43346
Martin von Zweigbergk
context: move flags overrides from committablectx to workingctx...
r42478 def func(f):
f = copiesget(f, f)
return man.flags(f)
Augie Fackler
formatting: blacken the codebase...
r43346
Martin von Zweigbergk
context: move flags overrides from committablectx to workingctx...
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):
Augie Fackler
formatting: blacken the codebase...
r43346 f = copiesget(f, f) # may be wrong for merges with copies
Martin von Zweigbergk
context: move flags overrides from committablectx to workingctx...
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
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b'' # punt for conflicts
Martin von Zweigbergk
context: move flags overrides from committablectx to workingctx...
r42478
return func
@propertycache
def _flagfunc(self):
return self._repo.dirstate.flagfunc(self._buildflagfunc)
def flags(self, path):
if r'_manifest' in self.__dict__:
try:
return self._manifest.flags(path)
except KeyError:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b''
Martin von Zweigbergk
context: move flags overrides from committablectx to workingctx...
r42478
try:
return self._flagfunc(path)
except OSError:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b''
Martin von Zweigbergk
context: move flags overrides from committablectx to workingctx...
r42478
Benoit Boissinot
context: create a filectxt with filelog reuse
r3966 def filectx(self, path, filelog=None):
Matt Mackall
contexts: add working dir and working file contexts...
r3217 """get a file context from the working directory"""
Augie Fackler
formatting: blacken the codebase...
r43346 return workingfilectx(
self._repo, path, workingctx=self, filelog=filelog
)
Matt Mackall
contexts: add working dir and working file contexts...
r3217
Patrick Mezard
update: make --check abort with dirty subrepos...
r16491 def dirty(self, missing=False, merge=True, branch=True):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"check whether a working directory is modified"
Edouard Gomez
subrepo: dirtiness checks should iterate over subrepos
r11110 # check subrepos first
Mads Kiilerich
subrepos: process subrepos in sorted order...
r18364 for s in sorted(self.substate):
Matt Harbison
subrepo: consider the parent repo dirty when a file is missing...
r33364 if self.sub(s).dirty(missing=missing):
Edouard Gomez
subrepo: dirtiness checks should iterate over subrepos
r11110 return True
# check current working dir
Augie Fackler
formatting: blacken the codebase...
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())
)
Matt Mackall
context: add a dirty method to detect modified contexts
r8717
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 def add(self, list, prefix=b""):
Bryan O'Sullivan
with: use context manager for wlock in workingctx.add
r27809 with self._repo.wlock():
ui, ds = self._repo.ui, self._repo.dirstate
Matt Harbison
context: name files relative to cwd in warning messages...
r33501 uipath = lambda f: ds.pathto(pathutil.join(prefix, f))
Dirkjan Ochtman
move working dir/dirstate methods from localrepo to workingctx
r11303 rejected = []
FUJIWARA Katsunori
context: use "vfs.lstat()" instead of "os.lstat()"...
r19900 lstat = self._repo.wvfs.lstat
Dirkjan Ochtman
move working dir/dirstate methods from localrepo to workingctx
r11303 for f in list:
Matt Harbison
context: name files relative to cwd in warning messages...
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))
Dirkjan Ochtman
move working dir/dirstate methods from localrepo to workingctx
r11303 try:
FUJIWARA Katsunori
context: use "vfs.lstat()" instead of "os.lstat()"...
r19900 st = lstat(f)
Idan Kamara
eliminate various naked except clauses
r14004 except OSError:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 ui.warn(_(b"%s does not exist!\n") % uipath(f))
Dirkjan Ochtman
move working dir/dirstate methods from localrepo to workingctx
r11303 rejected.append(f)
continue
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 limit = ui.configbytes(b'ui', b'large-file-limit')
Joerg Sonnenberger
ui: make the large file warning limit fully configurable...
r38619 if limit != 0 and st.st_size > limit:
Augie Fackler
formatting: blacken the codebase...
r43346 ui.warn(
_(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
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"
Augie Fackler
formatting: blacken the codebase...
r43346 )
% (f, 3 * st.st_size // 1000000, uipath(f))
)
Dirkjan Ochtman
move working dir/dirstate methods from localrepo to workingctx
r11303 if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)):
Augie Fackler
formatting: blacken the codebase...
r43346 ui.warn(
_(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"%s not added: only files and symlinks "
b"supported currently\n"
Augie Fackler
formatting: blacken the codebase...
r43346 )
% uipath(f)
)
FUJIWARA Katsunori
context: use "vfs.lstat()" instead of "os.lstat()"...
r19900 rejected.append(f)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 elif ds[f] in b'amn':
ui.warn(_(b"%s already tracked!\n") % uipath(f))
elif ds[f] == b'r':
Dirkjan Ochtman
move working dir/dirstate methods from localrepo to workingctx
r11303 ds.normallookup(f)
else:
ds.add(f)
return rejected
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 def forget(self, files, prefix=b""):
Bryan O'Sullivan
with: use context manager for wlock in workingctx.forget
r27810 with self._repo.wlock():
Matt Harbison
context: name files relative to cwd in warning messages...
r33501 ds = self._repo.dirstate
uipath = lambda f: ds.pathto(pathutil.join(prefix, f))
David M. Carr
forget: fix subrepo recursion for explicit path handling...
r15912 rejected = []
Matt Mackall
context: make forget work like commands.forget...
r14435 for f in files:
Martin von Zweigbergk
context: replace repeated "self._repo.dirstate" by "ds" variable...
r41763 if f not in ds:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self._repo.ui.warn(_(b"%s not tracked!\n") % uipath(f))
David M. Carr
forget: fix subrepo recursion for explicit path handling...
r15912 rejected.append(f)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 elif ds[f] != b'a':
Martin von Zweigbergk
context: replace repeated "self._repo.dirstate" by "ds" variable...
r41763 ds.remove(f)
Dirkjan Ochtman
move working dir/dirstate methods from localrepo to workingctx
r11303 else:
Martin von Zweigbergk
context: replace repeated "self._repo.dirstate" by "ds" variable...
r41763 ds.drop(f)
David M. Carr
forget: fix subrepo recursion for explicit path handling...
r15912 return rejected
Dirkjan Ochtman
move working dir/dirstate methods from localrepo to workingctx
r11303
def copy(self, source, dest):
FUJIWARA Katsunori
context: use "vfs.lstat()" to examine target path instead of "os.path.*"...
r19902 try:
st = self._repo.wvfs.lstat(dest)
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except OSError as err:
FUJIWARA Katsunori
context: use "vfs.lstat()" to examine target path instead of "os.path.*"...
r19902 if err.errno != errno.ENOENT:
raise
Augie Fackler
formatting: blacken the codebase...
r43346 self._repo.ui.warn(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b"%s does not exist!\n") % self._repo.dirstate.pathto(dest)
Augie Fackler
formatting: blacken the codebase...
r43346 )
FUJIWARA Katsunori
context: use "vfs.lstat()" to examine target path instead of "os.path.*"...
r19902 return
if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)):
Augie Fackler
formatting: blacken the codebase...
r43346 self._repo.ui.warn(
Martin von Zweigbergk
cleanup: join string literals that are already on one line...
r43387 _(b"copy failed: %s is not a file or a symbolic link\n")
Augie Fackler
formatting: blacken the codebase...
r43346 % self._repo.dirstate.pathto(dest)
)
Dirkjan Ochtman
move working dir/dirstate methods from localrepo to workingctx
r11303 else:
Bryan O'Sullivan
with: use context manager for wlock in copy
r27812 with self._repo.wlock():
Martin von Zweigbergk
context: replace repeated "self._repo.dirstate" by "ds" variable...
r41763 ds = self._repo.dirstate
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if ds[dest] in b'?':
Martin von Zweigbergk
context: replace repeated "self._repo.dirstate" by "ds" variable...
r41763 ds.add(dest)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 elif ds[dest] in b'r':
Martin von Zweigbergk
context: replace repeated "self._repo.dirstate" by "ds" variable...
r41763 ds.normallookup(dest)
ds.copy(source, dest)
Dirkjan Ochtman
move working dir/dirstate methods from localrepo to workingctx
r11303
Augie Fackler
formatting: blacken the codebase...
r43346 def match(
self,
pats=None,
include=None,
exclude=None,
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 default=b'glob',
Augie Fackler
formatting: blacken the codebase...
r43346 listsubrepos=False,
badfn=None,
):
Matt Harbison
match: add a subclass for dirstate normalizing of the matched patterns...
r24790 r = self._repo
# Only a case insensitive filesystem needs magic to translate user input
# to actual case in the filesystem.
Martin von Zweigbergk
match: replace icasefsmatch() function by flag to regular match()...
r32400 icasefs = not util.fscasesensitive(r.root)
Augie Fackler
formatting: blacken the codebase...
r43346 return matchmod.match(
r.root,
r.getcwd(),
pats,
include,
exclude,
default,
auditor=r.auditor,
ctx=self,
listsubrepos=listsubrepos,
badfn=badfn,
icasefs=icasefs,
)
Matt Harbison
match: add a subclass for dirstate normalizing of the matched patterns...
r24790
Sean Farley
localrepo: move symlink logic to workingctx
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:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if self.flags(f) == b'l':
Sean Farley
localrepo: move symlink logic to workingctx
r21393 d = self[f].data()
Augie Fackler
formatting: blacken the codebase...
r43346 if (
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 d == b''
Augie Fackler
formatting: blacken the codebase...
r43346 or len(d) >= 1024
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 or b'\n' in d
Augie Fackler
formatting: blacken the codebase...
r43346 or stringutil.binary(d)
):
self._repo.ui.debug(
Martin von Zweigbergk
cleanup: join string literals that are already on one line...
r43387 b'ignoring suspect symlink placeholder "%s"\n' % f
Augie Fackler
formatting: blacken the codebase...
r43346 )
Sean Farley
localrepo: move symlink logic to workingctx
r21393 continue
sane.append(f)
return sane
Sean Farley
localrepo: factor out parentworking logic for comparing files...
r21395 def _checklookup(self, files):
# check for any possibly clean files
if not files:
Siddharth Agarwal
status: don't crash if a lookup file disappears...
r32651 return [], [], []
Sean Farley
localrepo: factor out parentworking logic for comparing files...
r21395
modified = []
Siddharth Agarwal
status: don't crash if a lookup file disappears...
r32651 deleted = []
Sean Farley
localrepo: factor out parentworking logic for comparing files...
r21395 fixup = []
pctx = self._parents[0]
# do a full compare of any files that might have changed
for f in sorted(files):
Siddharth Agarwal
status: don't crash if a lookup file disappears...
r32651 try:
# This will return True for a file that got replaced by a
# directory in the interim, but fixing that is pretty hard.
Augie Fackler
formatting: blacken the codebase...
r43346 if (
f not in pctx
or self.flags(f) != pctx.flags(f)
or pctx[f].cmp(self[f])
):
Siddharth Agarwal
status: don't crash if a lookup file disappears...
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)
Sean Farley
localrepo: factor out parentworking logic for comparing files...
r21395
Siddharth Agarwal
workingctx: factor out post-status dirstate fixup...
r32812 return modified, deleted, fixup
Siddharth Agarwal
workingctx: also pass status tuple into poststatusfixup...
r32813 def _poststatusfixup(self, status, fixup):
Siddharth Agarwal
workingctx: factor out post-status dirstate fixup...
r32812 """update dirstate for files that are actually clean"""
Siddharth Agarwal
workingctx: add a way for extensions to run code at status fixup time...
r32814 poststatus = self._repo.postdsstatus()
if fixup or poststatus:
Sean Farley
localrepo: factor out parentworking logic for comparing files...
r21395 try:
FUJIWARA Katsunori
context: avoid writing outdated dirstate out (issue5584)...
r32752 oldid = self._repo.dirstate.identity()
Sean Farley
localrepo: factor out parentworking logic for comparing files...
r21395 # updating the dirstate is optional
# so we don't wait on the lock
Siddharth Agarwal
context: call normal on the right object...
r21990 # wlock can invalidate the dirstate, so cache normal _after_
# taking the lock
Bryan O'Sullivan
with: use context manager for wlock in checklookup
r27813 with self._repo.wlock(False):
FUJIWARA Katsunori
context: avoid writing outdated dirstate out (issue5584)...
r32752 if self._repo.dirstate.identity() == oldid:
Siddharth Agarwal
workingctx: add a way for extensions to run code at status fixup time...
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)
FUJIWARA Katsunori
context: avoid writing outdated dirstate out (issue5584)...
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)
Augie Fackler
formatting: blacken the codebase...
r43346 self._repo.ui.debug(
Martin von Zweigbergk
cleanup: join string literals that are already on one line...
r43387 b'skip updating dirstate: identity mismatch\n'
Augie Fackler
formatting: blacken the codebase...
r43346 )
Sean Farley
localrepo: factor out parentworking logic for comparing files...
r21395 except error.LockError:
pass
Siddharth Agarwal
workingctx: add a way for extensions to run code at status fixup time...
r32814 finally:
# Even if the wlock couldn't be grabbed, clear out the list.
self._repo.clearpostdsstatus()
Sean Farley
localrepo: factor out parentworking logic for comparing files...
r21395
Martin von Zweigbergk
context: remove unnecessary default values for matchers (API)...
r33938 def _dirstatestatus(self, match, ignored=False, clean=False, unknown=False):
Sean Farley
context: add private _dirstatestatus method...
r21397 '''Gets the status from the dirstate -- internal use only.'''
subrepos = []
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if b'.hgsub' in self:
Sean Farley
context: add private _dirstatestatus method...
r21397 subrepos = sorted(self.substate)
Augie Fackler
formatting: blacken the codebase...
r43346 cmp, s = self._repo.dirstate.status(
match, subrepos, ignored=ignored, clean=clean, unknown=unknown
)
Sean Farley
context: add private _dirstatestatus method...
r21397
# check for any possibly clean files
Siddharth Agarwal
workingctx: factor out post-status dirstate fixup...
r32812 fixup = []
Sean Farley
context: add private _dirstatestatus method...
r21397 if cmp:
Siddharth Agarwal
status: don't crash if a lookup file disappears...
r32651 modified2, deleted2, fixup = self._checklookup(cmp)
Martin von Zweigbergk
context.status: avoid de- and reconstructing status tuple...
r23303 s.modified.extend(modified2)
Siddharth Agarwal
status: don't crash if a lookup file disappears...
r32651 s.deleted.extend(deleted2)
Sean Farley
context: add private _dirstatestatus method...
r21397
Martin von Zweigbergk
dirstate: use keyword arguments to clarify status()'s callers...
r34345 if fixup and clean:
Martin von Zweigbergk
context.status: avoid de- and reconstructing status tuple...
r23303 s.clean.extend(fixup)
Sean Farley
context: add private _dirstatestatus method...
r21397
Siddharth Agarwal
workingctx: also pass status tuple into poststatusfixup...
r32813 self._poststatusfixup(s, fixup)
Siddharth Agarwal
workingctx: factor out post-status dirstate fixup...
r32812
Martin von Zweigbergk
status: cache dirstate status in _dirstatestatus()...
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
Augie Fackler
formatting: blacken the codebase...
r43346 self._status = scmutil.status(
s.modified, s.added, s.removed, s.deleted, [], [], []
)
Martin von Zweigbergk
status: cache dirstate status in _dirstatestatus()...
r23776 else:
self._status = s
Martin von Zweigbergk
context.status: avoid de- and reconstructing status tuple...
r23303 return s
Sean Farley
context: add private _dirstatestatus method...
r21397
Durham Goode
context: move _manifest from committablectx to workingctx...
r31259 @propertycache
Martin von Zweigbergk
context: reuse changectx._copies() in all but workingctx...
r42477 def _copies(self):
p1copies = {}
p2copies = {}
parents = self._repo.dirstate.parents()
p1manifest = self._repo[parents[0]].manifest()
p2manifest = self._repo[parents[1]].manifest()
Martin von Zweigbergk
context: filter out invalid copies from workingctx.p[12]copies()...
r43125 changedset = set(self.added()) | set(self.modified())
Martin von Zweigbergk
context: reuse changectx._copies() in all but workingctx...
r42477 narrowmatch = self._repo.narrowmatch()
for dst, src in self._repo.dirstate.copies().items():
Martin von Zweigbergk
context: filter out invalid copies from workingctx.p[12]copies()...
r43125 if dst not in changedset or not narrowmatch(dst):
Martin von Zweigbergk
context: reuse changectx._copies() in all but workingctx...
r42477 continue
if src in p1manifest:
p1copies[dst] = src
elif src in p2manifest:
p2copies[dst] = src
return p1copies, p2copies
@propertycache
Durham Goode
context: move _manifest from committablectx to workingctx...
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
Augie Fackler
formatting: blacken the codebase...
r43346 for i, l in (
(addednodeid, status.added),
(modifiednodeid, status.modified),
):
Durham Goode
context: move _manifest from committablectx to workingctx...
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
Augie Fackler
formatting: blacken the codebase...
r43346 def _buildstatus(
self, other, s, match, listignored, listclean, listunknown
):
Sean Farley
workingctx: use inheritance for _buildstatus while keeping the fastpath...
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['.']).
"""
Martin von Zweigbergk
context.status: call _dirstatestatus() from within _buildstatus()...
r23239 s = self._dirstatestatus(match, listignored, listclean, listunknown)
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r23543 # Filter out symlinks that, in the case of FAT32 and NTFS filesystems,
Martin von Zweigbergk
context.status: only filter suspect symlinks in the dirstate status...
r23242 # might have accidentally ended up with the entire contents of the file
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r23543 # they are supposed to be linking to.
Martin von Zweigbergk
context.status: make _dirstatestatus() return an status tuple...
r23302 s.modified[:] = self._filtersuspectsymlink(s.modified)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if other != self._repo[b'.']:
Augie Fackler
formatting: blacken the codebase...
r43346 s = super(workingctx, self)._buildstatus(
other, s, match, listignored, listclean, listunknown
)
Sean Farley
workingctx: use inheritance for _buildstatus while keeping the fastpath...
r21480 return s
Martin von Zweigbergk
context.status: remove unused arguments from _matchstatus()
r23237 def _matchstatus(self, other, match):
Sean Farley
workingctx: override _matchstatus for parentworking case...
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.
"""
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if other != self._repo[b'.']:
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
workingctx: override _matchstatus for parentworking case...
r21482 def bad(f, msg):
# 'f' may be a directory pattern from 'match.files()',
# so 'f not in ctx1' is not enough
Drew Gottlieb
manifest: have context use self.hasdir()...
r24326 if f not in other and not other.hasdir(f):
Augie Fackler
formatting: blacken the codebase...
r43346 self._repo.ui.warn(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'%s: %s\n' % (self._repo.dirstate.pathto(f), msg)
Augie Fackler
formatting: blacken the codebase...
r43346 )
Sean Farley
workingctx: override _matchstatus for parentworking case...
r21482 match.bad = bad
return match
Martin von Zweigbergk
context: move walk() and match() overrides from committablectx to workingctx...
r42479 def walk(self, match):
'''Generates matching file names.'''
Augie Fackler
formatting: blacken the codebase...
r43346 return sorted(
self._repo.dirstate.walk(
self._repo.narrowmatch(match),
subrepos=sorted(self.substate),
unknown=True,
ignored=False,
)
)
Martin von Zweigbergk
context: move walk() and match() overrides from committablectx to workingctx...
r42479
def matches(self, match):
match = self._repo.narrowmatch(match)
ds = self._repo.dirstate
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return sorted(f for f in ds.matches(match) if ds[f] != b'r')
Martin von Zweigbergk
context: move walk() and match() overrides from committablectx to workingctx...
r42479
Gregory Szorc
sparse: move post commit actions into core...
r33353 def markcommitted(self, node):
Martin von Zweigbergk
context: move contents of committablectx.markcommitted() to workingctx...
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())
Gregory Szorc
sparse: move post commit actions into core...
r33353
sparse.aftercommit(self._repo, node)
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
context: use correct spelling of committable
r19733 class committablefilectx(basefilectx):
"""A committablefilectx provides common functionality for a file context
that wants the ability to commit, e.g. workingfilectx or memfilectx."""
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
commitablefilectx: add a class that will be used for mutable file contexts...
r19701 def __init__(self, repo, path, filelog=None, ctx=None):
Matt Mackall
contexts: add working dir and working file contexts...
r3217 self._repo = repo
self._path = path
self._changeid = None
self._filerev = self._filenode = None
Durham Goode
filecontext: use 'is not None' to check for filelog existence...
r19149 if filelog is not None:
Matt Mackall
contexts: add working dir and working file contexts...
r3217 self._filelog = filelog
Sean Farley
commitablefilectx: move __init__ from workingfilectx
r19702 if ctx:
self._changectx = ctx
Sean Farley
commitablefilectx: move __nonzero__ from workingfilectx
r19703 def __nonzero__(self):
return True
Gregory Szorc
py3: add __bool__ to every class defining __nonzero__...
r31476 __bool__ = __nonzero__
Yuya Nishihara
committablefilectx: override linkrev() to point to the associated changectx...
r24420 def linkrev(self):
# linked to self._changectx no matter if file is modified or not
return self.rev()
Martin von Zweigbergk
context: move equivalent renamed() implementations to superclass...
r41936 def renamed(self):
path = self.copysource()
if not path:
return None
return path, self._changectx._parents[0]._manifest.get(path, nullid)
Matt Mackall
contexts: add working dir and working file contexts...
r3217 def parents(self):
'''return parent filectxs, following copies if necessary'''
Augie Fackler
formatting: blacken the codebase...
r43346
Benoit Boissinot
workingfilectx: always use the same filelog, even for renames...
r8528 def filenode(ctx, path):
return ctx._manifest.get(path, nullid)
path = self._path
Matt Mackall
contexts: add working dir and working file contexts...
r3217 fl = self._filelog
Benoit Boissinot
workingfilectx: always use the same filelog, even for renames...
r8528 pcl = self._changectx._parents
renamed = self.renamed()
if renamed:
pl = [renamed + (None,)]
else:
pl = [(path, filenode(pcl[0], path), fl)]
for pc in pcl[1:]:
pl.append((path, filenode(pc, path), fl))
Matt Mackall
contexts: add working dir and working file contexts...
r3217
Augie Fackler
formatting: blacken the codebase...
r43346 return [
self._parentfilectx(p, fileid=n, filelog=l)
for p, n, l in pl
if n != nullid
]
Matt Mackall
contexts: add working dir and working file contexts...
r3217
Sean Farley
commitablefilectx: move children from workingfilectx
r19705 def children(self):
return []
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
context: use correct spelling of committable
r19733 class workingfilectx(committablefilectx):
Sean Farley
commitablefilectx: move parents from workingfilectx
r19704 """A workingfilectx object makes access to data related to a particular
file in the working directory convenient."""
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
commitablefilectx: move parents from workingfilectx
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)
Augie Fackler
formatting: blacken the codebase...
r43346
Martin von Zweigbergk
context: add specialized way of getting copy source file only...
r41934 def copysource(self):
return self._repo.dirstate.copied(self._path)
Sean Farley
commitablefilectx: move parents from workingfilectx
r19704
Matt Mackall
many, many trivial check-code fixups
r10282 def size(self):
FUJIWARA Katsunori
context: use "vfs.lstat()" instead of "os.lstat()"
r19901 return self._repo.wvfs.lstat(self._path).st_size
Augie Fackler
formatting: blacken the codebase...
r43346
Valentin Gatien-Baron
merge: fix race that could cause wrong size in dirstate...
r42656 def lstat(self):
return self._repo.wvfs.lstat(self._path)
Augie Fackler
formatting: blacken the codebase...
r43346
Benoit Boissinot
add date attribute to workingfilectx
r3962 def date(self):
t, tz = self._changectx.date()
try:
Augie Fackler
cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime...
r36799 return (self._repo.wvfs.lstat(self._path)[stat.ST_MTIME], tz)
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except OSError as err:
Matt Mackall
many, many trivial check-code fixups
r10282 if err.errno != errno.ENOENT:
raise
Benoit Boissinot
add date attribute to workingfilectx
r3962 return (t, tz)
Matt Mackall
context: add cmp for filectxs
r3310
Phil Cohen
workingfilectx: add exists, lexists...
r33283 def exists(self):
return self._repo.wvfs.exists(self._path)
def lexists(self):
return self._repo.wvfs.lexists(self._path)
Phil Cohen
workingfilectx: add audit() as a wrapper for wvfs.audit()
r33086 def audit(self):
return self._repo.wvfs.audit(self._path)
Nicolas Dumazet
filectx: use cmp(self, fctx) instead of cmp(self, text)...
r11702 def cmp(self, fctx):
"""compare with other file context
Nicolas Dumazet
cmp: document the fact that we return True if content is different...
r11539
Nicolas Dumazet
filectx: use cmp(self, fctx) instead of cmp(self, text)...
r11702 returns True if different than fctx.
Nicolas Dumazet
cmp: document the fact that we return True if content is different...
r11539 """
Mads Kiilerich
fix wording and not-completely-trivial spelling errors and bad docstrings
r17425 # fctx should be a filectx (not a workingfilectx)
Nicolas Dumazet
context: reuse filecontext.cmp in workingfilecontext.cmp...
r11703 # invert comparison to reuse the same code path
return fctx.cmp(self)
Patrick Mezard
context: add memctx for memory commits
r6715
Sean Farley
workingfilectx: add remove and write methods...
r22073 def remove(self, ignoremissing=False):
"""wraps unlink for a repo's working directory"""
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 rmdir = self._repo.ui.configbool(b'experimental', b'removeemptydirs')
Augie Fackler
formatting: blacken the codebase...
r43346 self._repo.wvfs.unlinkpath(
self._path, ignoremissing=ignoremissing, rmdir=rmdir
)
Sean Farley
workingfilectx: add remove and write methods...
r22073
Boris Feld
write: add the possibility to pass keyword argument from batchget to vfs...
r35743 def write(self, data, flags, backgroundclose=False, **kwargs):
Sean Farley
workingfilectx: add remove and write methods...
r22073 """wraps repo.wwrite"""
Augie Fackler
formatting: blacken the codebase...
r43346 return self._repo.wwrite(
self._path, data, flags, backgroundclose=backgroundclose, **kwargs
)
Sean Farley
workingfilectx: add remove and write methods...
r22073
Phil Cohen
context: add workingfilectx.markcopied...
r34788 def markcopied(self, src):
"""marks this file a copy of `src`"""
Martin von Zweigbergk
copies: fix duplicatecopies() with overlay context...
r42509 self._repo.dirstate.copy(src, self._path)
Phil Cohen
context: add workingfilectx.markcopied...
r34788
Phil Cohen
merge: move some of the logic in batchget() to workingfilectx...
r34039 def clearunknown(self):
"""Removes conflicting items in the working directory so that
``write()`` can be called successfully.
"""
wvfs = self._repo.wvfs
Mark Thomas
context: also consider path conflicts when clearing unknown files...
r34557 f = self._path
Mark Thomas
context: audit paths before clearing unknown files and dirs...
r34834 wvfs.audit(f)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if self._repo.ui.configbool(
b'experimental', b'merge.checkpathconflicts'
):
Yuya Nishihara
merge: do not delete untracked files silently (issue5962)...
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)
Matt Harbison
context: skip path conflicts by default when clearing unknown file (issue5776)...
r37119 for p in reversed(list(util.finddirs(f))):
if wvfs.isfileorlink(p):
wvfs.unlink(p)
break
Yuya Nishihara
merge: do not delete untracked files silently (issue5962)...
r39232 else:
# don't remove files if path conflicts are not processed
if wvfs.isdir(f) and not wvfs.islink(f):
wvfs.removedirs(f)
Phil Cohen
merge: move some of the logic in batchget() to workingfilectx...
r34039
Phil Cohen
merge: change repo.wvfs.setflags calls to a new wctx[f].setflags function...
r33084 def setflags(self, l, x):
self._repo.wvfs.setflags(self._path, l, x)
Augie Fackler
formatting: blacken the codebase...
r43346
Phil Cohen
overlayworkingctx: inherit from committablectx instead of workingctx...
r35324 class overlayworkingctx(committablectx):
"""Wraps another mutable context with a write-back cache that can be
converted into a commit context.
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106
self._cache[path] maps to a dict with keys: {
'exists': bool?
'date': date?
'data': str?
'flags': str?
Phil Cohen
overlayworkingctx: track copy information in the context...
r35294 'copied': str? (path or None)
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 }
If `exists` is True, `flags` must be non-None and 'date' is non-None. If it
is `False`, the file was deleted.
"""
Phil Cohen
overlayworkingctx: move _wrappedctx out of the constructor...
r35290 def __init__(self, repo):
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 super(overlayworkingctx, self).__init__(repo)
Phil Cohen
overlayworkingctx: make clean() public...
r35287 self.clean()
Phil Cohen
overlayworkingctx: move _wrappedctx out of the constructor...
r35290
def setbase(self, wrappedctx):
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 self._wrappedctx = wrappedctx
Phil Cohen
overlayworkingctx: move _wrappedctx out of the constructor...
r35290 self._parents = [wrappedctx]
Phil Cohen
overlayworkingctx: invalidate the manifest cache when changing parents...
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).
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 util.clearcachedproperty(self, b'_manifest')
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106
def data(self, path):
if self.isdirty(path):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if self._cache[path][b'exists']:
if self._cache[path][b'data'] is not None:
return self._cache[path][b'data']
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 else:
# Must fallback here, too, because we only set flags.
return self._wrappedctx[path].data()
else:
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.ProgrammingError(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"No such file or directory: %s" % path
Augie Fackler
formatting: blacken the codebase...
r43346 )
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 else:
return self._wrappedctx[path].data()
Phil Cohen
overlayworkingctx: add _manifest, files(), added(), removed(), modified()...
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):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return self._cache[path][b'flags']
Augie Fackler
formatting: blacken the codebase...
r43346
Phil Cohen
overlayworkingctx: add _manifest, files(), added(), removed(), modified()...
r35322 return f
def files(self):
return sorted(self.added() + self.modified() + self.removed())
def modified(self):
Augie Fackler
formatting: blacken the codebase...
r43346 return [
f
for f in self._cache.keys()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if self._cache[f][b'exists'] and self._existsinparent(f)
Augie Fackler
formatting: blacken the codebase...
r43346 ]
Phil Cohen
overlayworkingctx: add _manifest, files(), added(), removed(), modified()...
r35322
def added(self):
Augie Fackler
formatting: blacken the codebase...
r43346 return [
f
for f in self._cache.keys()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if self._cache[f][b'exists'] and not self._existsinparent(f)
Augie Fackler
formatting: blacken the codebase...
r43346 ]
Phil Cohen
overlayworkingctx: add _manifest, files(), added(), removed(), modified()...
r35322
def removed(self):
Augie Fackler
formatting: blacken the codebase...
r43346 return [
f
for f in self._cache.keys()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if not self._cache[f][b'exists'] and self._existsinparent(f)
Augie Fackler
formatting: blacken the codebase...
r43346 ]
Phil Cohen
overlayworkingctx: add _manifest, files(), added(), removed(), modified()...
r35322
Martin von Zweigbergk
context: introduce p[12]copies() methods and debugp[12]copies commands...
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
Augie Fackler
formatting: blacken the codebase...
r43346 copies.pop(f, None) # delete if it exists
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 source = self._cache[f][b'copied']
Martin von Zweigbergk
context: introduce p[12]copies() methods and debugp[12]copies commands...
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
Augie Fackler
formatting: blacken the codebase...
r43346 copies.pop(f, None) # delete if it exists
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 source = self._cache[f][b'copied']
Martin von Zweigbergk
context: introduce p[12]copies() methods and debugp[12]copies commands...
r41921 if source:
copies[f] = source
return copies
Phil Cohen
context: add is `isinmemory()` to filectx...
r34682 def isinmemory(self):
return True
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 def filedate(self, path):
if self.isdirty(path):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return self._cache[path][b'date']
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 else:
return self._wrappedctx[path].date()
Phil Cohen
overlayworkingctx: track copy information in the context...
r35294 def markcopied(self, path, origin):
Augie Fackler
formatting: blacken the codebase...
r43346 self._markdirty(
path,
exists=True,
date=self.filedate(path),
flags=self.flags(path),
copied=origin,
)
Phil Cohen
overlayworkingctx: track copy information in the context...
r35294
def copydata(self, path):
if self.isdirty(path):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return self._cache[path][b'copied']
Phil Cohen
overlayworkingctx: track copy information in the context...
r35294 else:
Martin von Zweigbergk
overlaycontext: allow calling copydata() on clean context...
r42474 return None
Phil Cohen
overlayworkingctx: track copy information in the context...
r35294
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 def flags(self, path):
if self.isdirty(path):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if self._cache[path][b'exists']:
return self._cache[path][b'flags']
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 else:
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.ProgrammingError(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"No such file or directory: %s" % self._path
Augie Fackler
formatting: blacken the codebase...
r43346 )
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 else:
return self._wrappedctx[path].flags()
Martin von Zweigbergk
rebase: fix dir/file conflict detection when using in-mem merge...
r40839 def __contains__(self, key):
if key in self._cache:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return self._cache[key][b'exists']
Martin von Zweigbergk
rebase: fix dir/file conflict detection when using in-mem merge...
r40839 return key in self.p1()
Phil Cohen
overlayworkingctx: add `_checkexist(path)`...
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
Phil Cohen
overlayworkingctx: add _auditconflicts to write()...
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.
"""
Augie Fackler
formatting: blacken the codebase...
r43346
Phil Cohen
overlayworkingctx: add _auditconflicts to write()...
r35325 def fail(path, component):
# p1() is the base and we're receiving "writes" for p2()'s
# files.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if b'l' in self.p1()[component].flags():
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.Abort(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"error: %s conflicts with symlink %s "
b"in %d." % (path, component, self.p1().rev())
Augie Fackler
formatting: blacken the codebase...
r43346 )
Phil Cohen
overlayworkingctx: add _auditconflicts to write()...
r35325 else:
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.Abort(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"error: '%s' conflicts with file '%s' in "
b"%d." % (path, component, self.p1().rev())
Augie Fackler
formatting: blacken the codebase...
r43346 )
Phil Cohen
overlayworkingctx: add _auditconflicts to write()...
r35325
# Test that each new directory to be created to write this path from p2
# is not a file in p1.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 components = path.split(b'/')
Gregory Szorc
global: use pycompat.xrange()...
r38806 for i in pycompat.xrange(len(components)):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 component = b"/".join(components[0:i])
Martin von Zweigbergk
rebase: fix dir/file conflict detection when using in-mem merge...
r40839 if component in self:
Phil Cohen
overlayworkingctx: add _auditconflicts to write()...
r35325 fail(path, component)
# Test the other direction -- that this path from p2 isn't a directory
Martin von Zweigbergk
rebase: fix path auditing to audit path relative to repo root (issue5818)...
r40852 # in p1 (test that p1 doesn't have any paths matching `path/*`).
Martin von Zweigbergk
overlayworkingctx: remove misleading trailing slash from directory pattern...
r42271 match = self.match([path], default=b'path')
Phil Cohen
overlayworkingctx: add _auditconflicts to write()...
r35325 matches = self.p1().manifest().matches(match)
Pulkit Goyal
context: don't count deleted files as candidates for path conflicts in IMM...
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
Martin von Zweigbergk
rebase: fix dir/file conflict detection when using in-mem merge...
r40839 mfiles = [m for m in mfiles if m in self]
Pulkit Goyal
context: don't count deleted files as candidates for path conflicts in IMM...
r39612 if not mfiles:
Phil Cohen
overlayworkingctx: add _auditconflicts to write()...
r35325 return
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.Abort(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
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))
Augie Fackler
formatting: blacken the codebase...
r43346 )
Phil Cohen
overlayworkingctx: add _auditconflicts to write()...
r35325
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 def write(self, path, data, flags=b'', **kwargs):
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 if data is None:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise error.ProgrammingError(b"data must be non-None")
Phil Cohen
overlayworkingctx: add _auditconflicts to write()...
r35325 self._auditconflicts(path)
Augie Fackler
formatting: blacken the codebase...
r43346 self._markdirty(
path, exists=True, data=data, date=dateutil.makedate(), flags=flags
)
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106
def setflags(self, path, l, x):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 flag = b''
Pulkit Goyal
context: safegaurd from 'lx' being passed as file flag in manifest...
r39101 if l:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 flag = b'l'
Pulkit Goyal
context: safegaurd from 'lx' being passed as file flag in manifest...
r39101 elif x:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 flag = b'x'
Augie Fackler
formatting: blacken the codebase...
r43346 self._markdirty(path, exists=True, date=dateutil.makedate(), flags=flag)
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
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.
Augie Fackler
formatting: blacken the codebase...
r43346 if (
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self._cache[path][b'exists']
and b'l' in self._cache[path][b'flags']
Augie Fackler
formatting: blacken the codebase...
r43346 ):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return self.exists(self._cache[path][b'data'].strip())
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 else:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return self._cache[path][b'exists']
Phil Cohen
overlayworkingctx: add `_checkexist(path)`...
r35296
return self._existsinparent(path)
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106
def lexists(self, path):
"""lexists returns True if the path exists"""
if self.isdirty(path):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return self._cache[path][b'exists']
Phil Cohen
overlayworkingctx: add `_checkexist(path)`...
r35296
return self._existsinparent(path)
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106
def size(self, path):
if self.isdirty(path):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if self._cache[path][b'exists']:
return len(self._cache[path][b'data'])
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 else:
Augie Fackler
formatting: blacken the codebase...
r43346 raise error.ProgrammingError(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"No such file or directory: %s" % self._path
Augie Fackler
formatting: blacken the codebase...
r43346 )
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 return self._wrappedctx[path].size()
Augie Fackler
formatting: blacken the codebase...
r43346 def tomemctx(
self,
text,
branch=None,
extra=None,
date=None,
parents=None,
user=None,
editor=None,
):
Phil Cohen
overlayworkingctx: add ``tomemctx()``...
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]])
Martin von Zweigbergk
overlayworkingctx: don't include added-then-deleted files in memctx...
r42476 files = self.files()
Augie Fackler
formatting: blacken the codebase...
r43346
Phil Cohen
overlayworkingctx: add ``tomemctx()``...
r35326 def getfile(repo, memctx, path):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if self._cache[path][b'exists']:
Augie Fackler
formatting: blacken the codebase...
r43346 return memfilectx(
repo,
memctx,
path,
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
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'],
Augie Fackler
formatting: blacken the codebase...
r43346 )
Phil Cohen
overlayworkingctx: add ``tomemctx()``...
r35326 else:
# Returning None, but including the path in `files`, is
# necessary for memctx to register a deletion.
return None
Augie Fackler
formatting: blacken the codebase...
r43346
return memctx(
self._repo,
parents,
text,
files,
getfile,
date=date,
extra=extra,
user=user,
branch=branch,
editor=editor,
)
Phil Cohen
overlayworkingctx: add ``tomemctx()``...
r35326
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 def isdirty(self, path):
return path in self._cache
Phil Cohen
rebase: add concludememorynode(), and call it when rebasing in-memory...
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
Phil Cohen
overlayworkingctx: make clean() public...
r35287 def clean(self):
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 self._cache = {}
Phil Cohen
overlayworkingctx: add `_compact()`...
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 = []
Kyle Lippincott
context: schedule file prefetch before comparing for cleanliness...
r41189 # This won't be perfect, but can help performance significantly when
# using things like remotefilelog.
scmutil.prefetchfiles(
Augie Fackler
formatting: blacken the codebase...
r43346 self.repo(),
[self.p1().rev()],
scmutil.matchfiles(self.repo(), self._cache.keys()),
)
Kyle Lippincott
context: schedule file prefetch before comparing for cleanliness...
r41189
Phil Cohen
overlayworkingctx: add `_compact()`...
r35327 for path in self._cache.keys():
cache = self._cache[path]
try:
underlying = self._wrappedctx[path]
Augie Fackler
formatting: blacken the codebase...
r43346 if (
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 underlying.data() == cache[b'data']
and underlying.flags() == cache[b'flags']
Augie Fackler
formatting: blacken the codebase...
r43346 ):
Phil Cohen
overlayworkingctx: add `_compact()`...
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
Augie Fackler
formatting: blacken the codebase...
r43346 def _markdirty(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self, path, exists, data=None, date=None, flags=b'', copied=None
Augie Fackler
formatting: blacken the codebase...
r43346 ):
Kyle Lippincott
overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960)...
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 {}
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 data = oldentry.get(b'data')
Martin von Zweigbergk
rebase: fix in-memory rebasing of copy of empty file...
r42728 if data is None:
data = self._wrappedctx[path].data()
Kyle Lippincott
overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960)...
r39163
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 self._cache[path] = {
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'exists': exists,
b'data': data,
b'date': date,
b'flags': flags,
b'copied': copied,
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 }
def filectx(self, path, filelog=None):
Augie Fackler
formatting: blacken the codebase...
r43346 return overlayworkingfilectx(
self._repo, path, parent=self, filelog=filelog
)
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106
Phil Cohen
overlayworkingctx: inherit from committablectx instead of workingctx...
r35324 class overlayworkingfilectx(committablefilectx):
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
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):
Augie Fackler
formatting: blacken the codebase...
r43346 super(overlayworkingfilectx, self).__init__(repo, path, filelog, parent)
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 self._repo = repo
self._parent = parent
self._path = path
Phil Cohen
context: add overlayfilectx.cmp()...
r34784 def cmp(self, fctx):
return self.data() != fctx.data()
Phil Cohen
context: switch ctx() use to changectx()...
r35282 def changectx(self):
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
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)
Martin von Zweigbergk
context: add specialized way of getting copy source file only...
r41934 def copysource(self):
return self._parent.copydata(self._path)
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106 def size(self):
return self._parent.size(self._path)
Phil Cohen
overlayworkingctx: track copy information in the context...
r35294 def markcopied(self, origin):
self._parent.markcopied(self._path, origin)
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
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)
Boris Feld
write: add the possibility to pass keyword argument from batchget to vfs...
r35743 def write(self, data, flags, backgroundclose=False, **kwargs):
return self._parent.write(self._path, data, flags, **kwargs)
Phil Cohen
context: add overlayworkingcontext and overlayworkingfilectx...
r34106
def remove(self, ignoremissing=False):
return self._parent.remove(self._path)
Phil Cohen
overlayworkingctx: add a no-op ``clearunknown()``...
r35323 def clearunknown(self):
pass
Augie Fackler
formatting: blacken the codebase...
r43346
FUJIWARA Katsunori
context: add workingcommitctx for exact context to be committed...
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.
"""
Augie Fackler
formatting: blacken the codebase...
r43346
def __init__(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self, repo, changes, text=b"", user=None, date=None, extra=None
Augie Fackler
formatting: blacken the codebase...
r43346 ):
super(workingcommitctx, self).__init__(
repo, text, user, date, extra, changes
)
FUJIWARA Katsunori
context: add workingcommitctx for exact context to be committed...
r23710
Martin von Zweigbergk
context: remove unnecessary default values for matchers (API)...
r33938 def _dirstatestatus(self, match, ignored=False, clean=False, unknown=False):
FUJIWARA Katsunori
context: override _dirstatestatus in workingcommitctx for correct matching...
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 = []
Augie Fackler
formatting: blacken the codebase...
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,
)
FUJIWARA Katsunori
context: override _dirstatestatus in workingcommitctx for correct matching...
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
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
context: don't use util.cachefunc due to cycle creation (issue5043)...
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
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
memctx: refactor inline getfilectx into convenience method...
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.
"""
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
memctx: refactor inline getfilectx into convenience method...
r32763 def getfilectx(repo, memctx, path):
fctx = ctx[path]
Martin von Zweigbergk
memctx: rename constructor argument "copied" to "copysource" (API)...
r42161 copysource = fctx.copysource()
Augie Fackler
formatting: blacken the codebase...
r43346 return memfilectx(
repo,
memctx,
path,
fctx.data(),
islink=fctx.islink(),
isexec=fctx.isexec(),
copysource=copysource,
)
Sean Farley
memctx: refactor inline getfilectx into convenience method...
r32763
return getfilectx
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
context: add convenience method for returning a memfilectx from a patch...
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.
"""
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
context: add convenience method for returning a memfilectx from a patch...
r32764 def getfilectx(repo, memctx, path):
Martin von Zweigbergk
memctx: rename constructor argument "copied" to "copysource" (API)...
r42161 data, mode, copysource = patchstore.getfile(path)
Sean Farley
context: add convenience method for returning a memfilectx from a patch...
r32764 if data is None:
return None
islink, isexec = mode
Augie Fackler
formatting: blacken the codebase...
r43346 return memfilectx(
repo,
memctx,
path,
data,
islink=islink,
isexec=isexec,
copysource=copysource,
)
Sean Farley
context: add convenience method for returning a memfilectx from a patch...
r32764
return getfilectx
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
memctx: inherit from committablectx...
r21665 class memctx(committablectx):
Patrick Mezard
context: improve memctx documentation
r7077 """Use memctx to perform in-memory commits via localrepo.commitctx().
Patrick Mezard
context: add memctx for memory commits
r6715
Patrick Mezard
context: improve memctx documentation
r7077 Revision information is supplied at initialization time while
related files data and is made available through a callback
mechanism. 'repo' is the current localrepo, 'parents' is a
sequence of two parent revisions identifiers (pass None for every
missing parent), 'text' is the commit message and 'files' lists
names of files touched by the revision (normalized and relative to
repository root).
Patrick Mezard
context: add memctx for memory commits
r6715
Patrick Mezard
context: improve memctx documentation
r7077 filectxfn(repo, memctx, path) is a callable receiving the
repository, the current memctx object and the normalized path of
requested file, relative to repository root. It is fired by the
commit function for every file in 'files', but calls order is
undefined. If the file is available in the revision being
committed (updated or added), filectxfn returns a memfilectx
FUJIWARA Katsunori
misc: update descriptions about removed file for filectxfn...
r31612 object. If the file was removed, filectxfn return None for recent
Mercurial. Moved files are represented by marking the source file
Patrick Mezard
context: improve memctx documentation
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
Boris Feld
util: extract all date-related utils in utils/dateutil module...
r36625 supported by dateutil.parsedate() and defaults to current date, extra
Patrick Mezard
context: improve memctx documentation
r7077 is a dictionary of metadata or is left empty.
Patrick Mezard
context: add memctx for memory commits
r6715 """
Siddharth Agarwal
memctx: allow extensions to determine what filectxfn should do...
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
Augie Fackler
formatting: blacken the codebase...
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
)
Patrick Mezard
context: add memctx for memory commits
r6715 self._rev = None
self._node = None
parents = [(p or nullid) for p in parents]
p1, p2 = parents
Martin von Zweigbergk
memctx: create parent contexts using "repo[p]" syntax...
r37190 self._parents = [self._repo[p] for p in (p1, p2)]
Matt Mackall
replace util.sort with sorted built-in...
r8209 files = sorted(set(files))
FUJIWARA Katsunori
memctx: calculate exact status being committed from specified files...
r23587 self._files = files
Sean Farley
memctx: substate needs to be {} instead of None...
r21938 self.substate = {}
Patrick Mezard
context: add memctx for memory commits
r6715
Sean Farley
context: inline makememctx (API)...
r32765 if isinstance(filectxfn, patch.filestore):
Sean Farley
memctx: always use cache for filectxfn...
r32781 filectxfn = memfilefrompatch(filectxfn)
Sean Farley
context: inline makememctx (API)...
r32765 elif not callable(filectxfn):
# if store is not callable, wrap it in a function
Sean Farley
memctx: always use cache for filectxfn...
r32781 filectxfn = memfilefromctx(filectxfn)
# memoizing increases performance for e.g. vcs convert scenarios.
self._filectxfn = makecachingfilectxfn(filectxfn)
Sean Farley
memctx: create a filectxfn if it is not callable...
r22072
FUJIWARA Katsunori
context: move editor invocation from "makememctx()" to "memctx.__init__()"...
r21238 if editor:
self._text = editor(self._repo, self, [])
self._repo.savecommitmessage(self._text)
Patrick Mezard
context: add memctx for memory commits
r6715 def filectx(self, path, filelog=None):
Mads Kiilerich
convert: use None value for missing files instead of overloading IOError...
r22296 """get a file context from the working directory
Returns None if file doesn't exist and should be removed."""
Patrick Mezard
context: add memctx for memory commits
r6715 return self._filectxfn(self._repo, self, path)
Alexander Solovyov
slightly improve memctx api
r11151 def commit(self):
"""commit context to the repo"""
return self._repo.commitctx(self)
Sean Farley
memctx: add _manifest implementation that computes the filenode...
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()
FUJIWARA Katsunori
memctx: calculate manifest more efficiently...
r23603 for f in self._status.modified:
Sean Farley
memctx: simplify _manifest with new revlog nodeids...
r39749 man[f] = modifiednodeid
Sean Farley
memctx: add _manifest implementation that computes the filenode...
r21835
FUJIWARA Katsunori
memctx: calculate manifest including newly added files correctly...
r23588 for f in self._status.added:
Sean Farley
memctx: simplify _manifest with new revlog nodeids...
r39749 man[f] = addednodeid
FUJIWARA Katsunori
memctx: calculate manifest including newly added files correctly...
r23588
FUJIWARA Katsunori
memctx: calculate manifest correctly with newly-removed files (issue4470)...
r23589 for f in self._status.removed:
if f in man:
del man[f]
Sean Farley
memctx: add _manifest implementation that computes the filenode...
r21835
return man
FUJIWARA Katsunori
memctx: calculate exact status being committed from specified files...
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, [], [], [], [])
Sean Farley
memctx: add _manifest implementation that computes the filenode...
r21835
Augie Fackler
formatting: blacken the codebase...
r43346
Sean Farley
memfilectx: inherit from committablefilectx...
r21688 class memfilectx(committablefilectx):
Patrick Mezard
context: improve memctx documentation
r7077 """memfilectx represents an in-memory file to commit.
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r23139 See memctx and committablefilectx for more details.
Patrick Mezard
context: add memctx for memory commits
r6715 """
Augie Fackler
formatting: blacken the codebase...
r43346
def __init__(
self,
repo,
changectx,
path,
data,
islink=False,
isexec=False,
copysource=None,
):
Patrick Mezard
context: improve memctx documentation
r7077 """
path is the normalized file path relative to repository root.
data is the file content as a string.
islink is True if the file is a symbolic link.
isexec is True if the file is executable.
copied is the source file path if current file was copied in the
revision being committed, or None."""
Martin von Zweigbergk
memfilectx: make changectx argument mandatory in constructor (API)...
r35401 super(memfilectx, self).__init__(repo, path, None, changectx)
Patrick Mezard
context: add memctx for memory commits
r6715 self._data = data
Pulkit Goyal
context: safegaurd against 'lx' being passed as file flag in manifest...
r38784 if islink:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self._flags = b'l'
Pulkit Goyal
context: safegaurd against 'lx' being passed as file flag in manifest...
r38784 elif isexec:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self._flags = b'x'
Pulkit Goyal
context: safegaurd against 'lx' being passed as file flag in manifest...
r38784 else:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self._flags = b''
Martin von Zweigbergk
memfilectx: override copysource() instead of using dummy nodeid...
r42162 self._copysource = copysource
def copysource(self):
return self._copysource
Patrick Mezard
context: add memctx for memory commits
r6715
Yuya Nishihara
context: reimplement memfilectx.cmp()...
r41022 def cmp(self, fctx):
return self.data() != fctx.data()
Matt Mackall
many, many trivial check-code fixups
r10282 def data(self):
return self._data
Sean Farley
memfilectx: add remove and write methods...
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]
Boris Feld
write: add the possibility to pass keyword argument from batchget to vfs...
r35743 def write(self, data, flags, **kwargs):
Sean Farley
memfilectx: add remove and write methods...
r22074 """wraps repo.wwrite"""
self._data = data
Mateusz Kwapich
memctx: allow the metadataonlyctx thats reusing the manifest node...
r30567
Jun Wu
filectx: add an overlayfilectx class...
r32239
Mateusz Kwapich
memctx: allow the metadataonlyctx thats reusing the manifest node...
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
Boris Feld
util: extract all date-related utils in utils/dateutil module...
r36625 dateutil.parsedate() and defaults to current date, extra is a dictionary of
Mateusz Kwapich
memctx: allow the metadataonlyctx thats reusing the manifest node...
r30567 metadata or is left empty.
"""
Augie Fackler
formatting: blacken the codebase...
r43346
def __init__(
self,
repo,
originalctx,
parents=None,
text=None,
user=None,
date=None,
extra=None,
editor=False,
):
Jun Wu
context: make parents and text optional in metadataonlyctx...
r34000 if text is None:
text = originalctx.description()
Mateusz Kwapich
memctx: allow the metadataonlyctx thats reusing the manifest node...
r30567 super(metadataonlyctx, self).__init__(repo, text, user, date, extra)
self._rev = None
self._node = None
self._originalctx = originalctx
self._manifestnode = originalctx.manifestnode()
Jun Wu
context: make parents and text optional in metadataonlyctx...
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
Mateusz Kwapich
memctx: allow the metadataonlyctx thats reusing the manifest node...
r30567
# sanity check to ensure that the reused manifest parents are
# manifests of our commit parents
mp1, mp2 = self.manifestctx().parents
Jun Wu
metadataonlyctx: replace "changeset()[0]" to "manifestnode()"...
r31840 if p1 != nullid and p1.manifestnode() != mp1:
Augie Fackler
formatting: blacken the codebase...
r43346 raise RuntimeError(
r"can't reuse the manifest: its p1 "
r"doesn't match the new ctx p1"
)
Jun Wu
metadataonlyctx: replace "changeset()[0]" to "manifestnode()"...
r31840 if p2 != nullid and p2.manifestnode() != mp2:
Augie Fackler
formatting: blacken the codebase...
r43346 raise RuntimeError(
r"can't reuse the manifest: "
r"its p2 doesn't match the new ctx p2"
)
Mateusz Kwapich
memctx: allow the metadataonlyctx thats reusing the manifest node...
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
Jun Wu
context: do not cache manifestctx...
r32519 @property
Mateusz Kwapich
memctx: allow the metadataonlyctx thats reusing the manifest node...
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)
Jun Wu
metadataonlyctx: don't crash when reusing the manifest with deletions...
r34001 elif f in self:
Mateusz Kwapich
memctx: allow the metadataonlyctx thats reusing the manifest node...
r30567 modified.append(f)
else:
removed.append(f)
return scmutil.status(modified, added, removed, [], [], [], [])
Phil Cohen
context: add arbitraryfilectx, which can represent files outside the workdir...
r34053
Augie Fackler
formatting: blacken the codebase...
r43346
Phil Cohen
context: add arbitraryfilectx, which can represent files outside the workdir...
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.
"""
Augie Fackler
formatting: blacken the codebase...
r43346
Phil Cohen
context: add a fast-comparision for arbitraryfilectx and workingfilectx...
r34686 def __init__(self, path, repo=None):
# Repo is optional because contrib/simplemerge uses this class.
self._repo = repo
Phil Cohen
context: add arbitraryfilectx, which can represent files outside the workdir...
r34053 self._path = path
Phil Cohen
context: add a fast-comparision for arbitraryfilectx and workingfilectx...
r34686 def cmp(self, fctx):
Phil Cohen
arbitraryfilecontext: skip the cmp fast path if any side is a symlink...
r34836 # filecmp follows symlinks whereas `cmp` should not, so skip the fast
# path if either side is a symlink.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 symlinks = b'l' in self.flags() or b'l' in fctx.flags()
Phil Cohen
arbitraryfilecontext: skip the cmp fast path if any side is a symlink...
r34836 if not symlinks and isinstance(fctx, workingfilectx) and self._repo:
Phil Cohen
context: add a fast-comparision for arbitraryfilectx and workingfilectx...
r34686 # Add a fast-path for merge if both sides are disk-backed.
Phil Cohen
arbitraryfilecontext: skip the cmp fast path if any side is a symlink...
r34836 # Note that filecmp uses the opposite return values (True if same)
# from our cmp functions (True if different).
Phil Cohen
context: add a fast-comparision for arbitraryfilectx and workingfilectx...
r34686 return not filecmp.cmp(self.path(), self._repo.wjoin(fctx.path()))
return self.data() != fctx.data()
Phil Cohen
context: add arbitraryfilectx, which can represent files outside the workdir...
r34053
def path(self):
return self._path
def flags(self):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return b''
Phil Cohen
context: add arbitraryfilectx, which can represent files outside the workdir...
r34053
def data(self):
return util.readfile(self._path)
def decodeddata(self):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 with open(self._path, b"rb") as f:
Phil Cohen
context: add arbitraryfilectx, which can represent files outside the workdir...
r34053 return f.read()
def remove(self):
util.unlink(self._path)
Boris Feld
write: add the possibility to pass keyword argument from batchget to vfs...
r35743 def write(self, data, flags, **kwargs):
Phil Cohen
context: add arbitraryfilectx, which can represent files outside the workdir...
r34053 assert not flags
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 with open(self._path, b"wb") as f:
Phil Cohen
context: add arbitraryfilectx, which can represent files outside the workdir...
r34053 f.write(data)