mercurial-scm/hg-stable: mercurial/context.py annotate

annotate mercurial/context.py @ 48429:41f40f35278a

status: gather fixup info at comparison time This is still racy, but on a much small windows. In addition, the API now make it possible for it to not be racy. This also unlock other cleanups that we are about to do regarding mtime ambiguity at gathering time. Differential Revision: https://phab.mercurial-scm.org/D11785

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Wed, 17 Nov 2021 23:37:47 +0100
parents	20d0149b8a0a
children	322525db4c98

rev	line source
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	1 # context.py - changeset and file context objects for mercurial
482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	2 #
46819 d4ba4d51f85f contributor: change mentions of mpm to olivia Rapha?l Gom?s <rgomes@octobus.net> parents: 46796 diff changeset	3 # Copyright 2006, 2007 Olivia Mackall <olivia@selenic.com>
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8209 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 10262 diff changeset	6 # GNU General Public License version 2 or any later version.
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	7
27506 e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	8 from __future__ import absolute_import
e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	9
e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	10 import errno
34685 6036e6e205ca context: add a fast-comparision for arbitraryfilectx and workingfilectx Phil Cohen <phillco@fb.com> parents: 34681 diff changeset	11 import filecmp
27506 e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	12 import os
e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	13 import stat
26604 a3fcc8e3136b context: don't hex encode all unknown 20 char revision specs (issue4890) Mads Kiilerich <madski@unity3d.com> parents: 26587 diff changeset	14
27506 e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	15 from .i18n import _
e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	16 from .node import (
e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	17 hex,
e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	18 nullrev,
e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	19 short,
e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	20 )
43089 c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	21 from .pycompat import (
c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	22 getattr,
c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	23 open,
c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	24 )
27506 e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	25 from . import (
36923 7affcabf561e dagop: move annotateline and _annotatepair from context.py Yuya Nishihara <yuya@tcha.org> parents: 36789 diff changeset	26 dagop,
27506 e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	27 encoding,
e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	28 error,
e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	29 fileset,
e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	30 match as matchmod,
44916 e607099d8b93 context: implement mergestate() method Augie Fackler <augie@google.com> parents: 44399 diff changeset	31 mergestate as mergestatemod,
44981 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44975 diff changeset	32 metadata,
27506 e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	33 obsolete as obsmod,
e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	34 patch,
33501 7008f6819002 context: name files relative to cwd in warning messages Matt Harbison <matt_harbison@yahoo.com> parents: 33499 diff changeset	35 pathutil,
27506 e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	36 phases,
31352 ff2f90503d64 context: work around `long` not existing on Python 3 Augie Fackler <augie@google.com> parents: 31318 diff changeset	37 pycompat,
27506 e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	38 repoview,
e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	39 scmutil,
33353 160efb559f67 sparse: move post commit actions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33283 diff changeset	40 sparse,
27506 e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	41 subrepo,
36047 55e8efa2451a subrepo: split non-core functions to new module Yuya Nishihara <yuya@tcha.org> parents: 35930 diff changeset	42 subrepoutil,
27506 e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	43 util,
e6d3dad71e44 context: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27234 diff changeset	44 )
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37069 diff changeset	45 from .utils import (
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37069 diff changeset	46 dateutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37069 diff changeset	47 stringutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37069 diff changeset	48 )
48429 41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	49 from .dirstateutils import (
41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	50 timestamp,
41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	51 )
3122 da85145d4571 filectx: add rename traversal for parents() Matt Mackall <mpm@selenic.com> parents: 2859 diff changeset	52
8207 dd8d5be57d65 util: take propertycache from context.py Matt Mackall <mpm@selenic.com> parents: 8157 diff changeset	53 propertycache = util.propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	54
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	55
19537 6e3e8575276d basectx: add an empty class that will be used as a parent of all contexts Sean Farley <sean.michael.farley@gmail.com> parents: 19314 diff changeset	56 class basectx(object):
6e3e8575276d basectx: add an empty class that will be used as a parent of all contexts Sean Farley <sean.michael.farley@gmail.com> parents: 19314 diff changeset	57 """A basectx object represents the common logic for its children:
6e3e8575276d basectx: add an empty class that will be used as a parent of all contexts Sean Farley <sean.michael.farley@gmail.com> parents: 19314 diff changeset	58 changectx: read-only context that is already present in the repo,
6e3e8575276d basectx: add an empty class that will be used as a parent of all contexts Sean Farley <sean.michael.farley@gmail.com> parents: 19314 diff changeset	59 workingctx: a context that represents the working directory and can
6e3e8575276d basectx: add an empty class that will be used as a parent of all contexts Sean Farley <sean.michael.farley@gmail.com> parents: 19314 diff changeset	60 be committed,
6e3e8575276d basectx: add an empty class that will be used as a parent of all contexts Sean Farley <sean.michael.farley@gmail.com> parents: 19314 diff changeset	61 memctx: a context that represents changes in-memory and can also
6e3e8575276d basectx: add an empty class that will be used as a parent of all contexts Sean Farley <sean.michael.farley@gmail.com> parents: 19314 diff changeset	62 be committed."""
6e3e8575276d basectx: add an empty class that will be used as a parent of all contexts Sean Farley <sean.michael.farley@gmail.com> parents: 19314 diff changeset	63
37177 fbe34945220d context: set repo property in basectx Martin von Zweigbergk <martinvonz@google.com> parents: 37176 diff changeset	64 def __init__(self, repo):
fbe34945220d context: set repo property in basectx Martin von Zweigbergk <martinvonz@google.com> parents: 37176 diff changeset	65 self._repo = repo
fbe34945220d context: set repo property in basectx Martin von Zweigbergk <martinvonz@google.com> parents: 37176 diff changeset	66
31353 c99371e38e5e context: implement both __bytes__ and __str__ for Python 3 Augie Fackler <augie@google.com> parents: 31352 diff changeset	67 def __bytes__(self):
19540 7b864da00e21 basectx: move __str__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19539 diff changeset	68 return short(self.node())
7b864da00e21 basectx: move __str__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19539 diff changeset	69
33038 ce96efec8112 py3: add utility to forward __str__() to __bytes__() Yuya Nishihara <yuya@tcha.org> parents: 33035 diff changeset	70 __str__ = encoding.strmethod(__bytes__)
ce96efec8112 py3: add utility to forward __str__() to __bytes__() Yuya Nishihara <yuya@tcha.org> parents: 33035 diff changeset	71
19546 a45cf68dd9a2 basectx: move __repr__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19545 diff changeset	72 def __repr__(self):
43551 313e3a279828 cleanup: remove pointless r-prefixes on double-quoted strings Augie Fackler <augie@google.com> parents: 43346 diff changeset	73 return "<%s %s>" % (type(self).__name__, str(self))
19546 a45cf68dd9a2 basectx: move __repr__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19545 diff changeset	74
19547 0537c0cfd87c basectx: move __eq__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19546 diff changeset	75 def __eq__(self, other):
0537c0cfd87c basectx: move __eq__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19546 diff changeset	76 try:
0537c0cfd87c basectx: move __eq__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19546 diff changeset	77 return type(self) == type(other) and self._rev == other._rev
0537c0cfd87c basectx: move __eq__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19546 diff changeset	78 except AttributeError:
0537c0cfd87c basectx: move __eq__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19546 diff changeset	79 return False
0537c0cfd87c basectx: move __eq__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19546 diff changeset	80
19548 730fdcaa791d basectx: move __ne__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19547 diff changeset	81 def __ne__(self, other):
730fdcaa791d basectx: move __ne__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19547 diff changeset	82 return not (self == other)
730fdcaa791d basectx: move __ne__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19547 diff changeset	83
19550 0c8ad779eb36 basectx: move __contains__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19549 diff changeset	84 def __contains__(self, key):
0c8ad779eb36 basectx: move __contains__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19549 diff changeset	85 return key in self._manifest
0c8ad779eb36 basectx: move __contains__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19549 diff changeset	86
19551 e07c69145724 basectx: move __getitem__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19550 diff changeset	87 def __getitem__(self, key):
e07c69145724 basectx: move __getitem__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19550 diff changeset	88 return self.filectx(key)
e07c69145724 basectx: move __getitem__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19550 diff changeset	89
19552 6b76070c4b54 basectx: move __iter__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19551 diff changeset	90 def __iter__(self):
24227 8ec2df32bd39 context: don't sort manifest entries Augie Fackler <augie@google.com> parents: 24213 diff changeset	91 return iter(self._manifest)
19552 6b76070c4b54 basectx: move __iter__ from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19551 diff changeset	92
31271 bd884ef2ee46 context: remove uses of manifest.matches Durham Goode <durham@fb.com> parents: 31270 diff changeset	93 def _buildstatusmanifest(self, status):
bd884ef2ee46 context: remove uses of manifest.matches Durham Goode <durham@fb.com> parents: 31270 diff changeset	94 """Builds a manifest that includes the given status results, if this is
bd884ef2ee46 context: remove uses of manifest.matches Durham Goode <durham@fb.com> parents: 31270 diff changeset	95 a working copy context. For non-working copy contexts, it just returns
bd884ef2ee46 context: remove uses of manifest.matches Durham Goode <durham@fb.com> parents: 31270 diff changeset	96 the normal manifest."""
bd884ef2ee46 context: remove uses of manifest.matches Durham Goode <durham@fb.com> parents: 31270 diff changeset	97 return self.manifest()
21880 e6754f5e4cf7 context: generate filtered manifest efficiently for exact matchers Siddharth Agarwal <sid0@fb.com> parents: 21845 diff changeset	98
23237 98f41a2f8fba context.status: remove unused arguments from _matchstatus() Martin von Zweigbergk <martinvonz@gmail.com> parents: 23236 diff changeset	99 def _matchstatus(self, other, match):
33954 c714e82b9ac2 context: always pass a matcher into _matchstatus() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 33919 diff changeset	100 """This internal method provides a way for child objects to override the
21481 2f1567ef70ba basectx: add _matchstatus method for factoring out last of parentworking logic Sean Farley <sean.michael.farley@gmail.com> parents: 21480 diff changeset	101 match operator.
2f1567ef70ba basectx: add _matchstatus method for factoring out last of parentworking logic Sean Farley <sean.michael.farley@gmail.com> parents: 21480 diff changeset	102 """
33954 c714e82b9ac2 context: always pass a matcher into _matchstatus() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 33919 diff changeset	103 return match
21481 2f1567ef70ba basectx: add _matchstatus method for factoring out last of parentworking logic Sean Farley <sean.michael.farley@gmail.com> parents: 21480 diff changeset	104
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	105 def _buildstatus(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	106 self, other, s, match, listignored, listclean, listunknown
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	107 ):
21471 90aff492dc4a context: add _buildstatus method Sean Farley <sean.michael.farley@gmail.com> parents: 21468 diff changeset	108 """build a status with respect to another context"""
23257 37c57a7cf160 context.status: explain "caching reasons" more fully Martin von Zweigbergk <martinvonz@google.com> parents: 23242 diff changeset	109 # Load earliest manifest first for caching reasons. More specifically,
37c57a7cf160 context.status: explain "caching reasons" more fully Martin von Zweigbergk <martinvonz@google.com> parents: 23242 diff changeset	110 # if you have revisions 1000 and 1001, 1001 is probably stored as a
37c57a7cf160 context.status: explain "caching reasons" more fully Martin von Zweigbergk <martinvonz@google.com> parents: 23242 diff changeset	111 # delta against 1000. Thus, if you read 1000 first, we'll reconstruct
37c57a7cf160 context.status: explain "caching reasons" more fully Martin von Zweigbergk <martinvonz@google.com> parents: 23242 diff changeset	112 # 1000 and cache it so that when you read 1001, we just need to apply a
37c57a7cf160 context.status: explain "caching reasons" more fully Martin von Zweigbergk <martinvonz@google.com> parents: 23242 diff changeset	113 # delta to what's in the cache. So that's one full reconstruction + one
37c57a7cf160 context.status: explain "caching reasons" more fully Martin von Zweigbergk <martinvonz@google.com> parents: 23242 diff changeset	114 # delta application.
31270 aac054e5389b context: remove assumptions about manifest creation during _buildstatus Durham Goode <durham@fb.com> parents: 31269 diff changeset	115 mf2 = None
23238 39eb9f78f968 context.status: move manifest caching trick to _buildstatus() Martin von Zweigbergk <martinvonz@gmail.com> parents: 23237 diff changeset	116 if self.rev() is not None and self.rev() < other.rev():
31271 bd884ef2ee46 context: remove uses of manifest.matches Durham Goode <durham@fb.com> parents: 31270 diff changeset	117 mf2 = self._buildstatusmanifest(s)
bd884ef2ee46 context: remove uses of manifest.matches Durham Goode <durham@fb.com> parents: 31270 diff changeset	118 mf1 = other._buildstatusmanifest(s)
31270 aac054e5389b context: remove assumptions about manifest creation during _buildstatus Durham Goode <durham@fb.com> parents: 31269 diff changeset	119 if mf2 is None:
31271 bd884ef2ee46 context: remove uses of manifest.matches Durham Goode <durham@fb.com> parents: 31270 diff changeset	120 mf2 = self._buildstatusmanifest(s)
21471 90aff492dc4a context: add _buildstatus method Sean Farley <sean.michael.farley@gmail.com> parents: 21468 diff changeset	121
23755 d43948a910a5 context: use manifest.diff() to compute most of status Augie Fackler <augie@google.com> parents: 23731 diff changeset	122 modified, added = [], []
d43948a910a5 context: use manifest.diff() to compute most of status Augie Fackler <augie@google.com> parents: 23731 diff changeset	123 removed = []
23757 b5346480a490 context: use new manifest.diff(clean=True) support Augie Fackler <augie@google.com> parents: 23755 diff changeset	124 clean = []
23304 dd3f857598a0 context.status: pass status tuple into _buildstatus Martin von Zweigbergk <martinvonz@google.com> parents: 23303 diff changeset	125 deleted, unknown, ignored = s.deleted, s.unknown, s.ignored
23085 e9165c18f8df status: make 'hg status --rev' faster when there are deleted files Martin von Zweigbergk <martinvonz@google.com> parents: 23080 diff changeset	126 deletedset = set(deleted)
31271 bd884ef2ee46 context: remove uses of manifest.matches Durham Goode <durham@fb.com> parents: 31270 diff changeset	127 d = mf1.diff(mf2, match=match, clean=listclean)
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43089 diff changeset	128 for fn, value in pycompat.iteritems(d):
23731 ccbaa2ed11a4 status: don't list files as both clean and deleted Martin von Zweigbergk <martinvonz@google.com> parents: 23730 diff changeset	129 if fn in deletedset:
ccbaa2ed11a4 status: don't list files as both clean and deleted Martin von Zweigbergk <martinvonz@google.com> parents: 23730 diff changeset	130 continue
23757 b5346480a490 context: use new manifest.diff(clean=True) support Augie Fackler <augie@google.com> parents: 23755 diff changeset	131 if value is None:
b5346480a490 context: use new manifest.diff(clean=True) support Augie Fackler <augie@google.com> parents: 23755 diff changeset	132 clean.append(fn)
b5346480a490 context: use new manifest.diff(clean=True) support Augie Fackler <augie@google.com> parents: 23755 diff changeset	133 continue
b5346480a490 context: use new manifest.diff(clean=True) support Augie Fackler <augie@google.com> parents: 23755 diff changeset	134 (node1, flag1), (node2, flag2) = value
23755 d43948a910a5 context: use manifest.diff() to compute most of status Augie Fackler <augie@google.com> parents: 23731 diff changeset	135 if node1 is None:
d43948a910a5 context: use manifest.diff() to compute most of status Augie Fackler <augie@google.com> parents: 23731 diff changeset	136 added.append(fn)
d43948a910a5 context: use manifest.diff() to compute most of status Augie Fackler <augie@google.com> parents: 23731 diff changeset	137 elif node2 is None:
d43948a910a5 context: use manifest.diff() to compute most of status Augie Fackler <augie@google.com> parents: 23731 diff changeset	138 removed.append(fn)
27749 215b47449e47 context: check for differing flags a little earlier Martin von Zweigbergk <martinvonz@google.com> parents: 27748 diff changeset	139 elif flag1 != flag2:
215b47449e47 context: check for differing flags a little earlier Martin von Zweigbergk <martinvonz@google.com> parents: 27748 diff changeset	140 modified.append(fn)
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	141 elif node2 not in self._repo.nodeconstants.wdirfilenodeids:
27748 81b391a45264 context: clarify why we don't compare file contents when nodeid differs Martin von Zweigbergk <martinvonz@google.com> parents: 27747 diff changeset	142 # When comparing files between two commits, we save time by
81b391a45264 context: clarify why we don't compare file contents when nodeid differs Martin von Zweigbergk <martinvonz@google.com> parents: 27747 diff changeset	143 # not comparing the file contents when the nodeids differ.
81b391a45264 context: clarify why we don't compare file contents when nodeid differs Martin von Zweigbergk <martinvonz@google.com> parents: 27747 diff changeset	144 # Note that this means we incorrectly report a reverted change
81b391a45264 context: clarify why we don't compare file contents when nodeid differs Martin von Zweigbergk <martinvonz@google.com> parents: 27747 diff changeset	145 # to a file as a modification.
27747 54522bbe1597 status: back out changeset 89f49813526c Martin von Zweigbergk <martinvonz@google.com> parents: 27720 diff changeset	146 modified.append(fn)
23755 d43948a910a5 context: use manifest.diff() to compute most of status Augie Fackler <augie@google.com> parents: 23731 diff changeset	147 elif self[fn].cmp(other[fn]):
d43948a910a5 context: use manifest.diff() to compute most of status Augie Fackler <augie@google.com> parents: 23731 diff changeset	148 modified.append(fn)
23731 ccbaa2ed11a4 status: don't list files as both clean and deleted Martin von Zweigbergk <martinvonz@google.com> parents: 23730 diff changeset	149 else:
23757 b5346480a490 context: use new manifest.diff(clean=True) support Augie Fackler <augie@google.com> parents: 23755 diff changeset	150 clean.append(fn)
23755 d43948a910a5 context: use manifest.diff() to compute most of status Augie Fackler <augie@google.com> parents: 23731 diff changeset	151
21971 412ac613fd89 status: explicitly exclude removed file from unknown and ignored Pierre-Yves David <pierre-yves.david@fb.com> parents: 21938 diff changeset	152 if removed:
412ac613fd89 status: explicitly exclude removed file from unknown and ignored Pierre-Yves David <pierre-yves.david@fb.com> parents: 21938 diff changeset	153 # need to filter files if they are already reported as removed
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	154 unknown = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	155 fn
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	156 for fn in unknown
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	157 if fn not in mf1 and (not match or match(fn))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	158 ]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	159 ignored = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	160 fn
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	161 for fn in ignored
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	162 if fn not in mf1 and (not match or match(fn))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	163 ]
23730 4b56219a5ac2 status: don't list files as both removed and deleted Martin von Zweigbergk <martinvonz@google.com> parents: 23712 diff changeset	164 # if they're deleted, don't report them as removed
4b56219a5ac2 status: don't list files as both removed and deleted Martin von Zweigbergk <martinvonz@google.com> parents: 23712 diff changeset	165 removed = [fn for fn in removed if fn not in deletedset]
21471 90aff492dc4a context: add _buildstatus method Sean Farley <sean.michael.farley@gmail.com> parents: 21468 diff changeset	166
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	167 return scmutil.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	168 modified, added, removed, deleted, unknown, ignored, clean
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	169 )
21471 90aff492dc4a context: add _buildstatus method Sean Farley <sean.michael.farley@gmail.com> parents: 21468 diff changeset	170
19549 78155484ae34 basectx: move substate from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19548 diff changeset	171 @propertycache
78155484ae34 basectx: move substate from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19548 diff changeset	172 def substate(self):
36047 55e8efa2451a subrepo: split non-core functions to new module Yuya Nishihara <yuya@tcha.org> parents: 35930 diff changeset	173 return subrepoutil.state(self, self._repo.ui)
19549 78155484ae34 basectx: move substate from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19548 diff changeset	174
21586 8a2637cf1130 basectx: add subrev method to return the rev of a subrepo given a subpath Sean Farley <sean.michael.farley@gmail.com> parents: 21482 diff changeset	175 def subrev(self, subpath):
8a2637cf1130 basectx: add subrev method to return the rev of a subrepo given a subpath Sean Farley <sean.michael.farley@gmail.com> parents: 21482 diff changeset	176 return self.substate[subpath][1]
8a2637cf1130 basectx: add subrev method to return the rev of a subrepo given a subpath Sean Farley <sean.michael.farley@gmail.com> parents: 21482 diff changeset	177
19541 421d49f2f8e2 basectx: move rev from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19540 diff changeset	178 def rev(self):
421d49f2f8e2 basectx: move rev from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19540 diff changeset	179 return self._rev
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	180
19542 bd95621a2d56 basectx: move node from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19541 diff changeset	181 def node(self):
bd95621a2d56 basectx: move node from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19541 diff changeset	182 return self._node
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	183
19543 18f4951222f4 basectx: move hex from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19542 diff changeset	184 def hex(self):
19544 74924fa3236d basectx: change _node to node() in hex Sean Farley <sean.michael.farley@gmail.com> parents: 19543 diff changeset	185 return hex(self.node())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	186
19553 64a99d972b9e basectx: move manifest from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19552 diff changeset	187 def manifest(self):
64a99d972b9e basectx: move manifest from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19552 diff changeset	188 return self._manifest
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	189
30354 362f6f651b2e context: add manifestctx property on changectx Durham Goode <durham@fb.com> parents: 30350 diff changeset	190 def manifestctx(self):
362f6f651b2e context: add manifestctx property on changectx Durham Goode <durham@fb.com> parents: 30350 diff changeset	191 return self._manifestctx
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	192
24300 a07314472a80 context: add a repo accessor Matt Harbison <matt_harbison@yahoo.com> parents: 24227 diff changeset	193 def repo(self):
a07314472a80 context: add a repo accessor Matt Harbison <matt_harbison@yahoo.com> parents: 24227 diff changeset	194 return self._repo
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	195
19554 98f8875f4baa basectx: move phasestr from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19553 diff changeset	196 def phasestr(self):
98f8875f4baa basectx: move phasestr from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19553 diff changeset	197 return phases.phasenames[self.phase()]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	198
19555 613b70fedc4e basectx: move mutable from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19554 diff changeset	199 def mutable(self):
613b70fedc4e basectx: move mutable from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19554 diff changeset	200 return self.phase() > phases.public
19541 421d49f2f8e2 basectx: move rev from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19540 diff changeset	201
44012 e685fac56693 match: resolve filesets against the passed `cwd`, not the current one Matt Harbison <matt_harbison@yahoo.com> parents: 43968 diff changeset	202 def matchfileset(self, cwd, expr, badfn=None):
e685fac56693 match: resolve filesets against the passed `cwd`, not the current one Matt Harbison <matt_harbison@yahoo.com> parents: 43968 diff changeset	203 return fileset.match(self, cwd, expr, badfn=badfn)
20400 f0137d994c83 context: add a getfileset() method so fewer things need fileset directly Augie Fackler <raf@durin42.com> parents: 20292 diff changeset	204
19734 e61c6138fa33 context: move evolution functions from changectx to basectx Sean Farley <sean.michael.farley@gmail.com> parents: 19733 diff changeset	205 def obsolete(self):
e61c6138fa33 context: move evolution functions from changectx to basectx Sean Farley <sean.michael.farley@gmail.com> parents: 19733 diff changeset	206 """True if the changeset is obsolete"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	207 return self.rev() in obsmod.getrevs(self._repo, b'obsolete')
19734 e61c6138fa33 context: move evolution functions from changectx to basectx Sean Farley <sean.michael.farley@gmail.com> parents: 19733 diff changeset	208
e61c6138fa33 context: move evolution functions from changectx to basectx Sean Farley <sean.michael.farley@gmail.com> parents: 19733 diff changeset	209 def extinct(self):
e61c6138fa33 context: move evolution functions from changectx to basectx Sean Farley <sean.michael.farley@gmail.com> parents: 19733 diff changeset	210 """True if the changeset is extinct"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	211 return self.rev() in obsmod.getrevs(self._repo, b'extinct')
19734 e61c6138fa33 context: move evolution functions from changectx to basectx Sean Farley <sean.michael.farley@gmail.com> parents: 19733 diff changeset	212
33753 f163edb45c47 context: rename unstable into orphan Boris Feld <boris.feld@octobus.net> parents: 33752 diff changeset	213 def orphan(self):
39319 f6f52841e1ff context: use new names for unstable changesets in docstrings Anton Shestakov <av6@dwimlabs.net> parents: 39228 diff changeset	214 """True if the changeset is not obsolete, but its ancestor is"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	215 return self.rev() in obsmod.getrevs(self._repo, b'orphan')
19734 e61c6138fa33 context: move evolution functions from changectx to basectx Sean Farley <sean.michael.farley@gmail.com> parents: 19733 diff changeset	216
33755 8413cbeae275 context: rename bumped into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 33754 diff changeset	217 def phasedivergent(self):
39319 f6f52841e1ff context: use new names for unstable changesets in docstrings Anton Shestakov <av6@dwimlabs.net> parents: 39228 diff changeset	218 """True if the changeset tries to be a successor of a public changeset
19734 e61c6138fa33 context: move evolution functions from changectx to basectx Sean Farley <sean.michael.farley@gmail.com> parents: 19733 diff changeset	219
39319 f6f52841e1ff context: use new names for unstable changesets in docstrings Anton Shestakov <av6@dwimlabs.net> parents: 39228 diff changeset	220 Only non-public and non-obsolete changesets may be phase-divergent.
19734 e61c6138fa33 context: move evolution functions from changectx to basectx Sean Farley <sean.michael.farley@gmail.com> parents: 19733 diff changeset	221 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	222 return self.rev() in obsmod.getrevs(self._repo, b'phasedivergent')
19734 e61c6138fa33 context: move evolution functions from changectx to basectx Sean Farley <sean.michael.farley@gmail.com> parents: 19733 diff changeset	223
33754 8b2d7684407b context: rename divergent into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 33753 diff changeset	224 def contentdivergent(self):
39319 f6f52841e1ff context: use new names for unstable changesets in docstrings Anton Shestakov <av6@dwimlabs.net> parents: 39228 diff changeset	225 """Is a successor of a changeset with multiple possible successor sets
19734 e61c6138fa33 context: move evolution functions from changectx to basectx Sean Farley <sean.michael.farley@gmail.com> parents: 19733 diff changeset	226
39319 f6f52841e1ff context: use new names for unstable changesets in docstrings Anton Shestakov <av6@dwimlabs.net> parents: 39228 diff changeset	227 Only non-public and non-obsolete changesets may be content-divergent.
19734 e61c6138fa33 context: move evolution functions from changectx to basectx Sean Farley <sean.michael.farley@gmail.com> parents: 19733 diff changeset	228 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	229 return self.rev() in obsmod.getrevs(self._repo, b'contentdivergent')
19734 e61c6138fa33 context: move evolution functions from changectx to basectx Sean Farley <sean.michael.farley@gmail.com> parents: 19733 diff changeset	230
33756 52c5ff856b49 context: rename troubled into isunstable Boris Feld <boris.feld@octobus.net> parents: 33755 diff changeset	231 def isunstable(self):
39319 f6f52841e1ff context: use new names for unstable changesets in docstrings Anton Shestakov <av6@dwimlabs.net> parents: 39228 diff changeset	232 """True if the changeset is either orphan, phase-divergent or
f6f52841e1ff context: use new names for unstable changesets in docstrings Anton Shestakov <av6@dwimlabs.net> parents: 39228 diff changeset	233 content-divergent"""
33755 8413cbeae275 context: rename bumped into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 33754 diff changeset	234 return self.orphan() or self.phasedivergent() or self.contentdivergent()
19734 e61c6138fa33 context: move evolution functions from changectx to basectx Sean Farley <sean.michael.farley@gmail.com> parents: 19733 diff changeset	235
33752 ab0c55c2ad9a context: rename troubles into instabilities Boris Feld <boris.feld@octobus.net> parents: 33715 diff changeset	236 def instabilities(self):
ab0c55c2ad9a context: rename troubles into instabilities Boris Feld <boris.feld@octobus.net> parents: 33715 diff changeset	237 """return the list of instabilities affecting this changeset.
ab0c55c2ad9a context: rename troubles into instabilities Boris Feld <boris.feld@octobus.net> parents: 33715 diff changeset	238
ab0c55c2ad9a context: rename troubles into instabilities Boris Feld <boris.feld@octobus.net> parents: 33715 diff changeset	239 Instabilities are returned as strings. possible values are:
33695 03039ff3082b evolution: rename unstable to orphan Boris Feld <boris.feld@octobus.net> parents: 33501 diff changeset	240 - orphan,
33715 9c27a2891b75 evolution: rename bumped to phase-divergent Boris Feld <boris.feld@octobus.net> parents: 33714 diff changeset	241 - phase-divergent,
33714 2194a8723138 evolution: rename divergent to content-divergent Boris Feld <boris.feld@octobus.net> parents: 33695 diff changeset	242 - content-divergent.
19734 e61c6138fa33 context: move evolution functions from changectx to basectx Sean Farley <sean.michael.farley@gmail.com> parents: 19733 diff changeset	243 """
33752 ab0c55c2ad9a context: rename troubles into instabilities Boris Feld <boris.feld@octobus.net> parents: 33715 diff changeset	244 instabilities = []
33753 f163edb45c47 context: rename unstable into orphan Boris Feld <boris.feld@octobus.net> parents: 33752 diff changeset	245 if self.orphan():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	246 instabilities.append(b'orphan')
33755 8413cbeae275 context: rename bumped into phasedivergent Boris Feld <boris.feld@octobus.net> parents: 33754 diff changeset	247 if self.phasedivergent():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	248 instabilities.append(b'phase-divergent')
33754 8b2d7684407b context: rename divergent into contentdivergent Boris Feld <boris.feld@octobus.net> parents: 33753 diff changeset	249 if self.contentdivergent():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	250 instabilities.append(b'content-divergent')
33752 ab0c55c2ad9a context: rename troubles into instabilities Boris Feld <boris.feld@octobus.net> parents: 33715 diff changeset	251 return instabilities
19734 e61c6138fa33 context: move evolution functions from changectx to basectx Sean Farley <sean.michael.farley@gmail.com> parents: 19733 diff changeset	252
19556 732ee7fff35a basectx: move parents from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19555 diff changeset	253 def parents(self):
732ee7fff35a basectx: move parents from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19555 diff changeset	254 """return contexts for each parent changeset"""
732ee7fff35a basectx: move parents from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19555 diff changeset	255 return self._parents
732ee7fff35a basectx: move parents from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19555 diff changeset	256
19557 9f57ebf0cce8 basectx: move p1 from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19556 diff changeset	257 def p1(self):
9f57ebf0cce8 basectx: move p1 from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19556 diff changeset	258 return self._parents[0]
9f57ebf0cce8 basectx: move p1 from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19556 diff changeset	259
19558 d0448e9d4554 basectx: move p2 from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19557 diff changeset	260 def p2(self):
27064 a29db426c5ba context: avoid extra parents lookups Gregory Szorc <gregory.szorc@gmail.com> parents: 27063 diff changeset	261 parents = self._parents
a29db426c5ba context: avoid extra parents lookups Gregory Szorc <gregory.szorc@gmail.com> parents: 27063 diff changeset	262 if len(parents) == 2:
a29db426c5ba context: avoid extra parents lookups Gregory Szorc <gregory.szorc@gmail.com> parents: 27063 diff changeset	263 return parents[1]
39958 e1e3d1b498d3 context: reduce dependence of changectx constructor Martin von Zweigbergk <martinvonz@google.com> parents: 39912 diff changeset	264 return self._repo[nullrev]
19558 d0448e9d4554 basectx: move p2 from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19557 diff changeset	265
19559 80ad9fe22e18 basectx: move _fileinfo from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19558 diff changeset	266 def _fileinfo(self, path):
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43551 diff changeset	267 if '_manifest' in self.__dict__:
19559 80ad9fe22e18 basectx: move _fileinfo from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19558 diff changeset	268 try:
44388 2e2cfc3bea0b context: use manifest.find() instead of two separate calls Augie Fackler <augie@google.com> parents: 44310 diff changeset	269 return self._manifest.find(path)
19559 80ad9fe22e18 basectx: move _fileinfo from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19558 diff changeset	270 except KeyError:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	271 raise error.ManifestLookupError(
45500 a108f7ff7778 py3: don't risk passing a None value to error.ManifestLookupError() Martin von Zweigbergk <martinvonz@google.com> parents: 45199 diff changeset	272 self._node or b'None', path, _(b'not found in manifest')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	273 )
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43551 diff changeset	274 if '_manifestdelta' in self.__dict__ or path in self.files():
19559 80ad9fe22e18 basectx: move _fileinfo from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19558 diff changeset	275 if path in self._manifestdelta:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	276 return (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	277 self._manifestdelta[path],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	278 self._manifestdelta.flags(path),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	279 )
30350 608ba935e041 manifest: remove manifest.find Durham Goode <durham@fb.com> parents: 30289 diff changeset	280 mfl = self._repo.manifestlog
608ba935e041 manifest: remove manifest.find Durham Goode <durham@fb.com> parents: 30289 diff changeset	281 try:
608ba935e041 manifest: remove manifest.find Durham Goode <durham@fb.com> parents: 30289 diff changeset	282 node, flag = mfl[self._changeset.manifest].find(path)
608ba935e041 manifest: remove manifest.find Durham Goode <durham@fb.com> parents: 30289 diff changeset	283 except KeyError:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	284 raise error.ManifestLookupError(
45500 a108f7ff7778 py3: don't risk passing a None value to error.ManifestLookupError() Martin von Zweigbergk <martinvonz@google.com> parents: 45199 diff changeset	285 self._node or b'None', path, _(b'not found in manifest')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	286 )
19559 80ad9fe22e18 basectx: move _fileinfo from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19558 diff changeset	287
80ad9fe22e18 basectx: move _fileinfo from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19558 diff changeset	288 return node, flag
80ad9fe22e18 basectx: move _fileinfo from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19558 diff changeset	289
19560 f256e1108053 basectx: move filenode from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19559 diff changeset	290 def filenode(self, path):
f256e1108053 basectx: move filenode from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19559 diff changeset	291 return self._fileinfo(path)[0]
f256e1108053 basectx: move filenode from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19559 diff changeset	292
19561 7806e63598b0 basectx: move flags from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19560 diff changeset	293 def flags(self, path):
7806e63598b0 basectx: move flags from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19560 diff changeset	294 try:
7806e63598b0 basectx: move flags from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19560 diff changeset	295 return self._fileinfo(path)[1]
7806e63598b0 basectx: move flags from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19560 diff changeset	296 except error.LookupError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	297 return b''
19561 7806e63598b0 basectx: move flags from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19560 diff changeset	298
42318 a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	299 @propertycache
a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	300 def _copies(self):
44981 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44975 diff changeset	301 return metadata.computechangesetcopies(self)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	302
42318 a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	303 def p1copies(self):
a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	304 return self._copies[0]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	305
42318 a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	306 def p2copies(self):
a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	307 return self._copies[1]
a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	308
29021 92d37fb3f1aa verify: don't init subrepo when missing one is referenced (issue5128) (API) Matt Harbison <matt_harbison@yahoo.com> parents: 28488 diff changeset	309 def sub(self, path, allowcreate=True):
25600 70ac1868b707 subrepo: allow a representation of the working directory subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 25590 diff changeset	310 '''return a subrepo for the stored revision of path, never wdir()'''
29021 92d37fb3f1aa verify: don't init subrepo when missing one is referenced (issue5128) (API) Matt Harbison <matt_harbison@yahoo.com> parents: 28488 diff changeset	311 return subrepo.subrepo(self, path, allowcreate=allowcreate)
19562 389d7767630d basectx: move sub from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19561 diff changeset	312
25417 95c271356a66 context: introduce the nullsub() method Matt Harbison <matt_harbison@yahoo.com> parents: 25303 diff changeset	313 def nullsub(self, path, pctx):
95c271356a66 context: introduce the nullsub() method Matt Harbison <matt_harbison@yahoo.com> parents: 25303 diff changeset	314 return subrepo.nullsubrepo(self, path, pctx)
95c271356a66 context: introduce the nullsub() method Matt Harbison <matt_harbison@yahoo.com> parents: 25303 diff changeset	315
25600 70ac1868b707 subrepo: allow a representation of the working directory subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 25590 diff changeset	316 def workingsub(self, path):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45911 diff changeset	317 """return a subrepo for the stored revision, or wdir if this is a wdir
25600 70ac1868b707 subrepo: allow a representation of the working directory subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 25590 diff changeset	318 context.
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45911 diff changeset	319 """
25600 70ac1868b707 subrepo: allow a representation of the working directory subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 25590 diff changeset	320 return subrepo.subrepo(self, path, allowwdir=True)
70ac1868b707 subrepo: allow a representation of the working directory subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 25590 diff changeset	321
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	322 def match(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	323 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	324 pats=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	325 include=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	326 exclude=None,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	327 default=b'glob',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	328 listsubrepos=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	329 badfn=None,
44012 e685fac56693 match: resolve filesets against the passed `cwd`, not the current one Matt Harbison <matt_harbison@yahoo.com> parents: 43968 diff changeset	330 cwd=None,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	331 ):
19563 87503cd824fa basectx: move match from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19562 diff changeset	332 r = self._repo
44012 e685fac56693 match: resolve filesets against the passed `cwd`, not the current one Matt Harbison <matt_harbison@yahoo.com> parents: 43968 diff changeset	333 if not cwd:
e685fac56693 match: resolve filesets against the passed `cwd`, not the current one Matt Harbison <matt_harbison@yahoo.com> parents: 43968 diff changeset	334 cwd = r.getcwd()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	335 return matchmod.match(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	336 r.root,
44012 e685fac56693 match: resolve filesets against the passed `cwd`, not the current one Matt Harbison <matt_harbison@yahoo.com> parents: 43968 diff changeset	337 cwd,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	338 pats,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	339 include,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	340 exclude,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	341 default,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	342 auditor=r.nofsauditor,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	343 ctx=self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	344 listsubrepos=listsubrepos,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	345 badfn=badfn,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	346 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	347
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	348 def diff(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	349 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	350 ctx2=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	351 match=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	352 changes=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	353 opts=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	354 losedatafn=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	355 pathfn=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	356 copy=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	357 copysourcematch=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	358 hunksfilterfn=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	359 ):
19564 f0ed47b73d37 basectx: move diff from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19563 diff changeset	360 """Returns a diff generator for the given contexts and matcher"""
f0ed47b73d37 basectx: move diff from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19563 diff changeset	361 if ctx2 is None:
f0ed47b73d37 basectx: move diff from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19563 diff changeset	362 ctx2 = self.p1()
19568 f58235d85d6b basectx: remove unnecessary check of instance Sean Farley <sean.michael.farley@gmail.com> parents: 19567 diff changeset	363 if ctx2 is not None:
19564 f0ed47b73d37 basectx: move diff from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19563 diff changeset	364 ctx2 = self._repo[ctx2]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	365 return patch.diff(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	366 self._repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	367 ctx2,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	368 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	369 match=match,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	370 changes=changes,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	371 opts=opts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	372 losedatafn=losedatafn,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	373 pathfn=pathfn,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	374 copy=copy,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	375 copysourcematch=copysourcematch,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	376 hunksfilterfn=hunksfilterfn,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	377 )
19564 f0ed47b73d37 basectx: move diff from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19563 diff changeset	378
24323 4c7c6beade1a manifest: have context's dirs() call its manifest's dirs() Drew Gottlieb <drgott@google.com> parents: 24306 diff changeset	379 def dirs(self):
4c7c6beade1a manifest: have context's dirs() call its manifest's dirs() Drew Gottlieb <drgott@google.com> parents: 24306 diff changeset	380 return self._manifest.dirs()
19565 bd1580a9c133 basectx: move _dirs from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19564 diff changeset	381
24325 79d9c51488ca manifest: add hasdir() to context Drew Gottlieb <drgott@google.com> parents: 24323 diff changeset	382 def hasdir(self, dir):
79d9c51488ca manifest: add hasdir() to context Drew Gottlieb <drgott@google.com> parents: 24323 diff changeset	383 return self._manifest.hasdir(dir)
19566 54817c774d38 basectx: move dirs from changectx Sean Farley <sean.michael.farley@gmail.com> parents: 19565 diff changeset	384
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	385 def status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	386 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	387 other=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	388 match=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	389 listignored=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	390 listclean=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	391 listunknown=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	392 listsubrepos=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	393 ):
21594 9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	394 """return status of files between two nodes or node and working
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	395 directory.
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	396
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	397 If other is None, compare this node with working directory.
21722 ee29b0bb1619 status: document the content of the returned tuple in the docstring Pierre-Yves David <pierre-yves.david@fb.com> parents: 21718 diff changeset	398
45911 e359af6517ce context: small update to ctx.status doc Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45510 diff changeset	399 ctx1.status(ctx2) returns the status of change from ctx1 to ctx2
e359af6517ce context: small update to ctx.status doc Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45510 diff changeset	400
e359af6517ce context: small update to ctx.status doc Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45510 diff changeset	401 Returns a mercurial.scmutils.status object.
e359af6517ce context: small update to ctx.status doc Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45510 diff changeset	402
e359af6517ce context: small update to ctx.status doc Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45510 diff changeset	403 Data can be accessed using either tuple notation:
e359af6517ce context: small update to ctx.status doc Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45510 diff changeset	404
e359af6517ce context: small update to ctx.status doc Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45510 diff changeset	405 (modified, added, removed, deleted, unknown, ignored, clean)
e359af6517ce context: small update to ctx.status doc Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45510 diff changeset	406
e359af6517ce context: small update to ctx.status doc Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45510 diff changeset	407 or direct attribute access:
e359af6517ce context: small update to ctx.status doc Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45510 diff changeset	408
e359af6517ce context: small update to ctx.status doc Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45510 diff changeset	409 s.modified, s.added, ...
21594 9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	410 """
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	411
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	412 ctx1 = self
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	413 ctx2 = self._repo[other]
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	414
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	415 # This next code block is, admittedly, fragile logic that tests for
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	416 # reversing the contexts and wouldn't need to exist if it weren't for
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	417 # the fast (and common) code path of comparing the working directory
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	418 # with its first parent.
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	419 #
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	420 # What we're aiming for here is the ability to call:
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	421 #
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	422 # workingctx.status(parentctx)
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	423 #
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	424 # If we always built the manifest for each context and compared those,
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	425 # then we'd be done. But the special case of the above call means we
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	426 # just copy the manifest of the parent.
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	427 reversed = False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	428 if not isinstance(ctx1, changectx) and isinstance(ctx2, changectx):
21594 9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	429 reversed = True
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	430 ctx1, ctx2 = ctx2, ctx1
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	431
40084 48a0ce67d67a status: intersect matcher with narrow matcher instead of filtering afterwards Martin von Zweigbergk <martinvonz@google.com> parents: 40063 diff changeset	432 match = self._repo.narrowmatch(match)
23237 98f41a2f8fba context.status: remove unused arguments from _matchstatus() Martin von Zweigbergk <martinvonz@gmail.com> parents: 23236 diff changeset	433 match = ctx2._matchstatus(ctx1, match)
23304 dd3f857598a0 context.status: pass status tuple into _buildstatus Martin von Zweigbergk <martinvonz@google.com> parents: 23303 diff changeset	434 r = scmutil.status([], [], [], [], [], [], [])
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	435 r = ctx2._buildstatus(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	436 ctx1, r, match, listignored, listclean, listunknown
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	437 )
21594 9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	438
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	439 if reversed:
23301 c10dc5568069 context.status: wipe deleted/unknown/ignored fields when reversed Martin von Zweigbergk <martinvonz@google.com> parents: 23257 diff changeset	440 # Reverse added and removed. Clear deleted, unknown and ignored as
c10dc5568069 context.status: wipe deleted/unknown/ignored fields when reversed Martin von Zweigbergk <martinvonz@google.com> parents: 23257 diff changeset	441 # these make no sense to reverse.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	442 r = scmutil.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	443 r.modified, r.removed, r.added, [], [], [], r.clean
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	444 )
21594 9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	445
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	446 if listsubrepos:
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	447 for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	448 try:
27183 0945539a3a6b extdiff: correctly handle deleted subrepositories (issue3153) Andrew Zwicky <andrew.zwicky@gmail.com> parents: 27064 diff changeset	449 rev2 = ctx2.subrev(subpath)
0945539a3a6b extdiff: correctly handle deleted subrepositories (issue3153) Andrew Zwicky <andrew.zwicky@gmail.com> parents: 27064 diff changeset	450 except KeyError:
0945539a3a6b extdiff: correctly handle deleted subrepositories (issue3153) Andrew Zwicky <andrew.zwicky@gmail.com> parents: 27064 diff changeset	451 # A subrepo that existed in node1 was deleted between
0945539a3a6b extdiff: correctly handle deleted subrepositories (issue3153) Andrew Zwicky <andrew.zwicky@gmail.com> parents: 27064 diff changeset	452 # node1 and node2 (inclusive). Thus, ctx2's substate
0945539a3a6b extdiff: correctly handle deleted subrepositories (issue3153) Andrew Zwicky <andrew.zwicky@gmail.com> parents: 27064 diff changeset	453 # won't contain that subpath. The best we can do ignore it.
0945539a3a6b extdiff: correctly handle deleted subrepositories (issue3153) Andrew Zwicky <andrew.zwicky@gmail.com> parents: 27064 diff changeset	454 rev2 = None
28017 d3f1b7ee5e70 match: rename "narrowmatcher" to "subdirmatcher" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 27983 diff changeset	455 submatch = matchmod.subdirmatcher(subpath, match)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	456 s = sub.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	457 rev2,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	458 match=submatch,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	459 ignored=listignored,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	460 clean=listclean,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	461 unknown=listunknown,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	462 listsubrepos=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	463 )
43691 e035a8f71d52 context: use field names instead of field numbers on scmutil.status Augie Fackler <augie@google.com> parents: 43677 diff changeset	464 for k in (
e035a8f71d52 context: use field names instead of field numbers on scmutil.status Augie Fackler <augie@google.com> parents: 43677 diff changeset	465 'modified',
e035a8f71d52 context: use field names instead of field numbers on scmutil.status Augie Fackler <augie@google.com> parents: 43677 diff changeset	466 'added',
e035a8f71d52 context: use field names instead of field numbers on scmutil.status Augie Fackler <augie@google.com> parents: 43677 diff changeset	467 'removed',
e035a8f71d52 context: use field names instead of field numbers on scmutil.status Augie Fackler <augie@google.com> parents: 43677 diff changeset	468 'deleted',
e035a8f71d52 context: use field names instead of field numbers on scmutil.status Augie Fackler <augie@google.com> parents: 43677 diff changeset	469 'unknown',
e035a8f71d52 context: use field names instead of field numbers on scmutil.status Augie Fackler <augie@google.com> parents: 43677 diff changeset	470 'ignored',
e035a8f71d52 context: use field names instead of field numbers on scmutil.status Augie Fackler <augie@google.com> parents: 43677 diff changeset	471 'clean',
e035a8f71d52 context: use field names instead of field numbers on scmutil.status Augie Fackler <augie@google.com> parents: 43677 diff changeset	472 ):
e035a8f71d52 context: use field names instead of field numbers on scmutil.status Augie Fackler <augie@google.com> parents: 43677 diff changeset	473 rfiles, sfiles = getattr(r, k), getattr(s, k)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	474 rfiles.extend(b"%s/%s" % (subpath, f) for f in sfiles)
21594 9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	475
43691 e035a8f71d52 context: use field names instead of field numbers on scmutil.status Augie Fackler <augie@google.com> parents: 43677 diff changeset	476 r.modified.sort()
e035a8f71d52 context: use field names instead of field numbers on scmutil.status Augie Fackler <augie@google.com> parents: 43677 diff changeset	477 r.added.sort()
e035a8f71d52 context: use field names instead of field numbers on scmutil.status Augie Fackler <augie@google.com> parents: 43677 diff changeset	478 r.removed.sort()
e035a8f71d52 context: use field names instead of field numbers on scmutil.status Augie Fackler <augie@google.com> parents: 43677 diff changeset	479 r.deleted.sort()
e035a8f71d52 context: use field names instead of field numbers on scmutil.status Augie Fackler <augie@google.com> parents: 43677 diff changeset	480 r.unknown.sort()
e035a8f71d52 context: use field names instead of field numbers on scmutil.status Augie Fackler <augie@google.com> parents: 43677 diff changeset	481 r.ignored.sort()
e035a8f71d52 context: use field names instead of field numbers on scmutil.status Augie Fackler <augie@google.com> parents: 43677 diff changeset	482 r.clean.sort()
21616 0a8e7f81e8ae context: explicitly return a tuple Sean Farley <sean.michael.farley@gmail.com> parents: 21595 diff changeset	483
23301 c10dc5568069 context.status: wipe deleted/unknown/ignored fields when reversed Martin von Zweigbergk <martinvonz@google.com> parents: 23257 diff changeset	484 return r
21594 9e4567829129 basectx: copy localrepo.status method Sean Farley <sean.michael.farley@gmail.com> parents: 21593 diff changeset	485
44916 e607099d8b93 context: implement mergestate() method Augie Fackler <augie@google.com> parents: 44399 diff changeset	486 def mergestate(self, clean=False):
e607099d8b93 context: implement mergestate() method Augie Fackler <augie@google.com> parents: 44399 diff changeset	487 """Get a mergestate object for this context."""
e607099d8b93 context: implement mergestate() method Augie Fackler <augie@google.com> parents: 44399 diff changeset	488 raise NotImplementedError(
e607099d8b93 context: implement mergestate() method Augie Fackler <augie@google.com> parents: 44399 diff changeset	489 '%s does not implement mergestate()' % self.__class__
e607099d8b93 context: implement mergestate() method Augie Fackler <augie@google.com> parents: 44399 diff changeset	490 )
e607099d8b93 context: implement mergestate() method Augie Fackler <augie@google.com> parents: 44399 diff changeset	491
45089 3e40abe0a170 commit: factor out empty commit check to `basectx.isempty()` Manuel Jacob <me@manueljacob.de> parents: 45088 diff changeset	492 def isempty(self):
3e40abe0a170 commit: factor out empty commit check to `basectx.isempty()` Manuel Jacob <me@manueljacob.de> parents: 45088 diff changeset	493 return not (
3e40abe0a170 commit: factor out empty commit check to `basectx.isempty()` Manuel Jacob <me@manueljacob.de> parents: 45088 diff changeset	494 len(self.parents()) > 1
3e40abe0a170 commit: factor out empty commit check to `basectx.isempty()` Manuel Jacob <me@manueljacob.de> parents: 45088 diff changeset	495 or self.branch() != self.p1().branch()
3e40abe0a170 commit: factor out empty commit check to `basectx.isempty()` Manuel Jacob <me@manueljacob.de> parents: 45088 diff changeset	496 or self.closesbranch()
3e40abe0a170 commit: factor out empty commit check to `basectx.isempty()` Manuel Jacob <me@manueljacob.de> parents: 45088 diff changeset	497 or self.files()
3e40abe0a170 commit: factor out empty commit check to `basectx.isempty()` Manuel Jacob <me@manueljacob.de> parents: 45088 diff changeset	498 )
3e40abe0a170 commit: factor out empty commit check to `basectx.isempty()` Manuel Jacob <me@manueljacob.de> parents: 45088 diff changeset	499
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	500
19537 6e3e8575276d basectx: add an empty class that will be used as a parent of all contexts Sean Farley <sean.michael.farley@gmail.com> parents: 19314 diff changeset	501 class changectx(basectx):
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	502 """A changecontext object makes access to data related to a particular
19951 d51c4d85ec23 spelling: random spell checker fixes Mads Kiilerich <madski@unity3d.com> parents: 19902 diff changeset	503 changeset convenient. It represents a read-only context already present in
19537 6e3e8575276d basectx: add an empty class that will be used as a parent of all contexts Sean Farley <sean.michael.farley@gmail.com> parents: 19314 diff changeset	504 the repo."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	505
43780 1e87851dba63 changectx: add a "maybe filtered" filtered attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43691 diff changeset	506 def __init__(self, repo, rev, node, maybe_filtered=True):
37177 fbe34945220d context: set repo property in basectx Martin von Zweigbergk <martinvonz@google.com> parents: 37176 diff changeset	507 super(changectx, self).__init__(repo)
39959 3d35304bd09b context: move logic from changectx.__init__ to localrepo.__getitem__ (API) Martin von Zweigbergk <martinvonz@google.com> parents: 39958 diff changeset	508 self._rev = rev
3d35304bd09b context: move logic from changectx.__init__ to localrepo.__getitem__ (API) Martin von Zweigbergk <martinvonz@google.com> parents: 39958 diff changeset	509 self._node = node
43780 1e87851dba63 changectx: add a "maybe filtered" filtered attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43691 diff changeset	510 # When maybe_filtered is True, the revision might be affected by
1e87851dba63 changectx: add a "maybe filtered" filtered attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43691 diff changeset	511 # changelog filtering and operation through the filtered changelog must be used.
1e87851dba63 changectx: add a "maybe filtered" filtered attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43691 diff changeset	512 #
1e87851dba63 changectx: add a "maybe filtered" filtered attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43691 diff changeset	513 # When maybe_filtered is False, the revision has already been checked
1e87851dba63 changectx: add a "maybe filtered" filtered attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43691 diff changeset	514 # against filtering and is not filtered. Operation through the
1e87851dba63 changectx: add a "maybe filtered" filtered attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43691 diff changeset	515 # unfiltered changelog might be used in some case.
1e87851dba63 changectx: add a "maybe filtered" filtered attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43691 diff changeset	516 self._maybe_filtered = maybe_filtered
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	517
6469 fb502719c75c python 2.6 compatibility: add __hash__ to classes that have __eq__ Paul Moore <p.f.moore@gmail.com> parents: 6286 diff changeset	518 def __hash__(self):
fb502719c75c python 2.6 compatibility: add __hash__ to classes that have __eq__ Paul Moore <p.f.moore@gmail.com> parents: 6286 diff changeset	519 try:
fb502719c75c python 2.6 compatibility: add __hash__ to classes that have __eq__ Paul Moore <p.f.moore@gmail.com> parents: 6286 diff changeset	520 return hash(self._rev)
fb502719c75c python 2.6 compatibility: add __hash__ to classes that have __eq__ Paul Moore <p.f.moore@gmail.com> parents: 6286 diff changeset	521 except AttributeError:
fb502719c75c python 2.6 compatibility: add __hash__ to classes that have __eq__ Paul Moore <p.f.moore@gmail.com> parents: 6286 diff changeset	522 return id(self)
fb502719c75c python 2.6 compatibility: add __hash__ to classes that have __eq__ Paul Moore <p.f.moore@gmail.com> parents: 6286 diff changeset	523
3168 05c588e1803d context: add __nonzero__ methods Matt Mackall <mpm@selenic.com> parents: 3166 diff changeset	524 def __nonzero__(self):
3578 3b4e00cba57a Define and use nullrev (revision of nullid) instead of -1. Thomas Arendsen Hein <thomas@intevation.de> parents: 3454 diff changeset	525 return self._rev != nullrev
3168 05c588e1803d context: add __nonzero__ methods Matt Mackall <mpm@selenic.com> parents: 3166 diff changeset	526
31483 413b44003462 py3: add __bool__ to every class defining __nonzero__ Gregory Szorc <gregory.szorc@gmail.com> parents: 31473 diff changeset	527 __bool__ = __nonzero__
413b44003462 py3: add __bool__ to every class defining __nonzero__ Gregory Szorc <gregory.szorc@gmail.com> parents: 31473 diff changeset	528
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	529 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	530 def _changeset(self):
43780 1e87851dba63 changectx: add a "maybe filtered" filtered attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43691 diff changeset	531 if self._maybe_filtered:
1e87851dba63 changectx: add a "maybe filtered" filtered attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43691 diff changeset	532 repo = self._repo
1e87851dba63 changectx: add a "maybe filtered" filtered attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43691 diff changeset	533 else:
1e87851dba63 changectx: add a "maybe filtered" filtered attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43691 diff changeset	534 repo = self._repo.unfiltered()
1e87851dba63 changectx: add a "maybe filtered" filtered attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43691 diff changeset	535 return repo.changelog.changelogrevision(self.rev())
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	536
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	537 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	538 def _manifest(self):
30354 362f6f651b2e context: add manifestctx property on changectx Durham Goode <durham@fb.com> parents: 30350 diff changeset	539 return self._manifestctx.read()
362f6f651b2e context: add manifestctx property on changectx Durham Goode <durham@fb.com> parents: 30350 diff changeset	540
32552 6ae068f801e3 context: do not cache manifestctx Jun Wu <quark@fb.com> parents: 32519 diff changeset	541 @property
30354 362f6f651b2e context: add manifestctx property on changectx Durham Goode <durham@fb.com> parents: 30350 diff changeset	542 def _manifestctx(self):
362f6f651b2e context: add manifestctx property on changectx Durham Goode <durham@fb.com> parents: 30350 diff changeset	543 return self._repo.manifestlog[self._changeset.manifest]
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	544
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	545 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	546 def _manifestdelta(self):
30354 362f6f651b2e context: add manifestctx property on changectx Durham Goode <durham@fb.com> parents: 30350 diff changeset	547 return self._manifestctx.readdelta()
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	548
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	549 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	550 def _parents(self):
27063 37e1fdcb271c context: optimize _parents() Gregory Szorc <gregory.szorc@gmail.com> parents: 27016 diff changeset	551 repo = self._repo
43784 f9068413bd0c changectx: use unfiltered changelog to access parents of unfiltered revs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43780 diff changeset	552 if self._maybe_filtered:
f9068413bd0c changectx: use unfiltered changelog to access parents of unfiltered revs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43780 diff changeset	553 cl = repo.changelog
f9068413bd0c changectx: use unfiltered changelog to access parents of unfiltered revs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43780 diff changeset	554 else:
f9068413bd0c changectx: use unfiltered changelog to access parents of unfiltered revs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43780 diff changeset	555 cl = repo.unfiltered().changelog
f9068413bd0c changectx: use unfiltered changelog to access parents of unfiltered revs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43780 diff changeset	556
f9068413bd0c changectx: use unfiltered changelog to access parents of unfiltered revs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43780 diff changeset	557 p1, p2 = cl.parentrevs(self._rev)
27063 37e1fdcb271c context: optimize _parents() Gregory Szorc <gregory.szorc@gmail.com> parents: 27016 diff changeset	558 if p2 == nullrev:
44109 98349eddceef changectx: mark parent of changesets as non filtered Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44108 diff changeset	559 return [changectx(repo, p1, cl.node(p1), maybe_filtered=False)]
98349eddceef changectx: mark parent of changesets as non filtered Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44108 diff changeset	560 return [
98349eddceef changectx: mark parent of changesets as non filtered Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44108 diff changeset	561 changectx(repo, p1, cl.node(p1), maybe_filtered=False),
98349eddceef changectx: mark parent of changesets as non filtered Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44108 diff changeset	562 changectx(repo, p2, cl.node(p2), maybe_filtered=False),
98349eddceef changectx: mark parent of changesets as non filtered Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44108 diff changeset	563 ]
3215 931288cf58a7 contexts: use __getattr__ rather than try/except in changectx Matt Mackall <mpm@selenic.com> parents: 3214 diff changeset	564
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	565 def changeset(self):
28488 437c32dcec7d context: use changelogrevision Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	566 c = self._changeset
437c32dcec7d context: use changelogrevision Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	567 return (
437c32dcec7d context: use changelogrevision Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	568 c.manifest,
437c32dcec7d context: use changelogrevision Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	569 c.user,
437c32dcec7d context: use changelogrevision Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	570 c.date,
437c32dcec7d context: use changelogrevision Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	571 c.files,
437c32dcec7d context: use changelogrevision Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	572 c.description,
437c32dcec7d context: use changelogrevision Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	573 c.extra,
437c32dcec7d context: use changelogrevision Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	574 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	575
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	576 def manifestnode(self):
28488 437c32dcec7d context: use changelogrevision Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	577 return self._changeset.manifest
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	578
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	579 def user(self):
28488 437c32dcec7d context: use changelogrevision Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	580 return self._changeset.user
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	581
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	582 def date(self):
28488 437c32dcec7d context: use changelogrevision Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	583 return self._changeset.date
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	584
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	585 def files(self):
28488 437c32dcec7d context: use changelogrevision Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	586 return self._changeset.files
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	587
42396 65fa61ca20af context: add ctx.files{modified,added,removed}() methods Martin von Zweigbergk <martinvonz@google.com> parents: 42345 diff changeset	588 def filesmodified(self):
65fa61ca20af context: add ctx.files{modified,added,removed}() methods Martin von Zweigbergk <martinvonz@google.com> parents: 42345 diff changeset	589 modified = set(self.files())
65fa61ca20af context: add ctx.files{modified,added,removed}() methods Martin von Zweigbergk <martinvonz@google.com> parents: 42345 diff changeset	590 modified.difference_update(self.filesadded())
65fa61ca20af context: add ctx.files{modified,added,removed}() methods Martin von Zweigbergk <martinvonz@google.com> parents: 42345 diff changeset	591 modified.difference_update(self.filesremoved())
65fa61ca20af context: add ctx.files{modified,added,removed}() methods Martin von Zweigbergk <martinvonz@google.com> parents: 42345 diff changeset	592 return sorted(modified)
43023 008e74b34fb7 context: clarify the various mode in the filesadded method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42865 diff changeset	593
42396 65fa61ca20af context: add ctx.files{modified,added,removed}() methods Martin von Zweigbergk <martinvonz@google.com> parents: 42345 diff changeset	594 def filesadded(self):
43023 008e74b34fb7 context: clarify the various mode in the filesadded method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42865 diff changeset	595 filesadded = self._changeset.filesadded
43146 0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	596 compute_on_none = True
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	597 if self._repo.filecopiesmode == b'changeset-sidedata':
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	598 compute_on_none = False
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	599 else:
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	600 source = self._repo.ui.config(b'experimental', b'copies.read-from')
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	601 if source == b'changeset-only':
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	602 compute_on_none = False
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	603 elif source != b'compatibility':
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	604 # filelog mode, ignore any changelog content
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	605 filesadded = None
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	606 if filesadded is None:
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	607 if compute_on_none:
44981 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44975 diff changeset	608 filesadded = metadata.computechangesetfilesadded(self)
43146 0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	609 else:
43023 008e74b34fb7 context: clarify the various mode in the filesadded method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42865 diff changeset	610 filesadded = []
008e74b34fb7 context: clarify the various mode in the filesadded method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42865 diff changeset	611 return filesadded
008e74b34fb7 context: clarify the various mode in the filesadded method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42865 diff changeset	612
42396 65fa61ca20af context: add ctx.files{modified,added,removed}() methods Martin von Zweigbergk <martinvonz@google.com> parents: 42345 diff changeset	613 def filesremoved(self):
43024 15badd621825 context: clarify the various mode in the filesremoved method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43023 diff changeset	614 filesremoved = self._changeset.filesremoved
43146 0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	615 compute_on_none = True
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	616 if self._repo.filecopiesmode == b'changeset-sidedata':
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	617 compute_on_none = False
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	618 else:
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	619 source = self._repo.ui.config(b'experimental', b'copies.read-from')
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	620 if source == b'changeset-only':
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	621 compute_on_none = False
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	622 elif source != b'compatibility':
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	623 # filelog mode, ignore any changelog content
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	624 filesremoved = None
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	625 if filesremoved is None:
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	626 if compute_on_none:
44981 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44975 diff changeset	627 filesremoved = metadata.computechangesetfilesremoved(self)
43146 0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	628 else:
43024 15badd621825 context: clarify the various mode in the filesremoved method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43023 diff changeset	629 filesremoved = []
15badd621825 context: clarify the various mode in the filesremoved method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43023 diff changeset	630 return filesremoved
42396 65fa61ca20af context: add ctx.files{modified,added,removed}() methods Martin von Zweigbergk <martinvonz@google.com> parents: 42345 diff changeset	631
41764 a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	632 @propertycache
a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	633 def _copies(self):
42142 5382d8f8530b changelog: parse copy metadata if available in extras Martin von Zweigbergk <martinvonz@google.com> parents: 42102 diff changeset	634 p1copies = self._changeset.p1copies
5382d8f8530b changelog: parse copy metadata if available in extras Martin von Zweigbergk <martinvonz@google.com> parents: 42102 diff changeset	635 p2copies = self._changeset.p2copies
43146 0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	636 compute_on_none = True
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	637 if self._repo.filecopiesmode == b'changeset-sidedata':
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	638 compute_on_none = False
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	639 else:
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	640 source = self._repo.ui.config(b'experimental', b'copies.read-from')
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	641 # If config says to get copy metadata only from changeset, then
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	642 # return that, defaulting to {} if there was no copy metadata. In
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	643 # compatibility mode, we return copy data from the changeset if it
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	644 # was recorded there, and otherwise we fall back to getting it from
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	645 # the filelogs (below).
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	646 #
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	647 # If we are in compatiblity mode and there is not data in the
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	648 # changeset), we get the copy metadata from the filelogs.
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	649 #
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	650 # otherwise, when config said to read only from filelog, we get the
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	651 # copy metadata from the filelogs.
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	652 if source == b'changeset-only':
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	653 compute_on_none = False
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	654 elif source != b'compatibility':
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	655 # filelog mode, ignore any changelog content
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	656 p1copies = p2copies = None
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	657 if p1copies is None:
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	658 if compute_on_none:
43025 8af909893188 context: clarify the various mode in the _copies property cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43024 diff changeset	659 p1copies, p2copies = super(changectx, self)._copies
43146 0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	660 else:
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	661 if p1copies is None:
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	662 p1copies = {}
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	663 if p2copies is None:
0171483b082f sidedatacopies: read rename information from sidedata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	664 p2copies = {}
43025 8af909893188 context: clarify the various mode in the _copies property cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43024 diff changeset	665 return p1copies, p2copies
8af909893188 context: clarify the various mode in the _copies property cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43024 diff changeset	666
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	667 def description(self):
28488 437c32dcec7d context: use changelogrevision Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	668 return self._changeset.description
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	669
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	670 def branch(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	671 return encoding.tolocal(self._changeset.extra.get(b"branch"))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	672
16720 e825a89de5d7 context: add changectx.closesbranch() method Brodie Rao <brodie@sf.io> parents: 16719 diff changeset	673 def closesbranch(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	674 return b'close' in self._changeset.extra
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	675
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	676 def extra(self):
35130 b22a0d9e0a83 docs: add args/returns docs for some cmdutil, context, and registrar functions rlevasseur@google.com parents: 35116 diff changeset	677 """Return a dict of extra information."""
28488 437c32dcec7d context: use changelogrevision Gregory Szorc <gregory.szorc@gmail.com> parents: 28315 diff changeset	678 return self._changeset.extra
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	679
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	680 def tags(self):
35130 b22a0d9e0a83 docs: add args/returns docs for some cmdutil, context, and registrar functions rlevasseur@google.com parents: 35116 diff changeset	681 """Return a list of byte tag names"""
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	682 return self._repo.nodetags(self._node)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	683
13384 caa561759538 context: add method to return all bookmarks pointing to a node David Soria Parra <dsp@php.net> parents: 13235 diff changeset	684 def bookmarks(self):
35130 b22a0d9e0a83 docs: add args/returns docs for some cmdutil, context, and registrar functions rlevasseur@google.com parents: 35116 diff changeset	685 """Return a list of byte bookmark names."""
13384 caa561759538 context: add method to return all bookmarks pointing to a node David Soria Parra <dsp@php.net> parents: 13235 diff changeset	686 return self._repo.nodebookmarks(self._node)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	687
15421 405ca90df2b1 phases: add a phase method to context Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15337 diff changeset	688 def phase(self):
16657 b6081c2c4647 phases: introduce phasecache Patrick Mezard <patrick@mezard.eu> parents: 16610 diff changeset	689 return self._repo._phasecache.phase(self._repo, self._rev)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	690
14644 f3a40fd7008c hidden: Add ``hidden`` method for context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 14528 diff changeset	691 def hidden(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	692 return self._rev in repoview.filterrevs(self._repo, b'visible')
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	693
34681 4dc8a2ee0f4f context: add is `isinmemory()` to filectx Phil Cohen <phillco@fb.com> parents: 34556 diff changeset	694 def isinmemory(self):
4dc8a2ee0f4f context: add is `isinmemory()` to filectx Phil Cohen <phillco@fb.com> parents: 34556 diff changeset	695 return False
4dc8a2ee0f4f context: add is `isinmemory()` to filectx Phil Cohen <phillco@fb.com> parents: 34556 diff changeset	696
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	697 def children(self):
35130 b22a0d9e0a83 docs: add args/returns docs for some cmdutil, context, and registrar functions rlevasseur@google.com parents: 35116 diff changeset	698 """return list of changectx contexts for each child changeset.
b22a0d9e0a83 docs: add args/returns docs for some cmdutil, context, and registrar functions rlevasseur@google.com parents: 35116 diff changeset	699
b22a0d9e0a83 docs: add args/returns docs for some cmdutil, context, and registrar functions rlevasseur@google.com parents: 35116 diff changeset	700 This returns only the immediate child changesets. Use descendants() to
b22a0d9e0a83 docs: add args/returns docs for some cmdutil, context, and registrar functions rlevasseur@google.com parents: 35116 diff changeset	701 recursively walk children.
b22a0d9e0a83 docs: add args/returns docs for some cmdutil, context, and registrar functions rlevasseur@google.com parents: 35116 diff changeset	702 """
2627 b779319a532b context.py: self.repo is not defined, change to self._repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2566 diff changeset	703 c = self._repo.changelog.children(self._node)
39958 e1e3d1b498d3 context: reduce dependence of changectx constructor Martin von Zweigbergk <martinvonz@google.com> parents: 39912 diff changeset	704 return [self._repo[x] for x in c]
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	705
6876 077f1e637cd8 Merge with stable Matt Mackall <mpm@selenic.com> parents: 6846 diff changeset	706 def ancestors(self):
16866 91f3ac205816 revlog: ancestors(revs) becomes ancestors(revs) (API) Bryan O'Sullivan <bryano@fb.com>* parents: 16761 diff changeset	707 for a in self._repo.changelog.ancestors([self._rev]):
39958 e1e3d1b498d3 context: reduce dependence of changectx constructor Martin von Zweigbergk <martinvonz@google.com> parents: 39912 diff changeset	708 yield self._repo[a]
6876 077f1e637cd8 Merge with stable Matt Mackall <mpm@selenic.com> parents: 6846 diff changeset	709
077f1e637cd8 Merge with stable Matt Mackall <mpm@selenic.com> parents: 6846 diff changeset	710 def descendants(self):
35130 b22a0d9e0a83 docs: add args/returns docs for some cmdutil, context, and registrar functions rlevasseur@google.com parents: 35116 diff changeset	711 """Recursively yield all children of the changeset.
b22a0d9e0a83 docs: add args/returns docs for some cmdutil, context, and registrar functions rlevasseur@google.com parents: 35116 diff changeset	712
b22a0d9e0a83 docs: add args/returns docs for some cmdutil, context, and registrar functions rlevasseur@google.com parents: 35116 diff changeset	713 For just the immediate children, use children()
b22a0d9e0a83 docs: add args/returns docs for some cmdutil, context, and registrar functions rlevasseur@google.com parents: 35116 diff changeset	714 """
16867 1093ad1e8903 revlog: descendants(revs) becomes descendants(revs) (API) Bryan O'Sullivan <bryano@fb.com>* parents: 16866 diff changeset	715 for d in self._repo.changelog.descendants([self._rev]):
39958 e1e3d1b498d3 context: reduce dependence of changectx constructor Martin von Zweigbergk <martinvonz@google.com> parents: 39912 diff changeset	716 yield self._repo[d]
6876 077f1e637cd8 Merge with stable Matt Mackall <mpm@selenic.com> parents: 6846 diff changeset	717
3966 b4eaa68dea1b context: create a filectxt with filelog reuse Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3965 diff changeset	718 def filectx(self, path, fileid=None, filelog=None):
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	719 """get a file context from this changeset"""
2628 9999a796d389 context.py: filectxs was using a keyword arg, add it to filectx Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2627 diff changeset	720 if fileid is None:
9999a796d389 context.py: filectxs was using a keyword arg, add it to filectx Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2627 diff changeset	721 fileid = self.filenode(path)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	722 return filectx(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	723 self._repo, path, fileid=fileid, changectx=self, filelog=filelog
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	724 )
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	725
21203 9f12d8665c7b ancestor: silence multiple ancestor warning outside of merge (issue4234) Matt Mackall <mpm@selenic.com> parents: 21126 diff changeset	726 def ancestor(self, c2, warn=False):
22389 94f77624dbb5 comments: describe ancestor consistently - avoid 'least common ancestor' Mads Kiilerich <madski@unity3d.com> parents: 22313 diff changeset	727 """return the "best" ancestor context of self and c2
94f77624dbb5 comments: describe ancestor consistently - avoid 'least common ancestor' Mads Kiilerich <madski@unity3d.com> parents: 22313 diff changeset	728
94f77624dbb5 comments: describe ancestor consistently - avoid 'least common ancestor' Mads Kiilerich <madski@unity3d.com> parents: 22313 diff changeset	729 If there are multiple candidates, it will show a message and check
94f77624dbb5 comments: describe ancestor consistently - avoid 'least common ancestor' Mads Kiilerich <madski@unity3d.com> parents: 22313 diff changeset	730 merge.preferancestor configuration before falling back to the
94f77624dbb5 comments: describe ancestor consistently - avoid 'least common ancestor' Mads Kiilerich <madski@unity3d.com> parents: 22313 diff changeset	731 revlog ancestor."""
9843 d1043c2ffe6c merge: fix changectx.ancestor(workingctx) (issue1327) Matt Mackall <mpm@selenic.com> parents: 9751 diff changeset	732 # deal with workingctxs
d1043c2ffe6c merge: fix changectx.ancestor(workingctx) (issue1327) Matt Mackall <mpm@selenic.com> parents: 9751 diff changeset	733 n2 = c2._node
13031 3da456d0c885 code style: prefer 'is' and 'is not' tests with singletons Martin Geisler <mg@aragost.com> parents: 13001 diff changeset	734 if n2 is None:
9843 d1043c2ffe6c merge: fix changectx.ancestor(workingctx) (issue1327) Matt Mackall <mpm@selenic.com> parents: 9751 diff changeset	735 n2 = c2._parents[0]._node
21125 e94e90a4526e context: tell when .ancestor picks one of multiple common ancestors heads Mads Kiilerich <madski@unity3d.com> parents: 21114 diff changeset	736 cahs = self._repo.changelog.commonancestorsheads(self._node, n2)
e94e90a4526e context: tell when .ancestor picks one of multiple common ancestors heads Mads Kiilerich <madski@unity3d.com> parents: 21114 diff changeset	737 if not cahs:
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	738 anc = self._repo.nodeconstants.nullid
21125 e94e90a4526e context: tell when .ancestor picks one of multiple common ancestors heads Mads Kiilerich <madski@unity3d.com> parents: 21114 diff changeset	739 elif len(cahs) == 1:
e94e90a4526e context: tell when .ancestor picks one of multiple common ancestors heads Mads Kiilerich <madski@unity3d.com> parents: 21114 diff changeset	740 anc = cahs[0]
e94e90a4526e context: tell when .ancestor picks one of multiple common ancestors heads Mads Kiilerich <madski@unity3d.com> parents: 21114 diff changeset	741 else:
25844 18541e9510c5 merge: make merge.preferancestor type and default consistent Matt Mackall <mpm@selenic.com> parents: 25757 diff changeset	742 # experimental config: merge.preferancestor
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	743 for r in self._repo.ui.configlist(b'merge', b'preferancestor'):
22671 5220c12c43fd changectx: skip all invalid merge.preferancestor values Mads Kiilerich <madski@unity3d.com> parents: 22405 diff changeset	744 try:
37354 a6014392837e context: use revsymbol() in "merge.preferancestor" code Martin von Zweigbergk <martinvonz@google.com> parents: 37269 diff changeset	745 ctx = scmutil.revsymbol(self._repo, r)
22671 5220c12c43fd changectx: skip all invalid merge.preferancestor values Mads Kiilerich <madski@unity3d.com> parents: 22405 diff changeset	746 except error.RepoLookupError:
22180 17011b36aac7 changectx: ancestor should only prefer merge.preferancestor if it is a revision Mads Kiilerich <madski@unity3d.com> parents: 21990 diff changeset	747 continue
21126 99b5eaf372a7 context: introduce merge.preferancestor for controlling which ancestor to pick Mads Kiilerich <madski@unity3d.com> parents: 21125 diff changeset	748 anc = ctx.node()
99b5eaf372a7 context: introduce merge.preferancestor for controlling which ancestor to pick Mads Kiilerich <madski@unity3d.com> parents: 21125 diff changeset	749 if anc in cahs:
99b5eaf372a7 context: introduce merge.preferancestor for controlling which ancestor to pick Mads Kiilerich <madski@unity3d.com> parents: 21125 diff changeset	750 break
99b5eaf372a7 context: introduce merge.preferancestor for controlling which ancestor to pick Mads Kiilerich <madski@unity3d.com> parents: 21125 diff changeset	751 else:
99b5eaf372a7 context: introduce merge.preferancestor for controlling which ancestor to pick Mads Kiilerich <madski@unity3d.com> parents: 21125 diff changeset	752 anc = self._repo.changelog.ancestor(self._node, n2)
21203 9f12d8665c7b ancestor: silence multiple ancestor warning outside of merge (issue4234) Matt Mackall <mpm@selenic.com> parents: 21126 diff changeset	753 if warn:
9f12d8665c7b ancestor: silence multiple ancestor warning outside of merge (issue4234) Matt Mackall <mpm@selenic.com> parents: 21126 diff changeset	754 self._repo.ui.status(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	755 (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	756 _(b"note: using %s as ancestor of %s and %s\n")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	757 % (short(anc), short(self._node), short(n2))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	758 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	759 + b''.join(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	760 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	761 b" alternatively, use --config "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	762 b"merge.preferancestor=%s\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	763 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	764 % short(n)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	765 for n in sorted(cahs)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	766 if n != anc
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	767 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	768 )
39958 e1e3d1b498d3 context: reduce dependence of changectx constructor Martin von Zweigbergk <martinvonz@google.com> parents: 39912 diff changeset	769 return self._repo[anc]
3125 02b22fefc01f changectx: add ancestor function Matt Mackall <mpm@selenic.com> parents: 3124 diff changeset	770
38670 fbec9c0b32d3 context: rename descendant() to isancestorof() Martin von Zweigbergk <martinvonz@google.com> parents: 38668 diff changeset	771 def isancestorof(self, other):
fbec9c0b32d3 context: rename descendant() to isancestorof() Martin von Zweigbergk <martinvonz@google.com> parents: 38668 diff changeset	772 """True if this changeset is an ancestor of other"""
38668 21846c94e605 revlog: delete isdescendantrev() in favor of isancestorrev() Martin von Zweigbergk <martinvonz@google.com> parents: 38664 diff changeset	773 return self._repo.changelog.isancestorrev(self._rev, other._rev)
17626 3a524b647897 context: add "descendant()" to changectx for efficient descendant examination FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17469 diff changeset	774
6764 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6763 diff changeset	775 def walk(self, match):
24646 5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24633 diff changeset	776 '''Generates matching file names.'''
20292 8dc254198a8f changectx: increase perf of walk function Durham Goode <durham@fb.com> parents: 20236 diff changeset	777
25435 a592a6a6f4fe context: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25417 diff changeset	778 # Wrap match.bad method to have message with nodeid
24646 5693c834bcb4 manifest: move changectx.walk() to manifests Drew Gottlieb <drgott@google.com> parents: 24633 diff changeset	779 def bad(fn, msg):
25193 ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk() Matt Harbison <matt_harbison@yahoo.com> parents: 24862 diff changeset	780 # The manifest doesn't know about subrepos, so don't complain about
ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk() Matt Harbison <matt_harbison@yahoo.com> parents: 24862 diff changeset	781 # paths into valid subrepos.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	782 if any(fn == s or fn.startswith(s + b'/') for s in self.substate):
25193 ccb1623266eb context: don't complain about a matcher's subrepo paths in changectx.walk() Matt Harbison <matt_harbison@yahoo.com> parents: 24862 diff changeset	783 return
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	784 match.bad(fn, _(b'no such file in rev %s') % self)
20292 8dc254198a8f changectx: increase perf of walk function Durham Goode <durham@fb.com> parents: 20236 diff changeset	785
40085 2cf18f46a1ce narrow: only walk files within narrowspec also for committed revisions Martin von Zweigbergk <martinvonz@google.com> parents: 40084 diff changeset	786 m = matchmod.badmatch(self._repo.narrowmatch(match), bad)
25435 a592a6a6f4fe context: replace match.bad() monkey patching with match.badmatch() Matt Harbison <matt_harbison@yahoo.com> parents: 25417 diff changeset	787 return self._manifest.walk(m)
6764 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6763 diff changeset	788
21985 7e871e771300 context: add a method to efficiently filter by match if possible Siddharth Agarwal <sid0@fb.com> parents: 21973 diff changeset	789 def matches(self, match):
7e871e771300 context: add a method to efficiently filter by match if possible Siddharth Agarwal <sid0@fb.com> parents: 21973 diff changeset	790 return self.walk(match)
7e871e771300 context: add a method to efficiently filter by match if possible Siddharth Agarwal <sid0@fb.com> parents: 21973 diff changeset	791
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	792
19572 c19f46b904b9 basefilectx: add an empty class that will be used as a parent of file contexts Sean Farley <sean.michael.farley@gmail.com> parents: 19571 diff changeset	793 class basefilectx(object):
c19f46b904b9 basefilectx: add an empty class that will be used as a parent of file contexts Sean Farley <sean.michael.farley@gmail.com> parents: 19571 diff changeset	794 """A filecontext object represents the common logic for its children:
c19f46b904b9 basefilectx: add an empty class that will be used as a parent of file contexts Sean Farley <sean.michael.farley@gmail.com> parents: 19571 diff changeset	795 filectx: read-only access to a filerevision that is already present
c19f46b904b9 basefilectx: add an empty class that will be used as a parent of file contexts Sean Farley <sean.michael.farley@gmail.com> parents: 19571 diff changeset	796 in the repo,
c19f46b904b9 basefilectx: add an empty class that will be used as a parent of file contexts Sean Farley <sean.michael.farley@gmail.com> parents: 19571 diff changeset	797 workingfilectx: a filecontext that represents files from the working
c19f46b904b9 basefilectx: add an empty class that will be used as a parent of file contexts Sean Farley <sean.michael.farley@gmail.com> parents: 19571 diff changeset	798 directory,
32283 07da778f3b58 filectx: add an overlayfilectx class Jun Wu <quark@fb.com> parents: 32282 diff changeset	799 memfilectx: a filecontext that represents files in-memory,
07da778f3b58 filectx: add an overlayfilectx class Jun Wu <quark@fb.com> parents: 32282 diff changeset	800 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	801
19573 dffad92ab709 basefilectx: move _filelog from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19572 diff changeset	802 @propertycache
dffad92ab709 basefilectx: move _filelog from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19572 diff changeset	803 def _filelog(self):
dffad92ab709 basefilectx: move _filelog from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19572 diff changeset	804 return self._repo.file(self._path)
dffad92ab709 basefilectx: move _filelog from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19572 diff changeset	805
19574 a01436798988 basefilectx: move _changeid from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19573 diff changeset	806 @propertycache
a01436798988 basefilectx: move _changeid from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19573 diff changeset	807 def _changeid(self):
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43551 diff changeset	808 if '_changectx' in self.__dict__:
19574 a01436798988 basefilectx: move _changeid from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19573 diff changeset	809 return self._changectx.rev()
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43551 diff changeset	810 elif '_descendantrev' in self.__dict__:
23983 ff070a53ee74 filectx: if we have a _descendantrev, use it to adjust linkrev Matt Mackall <mpm@selenic.com> parents: 23981 diff changeset	811 # this file context was created from a revision with a known
ff070a53ee74 filectx: if we have a _descendantrev, use it to adjust linkrev Matt Mackall <mpm@selenic.com> parents: 23981 diff changeset	812 # descendant, we can (lazily) correct for linkrev aliases
30289 e81d72b4b0ae adjustlinkrev: remove unnecessary parameters Jun Wu <quark@fb.com> parents: 30284 diff changeset	813 return self._adjustlinkrev(self._descendantrev)
19574 a01436798988 basefilectx: move _changeid from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19573 diff changeset	814 else:
a01436798988 basefilectx: move _changeid from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19573 diff changeset	815 return self._filelog.linkrev(self._filerev)
a01436798988 basefilectx: move _changeid from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19573 diff changeset	816
19575 5a868137b830 basefilectx: move _filenode from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19574 diff changeset	817 @propertycache
5a868137b830 basefilectx: move _filenode from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19574 diff changeset	818 def _filenode(self):
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43551 diff changeset	819 if '_fileid' in self.__dict__:
19575 5a868137b830 basefilectx: move _filenode from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19574 diff changeset	820 return self._filelog.lookup(self._fileid)
5a868137b830 basefilectx: move _filenode from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19574 diff changeset	821 else:
5a868137b830 basefilectx: move _filenode from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19574 diff changeset	822 return self._changectx.filenode(self._path)
5a868137b830 basefilectx: move _filenode from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19574 diff changeset	823
19576 18bbd8a3abf3 basefilectx: move _filerev from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19575 diff changeset	824 @propertycache
18bbd8a3abf3 basefilectx: move _filerev from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19575 diff changeset	825 def _filerev(self):
18bbd8a3abf3 basefilectx: move _filerev from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19575 diff changeset	826 return self._filelog.rev(self._filenode)
18bbd8a3abf3 basefilectx: move _filerev from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19575 diff changeset	827
19577 b52d572a2177 basefilectx: move _repopath from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19576 diff changeset	828 @propertycache
b52d572a2177 basefilectx: move _repopath from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19576 diff changeset	829 def _repopath(self):
b52d572a2177 basefilectx: move _repopath from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19576 diff changeset	830 return self._path
b52d572a2177 basefilectx: move _repopath from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19576 diff changeset	831
19578 2c149635c2c5 basefilectx: move __nonzero__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19577 diff changeset	832 def __nonzero__(self):
2c149635c2c5 basefilectx: move __nonzero__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19577 diff changeset	833 try:
2c149635c2c5 basefilectx: move __nonzero__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19577 diff changeset	834 self._filenode
2c149635c2c5 basefilectx: move __nonzero__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19577 diff changeset	835 return True
2c149635c2c5 basefilectx: move __nonzero__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19577 diff changeset	836 except error.LookupError:
2c149635c2c5 basefilectx: move __nonzero__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19577 diff changeset	837 # file is missing
2c149635c2c5 basefilectx: move __nonzero__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19577 diff changeset	838 return False
2c149635c2c5 basefilectx: move __nonzero__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19577 diff changeset	839
31483 413b44003462 py3: add __bool__ to every class defining __nonzero__ Gregory Szorc <gregory.szorc@gmail.com> parents: 31473 diff changeset	840 __bool__ = __nonzero__
413b44003462 py3: add __bool__ to every class defining __nonzero__ Gregory Szorc <gregory.szorc@gmail.com> parents: 31473 diff changeset	841
33038 ce96efec8112 py3: add utility to forward __str__() to __bytes__() Yuya Nishihara <yuya@tcha.org> parents: 33035 diff changeset	842 def __bytes__(self):
30284 e25ce44f8447 context: make sure __str__ works, also when there is no _changectx Mads Kiilerich <mads@kiilerich.com> parents: 30040 diff changeset	843 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	844 return b"%s@%s" % (self.path(), self._changectx)
30284 e25ce44f8447 context: make sure __str__ works, also when there is no _changectx Mads Kiilerich <mads@kiilerich.com> parents: 30040 diff changeset	845 except error.LookupError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	846 return b"%s@???" % self.path()
19579 964844d64ef8 basefilectx: move __str__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19578 diff changeset	847
33038 ce96efec8112 py3: add utility to forward __str__() to __bytes__() Yuya Nishihara <yuya@tcha.org> parents: 33035 diff changeset	848 __str__ = encoding.strmethod(__bytes__)
33035 daccadd75760 py3: define __bytes__ for basefilectx class Pulkit Goyal <7895pulkit@gmail.com> parents: 32922 diff changeset	849
19580 e86a594ab11f basefilectx: move __repr__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19579 diff changeset	850 def __repr__(self):
43551 313e3a279828 cleanup: remove pointless r-prefixes on double-quoted strings Augie Fackler <augie@google.com> parents: 43346 diff changeset	851 return "<%s %s>" % (type(self).__name__, str(self))
19580 e86a594ab11f basefilectx: move __repr__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19579 diff changeset	852
19581 fe50d21be01a basefilectx: move __hash__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19580 diff changeset	853 def __hash__(self):
fe50d21be01a basefilectx: move __hash__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19580 diff changeset	854 try:
fe50d21be01a basefilectx: move __hash__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19580 diff changeset	855 return hash((self._path, self._filenode))
fe50d21be01a basefilectx: move __hash__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19580 diff changeset	856 except AttributeError:
fe50d21be01a basefilectx: move __hash__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19580 diff changeset	857 return id(self)
fe50d21be01a basefilectx: move __hash__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19580 diff changeset	858
19582 bda1d48bb07f basefilectx: move __eq__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19581 diff changeset	859 def __eq__(self, other):
bda1d48bb07f basefilectx: move __eq__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19581 diff changeset	860 try:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	861 return (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	862 type(self) == type(other)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	863 and self._path == other._path
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	864 and self._filenode == other._filenode
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	865 )
19582 bda1d48bb07f basefilectx: move __eq__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19581 diff changeset	866 except AttributeError:
bda1d48bb07f basefilectx: move __eq__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19581 diff changeset	867 return False
bda1d48bb07f basefilectx: move __eq__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19581 diff changeset	868
19583 e5074d82afc9 basefilectx: move __ne__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19582 diff changeset	869 def __ne__(self, other):
e5074d82afc9 basefilectx: move __ne__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19582 diff changeset	870 return not (self == other)
e5074d82afc9 basefilectx: move __ne__ from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19582 diff changeset	871
19584 fe300e63c28c basefilectx: move filerev from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19583 diff changeset	872 def filerev(self):
fe300e63c28c basefilectx: move filerev from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19583 diff changeset	873 return self._filerev
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	874
19585 8e553cd6071e basefilectx: move filenode from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19584 diff changeset	875 def filenode(self):
8e553cd6071e basefilectx: move filenode from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19584 diff changeset	876 return self._filenode
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	877
32278 8a660af9dbe3 filectx: make flags a property cache Jun Wu <quark@fb.com> parents: 32197 diff changeset	878 @propertycache
8a660af9dbe3 filectx: make flags a property cache Jun Wu <quark@fb.com> parents: 32197 diff changeset	879 def _flags(self):
8a660af9dbe3 filectx: make flags a property cache Jun Wu <quark@fb.com> parents: 32197 diff changeset	880 return self._changectx.flags(self._path)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	881
19586 43f9ed2f64b1 basefilectx: move flags from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19585 diff changeset	882 def flags(self):
32278 8a660af9dbe3 filectx: make flags a property cache Jun Wu <quark@fb.com> parents: 32197 diff changeset	883 return self._flags
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	884
19587 b1c344ebd8e4 basefilectx: move filelog from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19586 diff changeset	885 def filelog(self):
b1c344ebd8e4 basefilectx: move filelog from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19586 diff changeset	886 return self._filelog
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	887
19588 a192fff6c97d basefilectx: move rev from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19587 diff changeset	888 def rev(self):
a192fff6c97d basefilectx: move rev from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19587 diff changeset	889 return self._changeid
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	890
19589 6a9043fa06d0 basefilectx: move linkrev from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19588 diff changeset	891 def linkrev(self):
6a9043fa06d0 basefilectx: move linkrev from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19588 diff changeset	892 return self._filelog.linkrev(self._filerev)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	893
19590 90994b176bc1 basefilectx: move node from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19589 diff changeset	894 def node(self):
90994b176bc1 basefilectx: move node from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19589 diff changeset	895 return self._changectx.node()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	896
19591 04fbc85f870a basefilectx: move hex from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19590 diff changeset	897 def hex(self):
04fbc85f870a basefilectx: move hex from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19590 diff changeset	898 return self._changectx.hex()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	899
19592 1cdb3b3df4df basefilectx: move user from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19591 diff changeset	900 def user(self):
1cdb3b3df4df basefilectx: move user from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19591 diff changeset	901 return self._changectx.user()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	902
19593 e3c241c89350 basefilectx: move date from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19592 diff changeset	903 def date(self):
e3c241c89350 basefilectx: move date from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19592 diff changeset	904 return self._changectx.date()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	905
19594 1c030c24e196 basefilectx: move files from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19593 diff changeset	906 def files(self):
1c030c24e196 basefilectx: move files from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19593 diff changeset	907 return self._changectx.files()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	908
19595 bb6fd06975a6 basefilectx: move description from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19594 diff changeset	909 def description(self):
bb6fd06975a6 basefilectx: move description from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19594 diff changeset	910 return self._changectx.description()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	911
19596 9bc3d0dea371 basefilectx: move branch from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19595 diff changeset	912 def branch(self):
9bc3d0dea371 basefilectx: move branch from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19595 diff changeset	913 return self._changectx.branch()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	914
19597 837bc86370f0 basefilectx: move extra from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19596 diff changeset	915 def extra(self):
837bc86370f0 basefilectx: move extra from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19596 diff changeset	916 return self._changectx.extra()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	917
19598 e8ef893a3150 basefilectx: move phase from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19597 diff changeset	918 def phase(self):
e8ef893a3150 basefilectx: move phase from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19597 diff changeset	919 return self._changectx.phase()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	920
19599 66d83efac20a basefilectx: move phasestr from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19598 diff changeset	921 def phasestr(self):
66d83efac20a basefilectx: move phasestr from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19598 diff changeset	922 return self._changectx.phasestr()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	923
35111 a9454beb9dd8 context: add obsolete() method to basefilectx Anton Shestakov <av6@dwimlabs.net> parents: 34926 diff changeset	924 def obsolete(self):
a9454beb9dd8 context: add obsolete() method to basefilectx Anton Shestakov <av6@dwimlabs.net> parents: 34926 diff changeset	925 return self._changectx.obsolete()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	926
35116 bd2743936b56 context: add instabilities() method to basefilectx Anton Shestakov <av6@dwimlabs.net> parents: 35111 diff changeset	927 def instabilities(self):
bd2743936b56 context: add instabilities() method to basefilectx Anton Shestakov <av6@dwimlabs.net> parents: 35111 diff changeset	928 return self._changectx.instabilities()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	929
19600 12cdff44fdc4 basefilectx: move manifest from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19599 diff changeset	930 def manifest(self):
12cdff44fdc4 basefilectx: move manifest from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19599 diff changeset	931 return self._changectx.manifest()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	932
19601 f284907631f5 basefilectx: move changectx from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19600 diff changeset	933 def changectx(self):
f284907631f5 basefilectx: move changectx from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19600 diff changeset	934 return self._changectx
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	935
32279 c38c15d4ce48 filectx: make renamed a property cache Jun Wu <quark@fb.com> parents: 32278 diff changeset	936 def renamed(self):
c38c15d4ce48 filectx: make renamed a property cache Jun Wu <quark@fb.com> parents: 32278 diff changeset	937 return self._copied
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	938
41777 041d829575ed context: add specialized way of getting copy source file only Martin von Zweigbergk <martinvonz@google.com> parents: 41775 diff changeset	939 def copysource(self):
041d829575ed context: add specialized way of getting copy source file only Martin von Zweigbergk <martinvonz@google.com> parents: 41775 diff changeset	940 return self._copied and self._copied[0]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	941
24333 5da0eb641881 filectx: add a repo accessor Matt Harbison <matt_harbison@yahoo.com> parents: 24326 diff changeset	942 def repo(self):
5da0eb641881 filectx: add a repo accessor Matt Harbison <matt_harbison@yahoo.com> parents: 24326 diff changeset	943 return self._repo
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	944
32280 842ea95d45dc filectx: move size to basefilectx Jun Wu <quark@fb.com> parents: 32279 diff changeset	945 def size(self):
842ea95d45dc filectx: move size to basefilectx Jun Wu <quark@fb.com> parents: 32279 diff changeset	946 return len(self.data())
19584 fe300e63c28c basefilectx: move filerev from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19583 diff changeset	947
19602 018ee491a6be basefilectx: move path from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19601 diff changeset	948 def path(self):
018ee491a6be basefilectx: move path from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19601 diff changeset	949 return self._path
018ee491a6be basefilectx: move path from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19601 diff changeset	950
19603 a92302f48a56 basefilectx: move isbinary from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19602 diff changeset	951 def isbinary(self):
a92302f48a56 basefilectx: move isbinary from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19602 diff changeset	952 try:
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37069 diff changeset	953 return stringutil.binary(self.data())
19603 a92302f48a56 basefilectx: move isbinary from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19602 diff changeset	954 except IOError:
a92302f48a56 basefilectx: move isbinary from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19602 diff changeset	955 return False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	956
22054 ef0ee0c001bf basefilectx: move isexec and islink from memfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 21992 diff changeset	957 def isexec(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	958 return b'x' in self.flags()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	959
22054 ef0ee0c001bf basefilectx: move isexec and islink from memfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 21992 diff changeset	960 def islink(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	961 return b'l' in self.flags()
19603 a92302f48a56 basefilectx: move isbinary from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19602 diff changeset	962
26978 9b9d4bcc915e filectx: add isabsent method Siddharth Agarwal <sid0@fb.com> parents: 26977 diff changeset	963 def isabsent(self):
9b9d4bcc915e filectx: add isabsent method Siddharth Agarwal <sid0@fb.com> parents: 26977 diff changeset	964 """whether this filectx represents a file not in self._changectx
9b9d4bcc915e filectx: add isabsent method Siddharth Agarwal <sid0@fb.com> parents: 26977 diff changeset	965
9b9d4bcc915e filectx: add isabsent method Siddharth Agarwal <sid0@fb.com> parents: 26977 diff changeset	966 This is mainly for merge code to detect change/delete conflicts. This is
9b9d4bcc915e filectx: add isabsent method Siddharth Agarwal <sid0@fb.com> parents: 26977 diff changeset	967 expected to be True for all subclasses of basectx."""
9b9d4bcc915e filectx: add isabsent method Siddharth Agarwal <sid0@fb.com> parents: 26977 diff changeset	968 return False
9b9d4bcc915e filectx: add isabsent method Siddharth Agarwal <sid0@fb.com> parents: 26977 diff changeset	969
26977 bd19561b98d9 filectx: allow custom comparators Siddharth Agarwal <sid0@fb.com> parents: 26748 diff changeset	970 _customcmp = False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	971
19604 ef7c47e4002f basefilectx: move cmp from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19603 diff changeset	972 def cmp(self, fctx):
ef7c47e4002f basefilectx: move cmp from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19603 diff changeset	973 """compare with other file context
ef7c47e4002f basefilectx: move cmp from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19603 diff changeset	974
ef7c47e4002f basefilectx: move cmp from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19603 diff changeset	975 returns True if different than fctx.
ef7c47e4002f basefilectx: move cmp from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19603 diff changeset	976 """
26977 bd19561b98d9 filectx: allow custom comparators Siddharth Agarwal <sid0@fb.com> parents: 26748 diff changeset	977 if fctx._customcmp:
bd19561b98d9 filectx: allow custom comparators Siddharth Agarwal <sid0@fb.com> parents: 26748 diff changeset	978 return fctx.cmp(self)
bd19561b98d9 filectx: allow custom comparators Siddharth Agarwal <sid0@fb.com> parents: 26748 diff changeset	979
41001 21ffe6b97a25 context: error out if basefilectx.cmp() is called without self._filenode Yuya Nishihara <yuya@tcha.org> parents: 41000 diff changeset	980 if self._filenode is None:
21ffe6b97a25 context: error out if basefilectx.cmp() is called without self._filenode Yuya Nishihara <yuya@tcha.org> parents: 41000 diff changeset	981 raise error.ProgrammingError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	982 b'filectx.cmp() must be reimplemented if not backed by revlog'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	983 )
41001 21ffe6b97a25 context: error out if basefilectx.cmp() is called without self._filenode Yuya Nishihara <yuya@tcha.org> parents: 41000 diff changeset	984
41000 39953bcf1f51 context: collapse complex condition to see if filelog have to be compared Yuya Nishihara <yuya@tcha.org> parents: 40999 diff changeset	985 if fctx._filenode is None:
39953bcf1f51 context: collapse complex condition to see if filelog have to be compared Yuya Nishihara <yuya@tcha.org> parents: 40999 diff changeset	986 if self._repo._encodefilterpats:
39953bcf1f51 context: collapse complex condition to see if filelog have to be compared Yuya Nishihara <yuya@tcha.org> parents: 40999 diff changeset	987 # can't rely on size() because wdir content may be decoded
39953bcf1f51 context: collapse complex condition to see if filelog have to be compared Yuya Nishihara <yuya@tcha.org> parents: 40999 diff changeset	988 return self._filelog.cmp(self._filenode, fctx.data())
39953bcf1f51 context: collapse complex condition to see if filelog have to be compared Yuya Nishihara <yuya@tcha.org> parents: 40999 diff changeset	989 if self.size() - 4 == fctx.size():
39953bcf1f51 context: collapse complex condition to see if filelog have to be compared Yuya Nishihara <yuya@tcha.org> parents: 40999 diff changeset	990 # size() can match:
39953bcf1f51 context: collapse complex condition to see if filelog have to be compared Yuya Nishihara <yuya@tcha.org> parents: 40999 diff changeset	991 # if file data starts with '\1\n', empty metadata block is
39953bcf1f51 context: collapse complex condition to see if filelog have to be compared Yuya Nishihara <yuya@tcha.org> parents: 40999 diff changeset	992 # prepended, which adds 4 bytes to filelog.size().
39953bcf1f51 context: collapse complex condition to see if filelog have to be compared Yuya Nishihara <yuya@tcha.org> parents: 40999 diff changeset	993 return self._filelog.cmp(self._filenode, fctx.data())
46385 0d055849d5f9 enclink: check contents of symlinks not just size in case of fcrypt Corey Schuhen <cschuhen@topcon.com> parents: 45957 diff changeset	994 if self.size() == fctx.size() or self.flags() == b'l':
41000 39953bcf1f51 context: collapse complex condition to see if filelog have to be compared Yuya Nishihara <yuya@tcha.org> parents: 40999 diff changeset	995 # size() matches: need to compare content
46385 0d055849d5f9 enclink: check contents of symlinks not just size in case of fcrypt Corey Schuhen <cschuhen@topcon.com> parents: 45957 diff changeset	996 # issue6456: Always compare symlinks because size can represent
0d055849d5f9 enclink: check contents of symlinks not just size in case of fcrypt Corey Schuhen <cschuhen@topcon.com> parents: 45957 diff changeset	997 # encrypted string for EXT-4 encryption(fscrypt).
19604 ef7c47e4002f basefilectx: move cmp from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19603 diff changeset	998 return self._filelog.cmp(self._filenode, fctx.data())
ef7c47e4002f basefilectx: move cmp from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19603 diff changeset	999
41000 39953bcf1f51 context: collapse complex condition to see if filelog have to be compared Yuya Nishihara <yuya@tcha.org> parents: 40999 diff changeset	1000 # size() differs
19604 ef7c47e4002f basefilectx: move cmp from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19603 diff changeset	1001 return True
ef7c47e4002f basefilectx: move cmp from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19603 diff changeset	1002
40736 d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1003 def _adjustlinkrev(self, srcrev, inclusive=False, stoprev=None):
24180 d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24050 diff changeset	1004 """return the first ancestor of <srcrev> introducing <fnode>
23979 087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1005
087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1006 If the linkrev of the file revision does not point to an ancestor of
087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1007 srcrev, we'll walk down the ancestors until we find one introducing
087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1008 this file revision.
087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1009
087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1010 :srcrev: the changeset revision we search ancestors from
087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1011 :inclusive: if true, the src revision will also be checked
40736 d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1012 :stoprev: an optional revision to stop the walk at. If no introduction
d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1013 of this file content could be found before this floor
d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1014 revision, the function will returns "None" and stops its
d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1015 iteration.
23979 087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1016 """
087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1017 repo = self._repo
087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1018 cl = repo.unfiltered().changelog
29943 80be4436e4cc manifest: adds manifestctx.readfast Durham Goode <durham@fb.com> parents: 29942 diff changeset	1019 mfl = repo.manifestlog
23979 087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1020 # fetch the linkrev
30289 e81d72b4b0ae adjustlinkrev: remove unnecessary parameters Jun Wu <quark@fb.com> parents: 30284 diff changeset	1021 lkr = self.linkrev()
40045 ccf4d808ec4c context: fast path linkrev adjustement in trivial case Boris Feld <boris.feld@octobus.net> parents: 39960 diff changeset	1022 if srcrev == lkr:
ccf4d808ec4c context: fast path linkrev adjustement in trivial case Boris Feld <boris.feld@octobus.net> parents: 39960 diff changeset	1023 return lkr
23980 c1ce5442453f _adjustlinkrev: reuse ancestors set during rename detection (issue4514) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23979 diff changeset	1024 # hack to reuse ancestor computation when searching for renames
c1ce5442453f _adjustlinkrev: reuse ancestors set during rename detection (issue4514) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23979 diff changeset	1025 memberanc = getattr(self, '_ancestrycontext', None)
c1ce5442453f _adjustlinkrev: reuse ancestors set during rename detection (issue4514) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23979 diff changeset	1026 iteranc = None
24411 5a12ef618c03 adjustlinkrev: handle 'None' value as source Pierre-Yves David <pierre-yves.david@fb.com> parents: 24410 diff changeset	1027 if srcrev is None:
5a12ef618c03 adjustlinkrev: handle 'None' value as source Pierre-Yves David <pierre-yves.david@fb.com> parents: 24410 diff changeset	1028 # wctx case, used by workingfilectx during mergecopy
5a12ef618c03 adjustlinkrev: handle 'None' value as source Pierre-Yves David <pierre-yves.david@fb.com> parents: 24410 diff changeset	1029 revs = [p.rev() for p in self._repo[None].parents()]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1030 inclusive = True # we skipped the real (revless) source
24411 5a12ef618c03 adjustlinkrev: handle 'None' value as source Pierre-Yves David <pierre-yves.david@fb.com> parents: 24410 diff changeset	1031 else:
5a12ef618c03 adjustlinkrev: handle 'None' value as source Pierre-Yves David <pierre-yves.david@fb.com> parents: 24410 diff changeset	1032 revs = [srcrev]
23980 c1ce5442453f _adjustlinkrev: reuse ancestors set during rename detection (issue4514) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23979 diff changeset	1033 if memberanc is None:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1034 memberanc = iteranc = cl.ancestors(revs, lkr, inclusive=inclusive)
23979 087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1035 # check if this linkrev is an ancestor of srcrev
23980 c1ce5442453f _adjustlinkrev: reuse ancestors set during rename detection (issue4514) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23979 diff changeset	1036 if lkr not in memberanc:
c1ce5442453f _adjustlinkrev: reuse ancestors set during rename detection (issue4514) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23979 diff changeset	1037 if iteranc is None:
24410 86de531e07e1 adjustlinkrev: prepare source revs for ancestry only once Pierre-Yves David <pierre-yves.david@fb.com> parents: 24407 diff changeset	1038 iteranc = cl.ancestors(revs, lkr, inclusive=inclusive)
30289 e81d72b4b0ae adjustlinkrev: remove unnecessary parameters Jun Wu <quark@fb.com> parents: 30284 diff changeset	1039 fnode = self._filenode
e81d72b4b0ae adjustlinkrev: remove unnecessary parameters Jun Wu <quark@fb.com> parents: 30284 diff changeset	1040 path = self._path
23980 c1ce5442453f _adjustlinkrev: reuse ancestors set during rename detection (issue4514) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23979 diff changeset	1041 for a in iteranc:
40736 d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1042 if stoprev is not None and a < stoprev:
d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1043 return None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1044 ac = cl.read(a) # get changeset data (we avoid object creation)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1045 if path in ac[3]: # checking the 'files' field.
23979 087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1046 # The file has been touched, check if the content is
087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1047 # similar to the one we search for.
29943 80be4436e4cc manifest: adds manifestctx.readfast Durham Goode <durham@fb.com> parents: 29942 diff changeset	1048 if fnode == mfl[ac[0]].readfast().get(path):
23979 087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1049 return a
087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1050 # In theory, we should never get out of that loop without a result.
087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1051 # But if manifest uses a buggy file revision (not children of the
087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1052 # one it replaces) we could. Such a buggy situation will likely
087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1053 # result is crash somewhere else at to some point.
087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1054 return lkr
087603b50889 filectx: move _adjustlinkrev to a method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23865 diff changeset	1055
40733 8a0136f69027 context: introduce an `isintroducedafter` method and use it in copies Boris Feld <boris.feld@octobus.net> parents: 40732 diff changeset	1056 def isintroducedafter(self, changelogrev):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45911 diff changeset	1057 """True if a filectx has been introduced after a given floor revision"""
40735 69206452a2ac context: small refactoring of `isintroducedafter` Boris Feld <boris.feld@octobus.net> parents: 40734 diff changeset	1058 if self.linkrev() >= changelogrev:
69206452a2ac context: small refactoring of `isintroducedafter` Boris Feld <boris.feld@octobus.net> parents: 40734 diff changeset	1059 return True
40736 d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1060 introrev = self._introrev(stoprev=changelogrev)
d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1061 if introrev is None:
d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1062 return False
40735 69206452a2ac context: small refactoring of `isintroducedafter` Boris Feld <boris.feld@octobus.net> parents: 40734 diff changeset	1063 return introrev >= changelogrev
40733 8a0136f69027 context: introduce an `isintroducedafter` method and use it in copies Boris Feld <boris.feld@octobus.net> parents: 40732 diff changeset	1064
23703 aaa76612b3c0 linkrev: introduce an 'introrev' method on filectx Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	1065 def introrev(self):
aaa76612b3c0 linkrev: introduce an 'introrev' method on filectx Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	1066 """return the rev of the changeset which introduced this file revision
aaa76612b3c0 linkrev: introduce an 'introrev' method on filectx Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	1067
aaa76612b3c0 linkrev: introduce an 'introrev' method on filectx Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	1068 This method is different from linkrev because it take into account the
aaa76612b3c0 linkrev: introduce an 'introrev' method on filectx Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	1069 changeset the filectx was created from. It ensures the returned
aaa76612b3c0 linkrev: introduce an 'introrev' method on filectx Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	1070 revision is one of its ancestors. This prevents bugs from
aaa76612b3c0 linkrev: introduce an 'introrev' method on filectx Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	1071 'linkrev-shadowing' when a file revision is used by multiple
aaa76612b3c0 linkrev: introduce an 'introrev' method on filectx Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	1072 changesets.
aaa76612b3c0 linkrev: introduce an 'introrev' method on filectx Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	1073 """
40734 9fa0d6dd1617 context: split `introrev` logic in a sub function Boris Feld <boris.feld@octobus.net> parents: 40733 diff changeset	1074 return self._introrev()
9fa0d6dd1617 context: split `introrev` logic in a sub function Boris Feld <boris.feld@octobus.net> parents: 40733 diff changeset	1075
40736 d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1076 def _introrev(self, stoprev=None):
d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1077 """
d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1078 Same as `introrev` but, with an extra argument to limit changelog
d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1079 iteration range in some internal usecase.
d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1080
d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1081 If `stoprev` is set, the `introrev` will not be searched past that
d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1082 `stoprev` revision and "None" might be returned. This is useful to
d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1083 limit the iteration range.
d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1084 """
40731 f3f4d8537b11 context: spell out the logic around linkrev adjustement starting point Boris Feld <boris.feld@octobus.net> parents: 40711 diff changeset	1085 toprev = None
23703 aaa76612b3c0 linkrev: introduce an 'introrev' method on filectx Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	1086 attrs = vars(self)
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43551 diff changeset	1087 if '_changeid' in attrs:
40731 f3f4d8537b11 context: spell out the logic around linkrev adjustement starting point Boris Feld <boris.feld@octobus.net> parents: 40711 diff changeset	1088 # We have a cached value already
f3f4d8537b11 context: spell out the logic around linkrev adjustement starting point Boris Feld <boris.feld@octobus.net> parents: 40711 diff changeset	1089 toprev = self._changeid
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43551 diff changeset	1090 elif '_changectx' in attrs:
40731 f3f4d8537b11 context: spell out the logic around linkrev adjustement starting point Boris Feld <boris.feld@octobus.net> parents: 40711 diff changeset	1091 # We know which changelog entry we are coming from
f3f4d8537b11 context: spell out the logic around linkrev adjustement starting point Boris Feld <boris.feld@octobus.net> parents: 40711 diff changeset	1092 toprev = self._changectx.rev()
f3f4d8537b11 context: spell out the logic around linkrev adjustement starting point Boris Feld <boris.feld@octobus.net> parents: 40711 diff changeset	1093
f3f4d8537b11 context: spell out the logic around linkrev adjustement starting point Boris Feld <boris.feld@octobus.net> parents: 40711 diff changeset	1094 if toprev is not None:
40736 d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1095 return self._adjustlinkrev(toprev, inclusive=True, stoprev=stoprev)
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43551 diff changeset	1096 elif '_descendantrev' in attrs:
40736 d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1097 introrev = self._adjustlinkrev(self._descendantrev, stoprev=stoprev)
40732 aee94f0a36cd context: take advantage of `_descendantrev` in introrev if available Boris Feld <boris.feld@octobus.net> parents: 40731 diff changeset	1098 # be nice and cache the result of the computation
40736 d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1099 if introrev is not None:
d98fb3f42f33 context: floor adjustlinkrev graph walk during copy tracing Boris Feld <boris.feld@octobus.net> parents: 40735 diff changeset	1100 self._changeid = introrev
40732 aee94f0a36cd context: take advantage of `_descendantrev` in introrev if available Boris Feld <boris.feld@octobus.net> parents: 40731 diff changeset	1101 return introrev
40047 50700a025953 context: reverse conditional branch order in introrev Boris Feld <boris.feld@octobus.net> parents: 40046 diff changeset	1102 else:
23703 aaa76612b3c0 linkrev: introduce an 'introrev' method on filectx Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	1103 return self.linkrev()
aaa76612b3c0 linkrev: introduce an 'introrev' method on filectx Pierre-Yves David <pierre-yves.david@fb.com> parents: 23702 diff changeset	1104
35280 d90c534099b1 filectx: extract helper method to obtain filectx pointing to its introrev Yuya Nishihara <yuya@tcha.org> parents: 35130 diff changeset	1105 def introfilectx(self):
d90c534099b1 filectx: extract helper method to obtain filectx pointing to its introrev Yuya Nishihara <yuya@tcha.org> parents: 35130 diff changeset	1106 """Return filectx having identical contents, but pointing to the
d90c534099b1 filectx: extract helper method to obtain filectx pointing to its introrev Yuya Nishihara <yuya@tcha.org> parents: 35130 diff changeset	1107 changeset revision where this filectx was introduced"""
d90c534099b1 filectx: extract helper method to obtain filectx pointing to its introrev Yuya Nishihara <yuya@tcha.org> parents: 35130 diff changeset	1108 introrev = self.introrev()
d90c534099b1 filectx: extract helper method to obtain filectx pointing to its introrev Yuya Nishihara <yuya@tcha.org> parents: 35130 diff changeset	1109 if self.rev() == introrev:
d90c534099b1 filectx: extract helper method to obtain filectx pointing to its introrev Yuya Nishihara <yuya@tcha.org> parents: 35130 diff changeset	1110 return self
d90c534099b1 filectx: extract helper method to obtain filectx pointing to its introrev Yuya Nishihara <yuya@tcha.org> parents: 35130 diff changeset	1111 return self.filectx(self.filenode(), changeid=introrev)
d90c534099b1 filectx: extract helper method to obtain filectx pointing to its introrev Yuya Nishihara <yuya@tcha.org> parents: 35130 diff changeset	1112
24816 8eec040cb65e filectx: extract function to create parent fctx keeping ancestry info Yuya Nishihara <yuya@tcha.org> parents: 24815 diff changeset	1113 def _parentfilectx(self, path, fileid, filelog):
8eec040cb65e filectx: extract function to create parent fctx keeping ancestry info Yuya Nishihara <yuya@tcha.org> parents: 24815 diff changeset	1114 """create parent filectx keeping ancestry info for _adjustlinkrev()"""
8eec040cb65e filectx: extract function to create parent fctx keeping ancestry info Yuya Nishihara <yuya@tcha.org> parents: 24815 diff changeset	1115 fctx = filectx(self._repo, path, fileid=fileid, filelog=filelog)
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43551 diff changeset	1116 if '_changeid' in vars(self) or '_changectx' in vars(self):
24816 8eec040cb65e filectx: extract function to create parent fctx keeping ancestry info Yuya Nishihara <yuya@tcha.org> parents: 24815 diff changeset	1117 # If self is associated with a changeset (probably explicitly
8eec040cb65e filectx: extract function to create parent fctx keeping ancestry info Yuya Nishihara <yuya@tcha.org> parents: 24815 diff changeset	1118 # fed), ensure the created filectx is associated with a
8eec040cb65e filectx: extract function to create parent fctx keeping ancestry info Yuya Nishihara <yuya@tcha.org> parents: 24815 diff changeset	1119 # changeset that is an ancestor of self.changectx.
8eec040cb65e filectx: extract function to create parent fctx keeping ancestry info Yuya Nishihara <yuya@tcha.org> parents: 24815 diff changeset	1120 # This lets us later use _adjustlinkrev to get a correct link.
8eec040cb65e filectx: extract function to create parent fctx keeping ancestry info Yuya Nishihara <yuya@tcha.org> parents: 24815 diff changeset	1121 fctx._descendantrev = self.rev()
8eec040cb65e filectx: extract function to create parent fctx keeping ancestry info Yuya Nishihara <yuya@tcha.org> parents: 24815 diff changeset	1122 fctx._ancestrycontext = getattr(self, '_ancestrycontext', None)
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43551 diff changeset	1123 elif '_descendantrev' in vars(self):
24816 8eec040cb65e filectx: extract function to create parent fctx keeping ancestry info Yuya Nishihara <yuya@tcha.org> parents: 24815 diff changeset	1124 # Otherwise propagate _descendantrev if we have one associated.
8eec040cb65e filectx: extract function to create parent fctx keeping ancestry info Yuya Nishihara <yuya@tcha.org> parents: 24815 diff changeset	1125 fctx._descendantrev = self._descendantrev
8eec040cb65e filectx: extract function to create parent fctx keeping ancestry info Yuya Nishihara <yuya@tcha.org> parents: 24815 diff changeset	1126 fctx._ancestrycontext = getattr(self, '_ancestrycontext', None)
8eec040cb65e filectx: extract function to create parent fctx keeping ancestry info Yuya Nishihara <yuya@tcha.org> parents: 24815 diff changeset	1127 return fctx
8eec040cb65e filectx: extract function to create parent fctx keeping ancestry info Yuya Nishihara <yuya@tcha.org> parents: 24815 diff changeset	1128
19605 cf7322cb1c13 basefilectx: move parents from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19604 diff changeset	1129 def parents(self):
22201 269688a398c4 cleanup: fix some list comprehension redefinitions of existing vars Mads Kiilerich <madski@unity3d.com> parents: 22192 diff changeset	1130 _path = self._path
19605 cf7322cb1c13 basefilectx: move parents from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19604 diff changeset	1131 fl = self._filelog
23688 20932983d520 filectx.parents: filter nullrev parent sooner Pierre-Yves David <pierre-yves.david@fb.com> parents: 23687 diff changeset	1132 parents = self._filelog.parents(self._filenode)
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	1133 pl = [
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	1134 (_path, node, fl)
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	1135 for node in parents
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	1136 if node != self._repo.nodeconstants.nullid
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	1137 ]
19605 cf7322cb1c13 basefilectx: move parents from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19604 diff changeset	1138
23702 c48924787eaa filectx.parents: enforce changeid of parent to be in own changectx ancestors Pierre-Yves David <pierre-yves.david@fb.com> parents: 23701 diff changeset	1139 r = fl.renamed(self._filenode)
19605 cf7322cb1c13 basefilectx: move parents from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19604 diff changeset	1140 if r:
23688 20932983d520 filectx.parents: filter nullrev parent sooner Pierre-Yves David <pierre-yves.david@fb.com> parents: 23687 diff changeset	1141 # - In the simple rename case, both parent are nullid, pl is empty.
20932983d520 filectx.parents: filter nullrev parent sooner Pierre-Yves David <pierre-yves.david@fb.com> parents: 23687 diff changeset	1142 # - In case of merge, only one of the parent is null id and should
20932983d520 filectx.parents: filter nullrev parent sooner Pierre-Yves David <pierre-yves.david@fb.com> parents: 23687 diff changeset	1143 # be replaced with the rename information. This parent is -always-
20932983d520 filectx.parents: filter nullrev parent sooner Pierre-Yves David <pierre-yves.david@fb.com> parents: 23687 diff changeset	1144 # the first one.
20932983d520 filectx.parents: filter nullrev parent sooner Pierre-Yves David <pierre-yves.david@fb.com> parents: 23687 diff changeset	1145 #
24180 d8e0c591781c spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 24050 diff changeset	1146 # As null id have always been filtered out in the previous list
23688 20932983d520 filectx.parents: filter nullrev parent sooner Pierre-Yves David <pierre-yves.david@fb.com> parents: 23687 diff changeset	1147 # comprehension, inserting to 0 will always result in "replacing
20932983d520 filectx.parents: filter nullrev parent sooner Pierre-Yves David <pierre-yves.david@fb.com> parents: 23687 diff changeset	1148 # first nullid parent with rename information.
23699 fe17a6fb220d filectx.parents: also fetch the filelog of rename source too Pierre-Yves David <pierre-yves.david@fb.com> parents: 23688 diff changeset	1149 pl.insert(0, (r[0], r[1], self._repo.file(r[0])))
19605 cf7322cb1c13 basefilectx: move parents from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19604 diff changeset	1150
24816 8eec040cb65e filectx: extract function to create parent fctx keeping ancestry info Yuya Nishihara <yuya@tcha.org> parents: 24815 diff changeset	1151 return [self._parentfilectx(path, fnode, l) for path, fnode, l in pl]
19605 cf7322cb1c13 basefilectx: move parents from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19604 diff changeset	1152
19606 284f91230c07 basefilectx: move p1 from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19605 diff changeset	1153 def p1(self):
284f91230c07 basefilectx: move p1 from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19605 diff changeset	1154 return self.parents()[0]
284f91230c07 basefilectx: move p1 from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19605 diff changeset	1155
19607 056a949799ac basefilectx: move p2 from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19606 diff changeset	1156 def p2(self):
056a949799ac basefilectx: move p2 from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19606 diff changeset	1157 p = self.parents()
056a949799ac basefilectx: move p2 from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19606 diff changeset	1158 if len(p) == 2:
056a949799ac basefilectx: move p2 from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19606 diff changeset	1159 return p[1]
056a949799ac basefilectx: move p2 from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19606 diff changeset	1160 return filectx(self._repo, self._path, fileid=-1, filelog=self._filelog)
056a949799ac basefilectx: move p2 from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19606 diff changeset	1161
37068 b235bde38a83 annotate: drop linenumber flag from fctx.annotate() (API) Yuya Nishihara <yuya@tcha.org> parents: 36924 diff changeset	1162 def annotate(self, follow=False, skiprevs=None, diffopts=None):
37069 b33b91ca2ec2 annotate: pack line content into annotateline object (API) Yuya Nishihara <yuya@tcha.org> parents: 37068 diff changeset	1163 """Returns a list of annotateline objects for each line in the file
b33b91ca2ec2 annotate: pack line content into annotateline object (API) Yuya Nishihara <yuya@tcha.org> parents: 37068 diff changeset	1164
b33b91ca2ec2 annotate: pack line content into annotateline object (API) Yuya Nishihara <yuya@tcha.org> parents: 37068 diff changeset	1165 - line.fctx is the filectx of the node where that line was last changed
b33b91ca2ec2 annotate: pack line content into annotateline object (API) Yuya Nishihara <yuya@tcha.org> parents: 37068 diff changeset	1166 - line.lineno is the line number at the first appearance in the managed
37068 b235bde38a83 annotate: drop linenumber flag from fctx.annotate() (API) Yuya Nishihara <yuya@tcha.org> parents: 36924 diff changeset	1167 file
37069 b33b91ca2ec2 annotate: pack line content into annotateline object (API) Yuya Nishihara <yuya@tcha.org> parents: 37068 diff changeset	1168 - line.text is the data on that line (including newline character)
37068 b235bde38a83 annotate: drop linenumber flag from fctx.annotate() (API) Yuya Nishihara <yuya@tcha.org> parents: 36924 diff changeset	1169 """
9097 431462bd8478 fix memory usage of revlog caches by limiting cache size [issue1639] Matt Mackall <mpm@selenic.com> parents: 8813 diff changeset	1170 getlog = util.lrucachefunc(lambda x: self._repo.file(x))
3172 5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	1171
5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	1172 def parents(f):
24862 c82d88dfaf59 annotate: always adjust linkrev before walking down to parents (issue4623) Yuya Nishihara <yuya@tcha.org> parents: 24818 diff changeset	1173 # Cut _descendantrev here to mitigate the penalty of lazy linkrev
c82d88dfaf59 annotate: always adjust linkrev before walking down to parents (issue4623) Yuya Nishihara <yuya@tcha.org> parents: 24818 diff changeset	1174 # adjustment. Otherwise, p._adjustlinkrev() would walk changelog
c82d88dfaf59 annotate: always adjust linkrev before walking down to parents (issue4623) Yuya Nishihara <yuya@tcha.org> parents: 24818 diff changeset	1175 # from the topmost introrev (= srcrev) down to p.linkrev() if it
c82d88dfaf59 annotate: always adjust linkrev before walking down to parents (issue4623) Yuya Nishihara <yuya@tcha.org> parents: 24818 diff changeset	1176 # isn't an ancestor of the srcrev.
c82d88dfaf59 annotate: always adjust linkrev before walking down to parents (issue4623) Yuya Nishihara <yuya@tcha.org> parents: 24818 diff changeset	1177 f._changeid
19292 e0aa6fff8f02 annotate: simplify annotate parent function Durham Goode <durham@fb.com> parents: 19288 diff changeset	1178 pl = f.parents()
e0aa6fff8f02 annotate: simplify annotate parent function Durham Goode <durham@fb.com> parents: 19288 diff changeset	1179
e0aa6fff8f02 annotate: simplify annotate parent function Durham Goode <durham@fb.com> parents: 19288 diff changeset	1180 # Don't return renamed parents if we aren't following.
e0aa6fff8f02 annotate: simplify annotate parent function Durham Goode <durham@fb.com> parents: 19288 diff changeset	1181 if not follow:
e0aa6fff8f02 annotate: simplify annotate parent function Durham Goode <durham@fb.com> parents: 19288 diff changeset	1182 pl = [p for p in pl if p.path() == f.path()]
3172 5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	1183
19292 e0aa6fff8f02 annotate: simplify annotate parent function Durham Goode <durham@fb.com> parents: 19288 diff changeset	1184 # renamed filectx won't have a filelog yet, so set it
e0aa6fff8f02 annotate: simplify annotate parent function Durham Goode <durham@fb.com> parents: 19288 diff changeset	1185 # from the cache to save time
e0aa6fff8f02 annotate: simplify annotate parent function Durham Goode <durham@fb.com> parents: 19288 diff changeset	1186 for p in pl:
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43551 diff changeset	1187 if not '_filelog' in p.__dict__:
19292 e0aa6fff8f02 annotate: simplify annotate parent function Durham Goode <durham@fb.com> parents: 19288 diff changeset	1188 p._filelog = getlog(p.path())
3146 e69a0cbe268e filectx.annotate: return filectx for each line instead of rev Brendan Cully <brendan@kublai.com> parents: 3144 diff changeset	1189
19292 e0aa6fff8f02 annotate: simplify annotate parent function Durham Goode <durham@fb.com> parents: 19288 diff changeset	1190 return pl
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	1191
3404 1a437b0f4902 Fix annotate where linkrev != rev without exporting linkrev Brendan Cully <brendan@kublai.com> parents: 3403 diff changeset	1192 # use linkrev to find the first changeset where self appeared
35280 d90c534099b1 filectx: extract helper method to obtain filectx pointing to its introrev Yuya Nishihara <yuya@tcha.org> parents: 35130 diff changeset	1193 base = self.introfilectx()
24818 8d7d0bf62f9f annotate: prepare ancestry context of workingfilectx Yuya Nishihara <yuya@tcha.org> parents: 24817 diff changeset	1194 if getattr(base, '_ancestrycontext', None) is None:
44108 c472970339d2 changectx: use unfiltered changelog to walk ancestors in annotate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44104 diff changeset	1195 # it is safe to use an unfiltered repository here because we are
c472970339d2 changectx: use unfiltered changelog to walk ancestors in annotate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44104 diff changeset	1196 # walking ancestors only.
c472970339d2 changectx: use unfiltered changelog to walk ancestors in annotate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44104 diff changeset	1197 cl = self._repo.unfiltered().changelog
35280 d90c534099b1 filectx: extract helper method to obtain filectx pointing to its introrev Yuya Nishihara <yuya@tcha.org> parents: 35130 diff changeset	1198 if base.rev() is None:
24818 8d7d0bf62f9f annotate: prepare ancestry context of workingfilectx Yuya Nishihara <yuya@tcha.org> parents: 24817 diff changeset	1199 # wctx is not inclusive, but works because _ancestrycontext
8d7d0bf62f9f annotate: prepare ancestry context of workingfilectx Yuya Nishihara <yuya@tcha.org> parents: 24817 diff changeset	1200 # is used to test filelog revisions
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1201 ac = cl.ancestors(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1202 [p.rev() for p in base.parents()], inclusive=True
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1203 )
24818 8d7d0bf62f9f annotate: prepare ancestry context of workingfilectx Yuya Nishihara <yuya@tcha.org> parents: 24817 diff changeset	1204 else:
35280 d90c534099b1 filectx: extract helper method to obtain filectx pointing to its introrev Yuya Nishihara <yuya@tcha.org> parents: 35130 diff changeset	1205 ac = cl.ancestors([base.rev()], inclusive=True)
24407 dd01834a696f annotate: reuse ancestry context when adjusting linkrev (issue4532) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23984 diff changeset	1206 base._ancestrycontext = ac
3404 1a437b0f4902 Fix annotate where linkrev != rev without exporting linkrev Brendan Cully <brendan@kublai.com> parents: 3403 diff changeset	1207
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1208 return dagop.annotate(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1209 base, parents, skiprevs=skiprevs, diffopts=diffopts
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1210 )
3124 4d021b91cb26 filectx: allow passing filelog in init to avoid opening new filelogs Matt Mackall <mpm@selenic.com> parents: 3123 diff changeset	1211
19610 0670422d58c6 basefilectx: move ancestors from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19609 diff changeset	1212 def ancestors(self, followfirst=False):
0670422d58c6 basefilectx: move ancestors from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19609 diff changeset	1213 visit = {}
0670422d58c6 basefilectx: move ancestors from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19609 diff changeset	1214 c = self
24306 6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24300 diff changeset	1215 if followfirst:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24300 diff changeset	1216 cut = 1
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24300 diff changeset	1217 else:
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24300 diff changeset	1218 cut = None
6ddc86eedc3b style: kill ersatz if-else ternary operators Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 24300 diff changeset	1219
19610 0670422d58c6 basefilectx: move ancestors from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19609 diff changeset	1220 while True:
0670422d58c6 basefilectx: move ancestors from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19609 diff changeset	1221 for parent in c.parents()[:cut]:
23981 24b57c3899f8 filectx: use linkrev to sort ancestors Matt Mackall <mpm@selenic.com> parents: 23980 diff changeset	1222 visit[(parent.linkrev(), parent.filenode())] = parent
19610 0670422d58c6 basefilectx: move ancestors from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19609 diff changeset	1223 if not visit:
0670422d58c6 basefilectx: move ancestors from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19609 diff changeset	1224 break
0670422d58c6 basefilectx: move ancestors from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19609 diff changeset	1225 c = visit.pop(max(visit))
0670422d58c6 basefilectx: move ancestors from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19609 diff changeset	1226 yield c
0670422d58c6 basefilectx: move ancestors from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19609 diff changeset	1227
33919 f488223a87ab context: add `decodeddata()` to basefilectx Phil Cohen <phillco@fb.com> parents: 33818 diff changeset	1228 def decodeddata(self):
f488223a87ab context: add `decodeddata()` to basefilectx Phil Cohen <phillco@fb.com> parents: 33818 diff changeset	1229 """Returns `data()` after running repository decoding filters.
f488223a87ab context: add `decodeddata()` to basefilectx Phil Cohen <phillco@fb.com> parents: 33818 diff changeset	1230
f488223a87ab context: add `decodeddata()` to basefilectx Phil Cohen <phillco@fb.com> parents: 33818 diff changeset	1231 This is often equivalent to how the data would be expressed on disk.
f488223a87ab context: add `decodeddata()` to basefilectx Phil Cohen <phillco@fb.com> parents: 33818 diff changeset	1232 """
f488223a87ab context: add `decodeddata()` to basefilectx Phil Cohen <phillco@fb.com> parents: 33818 diff changeset	1233 return self._repo.wwritedata(self.path(), self.data())
f488223a87ab context: add `decodeddata()` to basefilectx Phil Cohen <phillco@fb.com> parents: 33818 diff changeset	1234
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1235
19608 896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1236 class filectx(basefilectx):
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1237 """A filecontext object makes access to data related to a particular
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45911 diff changeset	1238 filerevision convenient."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1239
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1240 def __init__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1241 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1242 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1243 path,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1244 changeid=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1245 fileid=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1246 filelog=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1247 changectx=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1248 ):
40063 b6c2543e1dd8 filectx: correct docstring about "changeid" Martin von Zweigbergk <martinvonz@google.com> parents: 40062 diff changeset	1249 """changeid must be a revision number, if specified.
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45911 diff changeset	1250 fileid can be a file revision or node."""
19608 896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1251 self._repo = repo
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1252 self._path = path
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1253
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1254 assert (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1255 changeid is not None or fileid is not None or changectx is not None
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45911 diff changeset	1256 ), b"bad args: changeid=%r, fileid=%r, changectx=%r" % (
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45911 diff changeset	1257 changeid,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45911 diff changeset	1258 fileid,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45911 diff changeset	1259 changectx,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1260 )
19608 896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1261
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1262 if filelog is not None:
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1263 self._filelog = filelog
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1264
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1265 if changeid is not None:
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1266 self._changeid = changeid
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1267 if changectx is not None:
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1268 self._changectx = changectx
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1269 if fileid is not None:
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1270 self._fileid = fileid
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1271
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1272 @propertycache
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1273 def _changectx(self):
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1274 try:
39958 e1e3d1b498d3 context: reduce dependence of changectx constructor Martin von Zweigbergk <martinvonz@google.com> parents: 39912 diff changeset	1275 return self._repo[self._changeid]
23687 8f32dcfbc338 context: catch FilteredRepoLookupError instead of RepoLookupError Pierre-Yves David <pierre-yves.david@fb.com> parents: 23616 diff changeset	1276 except error.FilteredRepoLookupError:
19608 896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1277 # Linkrev may point to any revision in the repository. When the
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1278 # repository is filtered this may lead to `filectx` trying to build
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1279 # `changectx` for filtered revision. In such case we fallback to
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1280 # creating `changectx` on the unfiltered version of the reposition.
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1281 # This fallback should not be an issue because `changectx` from
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1282 # `filectx` are not used in complex operations that care about
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1283 # filtering.
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1284 #
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1285 # This fallback is a cheap and dirty fix that prevent several
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1286 # crashes. It does not ensure the behavior is correct. However the
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1287 # behavior was not correct before filtering either and "incorrect
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1288 # behavior" is seen as better as "crash"
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1289 #
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1290 # Linkrevs have several serious troubles with filtering that are
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1291 # complicated to solve. Proper handling of the issue here should be
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1292 # considered when solving linkrev issue are on the table.
39958 e1e3d1b498d3 context: reduce dependence of changectx constructor Martin von Zweigbergk <martinvonz@google.com> parents: 39912 diff changeset	1293 return self._repo.unfiltered()[self._changeid]
19608 896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1294
23770 50f0096a7346 filectx: fix annotate to not directly instantiate filectx Durham Goode <durham@fb.com> parents: 23757 diff changeset	1295 def filectx(self, fileid, changeid=None):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45911 diff changeset	1296 """opens an arbitrary revision of the file without
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45911 diff changeset	1297 opening a new filelog"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1298 return filectx(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1299 self._repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1300 self._path,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1301 fileid=fileid,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1302 filelog=self._filelog,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1303 changeid=changeid,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1304 )
19608 896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1305
30743 2df983125d37 revlog: add 'raw' argument to revision and _addrevision Remi Chaintron <remi@fb.com> parents: 30718 diff changeset	1306 def rawdata(self):
42785 e75981b7ce84 rawdata: update callers in context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42731 diff changeset	1307 return self._filelog.rawdata(self._filenode)
30743 2df983125d37 revlog: add 'raw' argument to revision and _addrevision Remi Chaintron <remi@fb.com> parents: 30718 diff changeset	1308
32281 651ee1681964 filectx: add a rawflags method Jun Wu <quark@fb.com> parents: 32280 diff changeset	1309 def rawflags(self):
651ee1681964 filectx: add a rawflags method Jun Wu <quark@fb.com> parents: 32280 diff changeset	1310 """low-level revlog flags"""
651ee1681964 filectx: add a rawflags method Jun Wu <quark@fb.com> parents: 32280 diff changeset	1311 return self._filelog.flags(self._filerev)
651ee1681964 filectx: add a rawflags method Jun Wu <quark@fb.com> parents: 32280 diff changeset	1312
19608 896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1313 def data(self):
22932 d81792872984 context: handle censored data in an on-disk file context based on config Mike Edgar <adgar@google.com> parents: 22916 diff changeset	1314 try:
d81792872984 context: handle censored data in an on-disk file context based on config Mike Edgar <adgar@google.com> parents: 22916 diff changeset	1315 return self._filelog.read(self._filenode)
d81792872984 context: handle censored data in an on-disk file context based on config Mike Edgar <adgar@google.com> parents: 22916 diff changeset	1316 except error.CensoredNodeError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1317 if self._repo.ui.config(b"censor", b"policy") == b"ignore":
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1318 return b""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1319 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1320 _(b"censored node: %s") % short(self._filenode),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1321 hint=_(b"set censor.policy to ignore errors"),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1322 )
22932 d81792872984 context: handle censored data in an on-disk file context based on config Mike Edgar <adgar@google.com> parents: 22916 diff changeset	1323
19608 896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1324 def size(self):
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1325 return self._filelog.size(self._filerev)
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1326
32279 c38c15d4ce48 filectx: make renamed a property cache Jun Wu <quark@fb.com> parents: 32278 diff changeset	1327 @propertycache
c38c15d4ce48 filectx: make renamed a property cache Jun Wu <quark@fb.com> parents: 32278 diff changeset	1328 def _copied(self):
19608 896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1329 """check if file was actually renamed in this changeset revision
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1330
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1331 If rename logged in file revision, we report copy for changeset only
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1332 if file revisions linkrev points back to the changeset in question
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1333 or both changeset parents contain different file revisions.
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1334 """
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1335
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1336 renamed = self._filelog.renamed(self._filenode)
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1337 if not renamed:
39726 7375a9ab0149 filectx: fix return of renamed Sean Farley <sean@farley.io> parents: 39592 diff changeset	1338 return None
19608 896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1339
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1340 if self.rev() == self.linkrev():
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1341 return renamed
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1342
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1343 name = self.path()
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1344 fnode = self._filenode
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1345 for p in self._changectx.parents():
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1346 try:
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1347 if fnode == p.filenode(name):
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1348 return None
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1349 except error.LookupError:
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1350 pass
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1351 return renamed
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1352
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1353 def children(self):
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1354 # hard for renames
896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1355 c = self._filelog.children(self._filenode)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1356 return [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1357 filectx(self._repo, self._path, fileid=x, filelog=self._filelog)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1358 for x in c
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1359 ]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1360
19608 896193a9cab4 basefilectx: move annotate from filectx Sean Farley <sean.michael.farley@gmail.com> parents: 19607 diff changeset	1361
19733 51988f008df3 context: use correct spelling of committable Sean Farley <sean.michael.farley@gmail.com> parents: 19705 diff changeset	1362 class committablectx(basectx):
51988f008df3 context: use correct spelling of committable Sean Farley <sean.michael.farley@gmail.com> parents: 19705 diff changeset	1363 """A committablectx object provides common functionality for a context that
19664 61dcb2aa7378 commitablectx: add a class that will be used as a parent of mutable contexts Sean Farley <sean.michael.farley@gmail.com> parents: 19663 diff changeset	1364 wants the ability to commit, e.g. workingctx or memctx."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1365
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1366 def __init__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1367 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1368 repo,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1369 text=b"",
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1370 user=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1371 date=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1372 extra=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1373 changes=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1374 branch=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1375 ):
37177 fbe34945220d context: set repo property in basectx Martin von Zweigbergk <martinvonz@google.com> parents: 37176 diff changeset	1376 super(committablectx, self).__init__(repo)
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	1377 self._rev = None
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	1378 self._node = None
6709 f84f507c53d3 context: let workingctx.date(), .user() and description() be overriden Patrick Mezard <pmezard@gmail.com> parents: 6708 diff changeset	1379 self._text = text
6718 4386a7706828 Fix commit date (issue1193) Christian Ebert <blacktrash@gmx.net> parents: 6715 diff changeset	1380 if date:
36636 c6061cadb400 util: extract all date-related utils in utils/dateutil module Boris Feld <boris.feld@octobus.net> parents: 36441 diff changeset	1381 self._date = dateutil.parsedate(date)
6817 cf319797d61c minor status fixups Matt Mackall <mpm@selenic.com> parents: 6809 diff changeset	1382 if user:
cf319797d61c minor status fixups Matt Mackall <mpm@selenic.com> parents: 6809 diff changeset	1383 self._user = user
6707 02bad34230a2 localrepo: hide commit() file selection behind workingctx Patrick Mezard <pmezard@gmail.com> parents: 6705 diff changeset	1384 if changes:
21592 16f62b4203b1 committablectx: simplify caching the status Sean Farley <sean.michael.farley@gmail.com> parents: 21590 diff changeset	1385 self._status = changes
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	1386
6708 7566f00a3979 localrepo: let commit() get extra data from workingctx Patrick Mezard <pmezard@gmail.com> parents: 6707 diff changeset	1387 self._extra = {}
7566f00a3979 localrepo: let commit() get extra data from workingctx Patrick Mezard <pmezard@gmail.com> parents: 6707 diff changeset	1388 if extra:
7566f00a3979 localrepo: let commit() get extra data from workingctx Patrick Mezard <pmezard@gmail.com> parents: 6707 diff changeset	1389 self._extra = extra.copy()
42323 df2f22befdc8 context: let caller pass in branch to committablectx.__init__() Martin von Zweigbergk <martinvonz@google.com> parents: 42322 diff changeset	1390 if branch is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1391 self._extra[b'branch'] = encoding.fromlocal(branch)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1392 if not self._extra.get(b'branch'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1393 self._extra[b'branch'] = b'default'
6708 7566f00a3979 localrepo: let commit() get extra data from workingctx Patrick Mezard <pmezard@gmail.com> parents: 6707 diff changeset	1394
32666 1df98fc923d4 py3: implement __bytes__ for committablectx Pulkit Goyal <7895pulkit@gmail.com> parents: 32636 diff changeset	1395 def __bytes__(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1396 return bytes(self._parents[0]) + b"+"
19666 09459edfb48b commitablectx: move __str__ from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19665 diff changeset	1397
47202 b338d831d18c templates: fix `revset('parents()') % ...` in amend message template Martin von Zweigbergk <martinvonz@google.com> parents: 47055 diff changeset	1398 def hex(self):
b338d831d18c templates: fix `revset('parents()') % ...` in amend message template Martin von Zweigbergk <martinvonz@google.com> parents: 47055 diff changeset	1399 self._repo.nodeconstants.wdirhex
b338d831d18c templates: fix `revset('parents()') % ...` in amend message template Martin von Zweigbergk <martinvonz@google.com> parents: 47055 diff changeset	1400
33038 ce96efec8112 py3: add utility to forward __str__() to __bytes__() Yuya Nishihara <yuya@tcha.org> parents: 33035 diff changeset	1401 __str__ = encoding.strmethod(__bytes__)
ce96efec8112 py3: add utility to forward __str__() to __bytes__() Yuya Nishihara <yuya@tcha.org> parents: 33035 diff changeset	1402
19667 40040e4015f9 commitablectx: move __nonzero__ from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19666 diff changeset	1403 def __nonzero__(self):
40040e4015f9 commitablectx: move __nonzero__ from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19666 diff changeset	1404 return True
40040e4015f9 commitablectx: move __nonzero__ from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19666 diff changeset	1405
31483 413b44003462 py3: add __bool__ to every class defining __nonzero__ Gregory Szorc <gregory.szorc@gmail.com> parents: 31473 diff changeset	1406 __bool__ = __nonzero__
413b44003462 py3: add __bool__ to every class defining __nonzero__ Gregory Szorc <gregory.szorc@gmail.com> parents: 31473 diff changeset	1407
15337 cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	1408 @propertycache
19672 375986c02539 commitablectx: move _status from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19671 diff changeset	1409 def _status(self):
21592 16f62b4203b1 committablectx: simplify caching the status Sean Farley <sean.michael.farley@gmail.com> parents: 21590 diff changeset	1410 return self._repo.status()
19672 375986c02539 commitablectx: move _status from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19671 diff changeset	1411
19674 ec5b2e2b947f commitablectx: move _user from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19673 diff changeset	1412 @propertycache
ec5b2e2b947f commitablectx: move _user from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19673 diff changeset	1413 def _user(self):
ec5b2e2b947f commitablectx: move _user from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19673 diff changeset	1414 return self._repo.ui.username()
ec5b2e2b947f commitablectx: move _user from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19673 diff changeset	1415
19676 103525f36337 commitablectx: move _date from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19675 diff changeset	1416 @propertycache
103525f36337 commitablectx: move _date from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19675 diff changeset	1417 def _date(self):
32447 3e2e179ef031 devel: add a config field to force dates to timestamp 0 Boris Feld <boris.feld@octobus.net> parents: 32439 diff changeset	1418 ui = self._repo.ui
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1419 date = ui.configdate(b'devel', b'default-date')
32447 3e2e179ef031 devel: add a config field to force dates to timestamp 0 Boris Feld <boris.feld@octobus.net> parents: 32439 diff changeset	1420 if date is None:
36636 c6061cadb400 util: extract all date-related utils in utils/dateutil module Boris Feld <boris.feld@octobus.net> parents: 36441 diff changeset	1421 date = dateutil.makedate()
32447 3e2e179ef031 devel: add a config field to force dates to timestamp 0 Boris Feld <boris.feld@octobus.net> parents: 32439 diff changeset	1422 return date
19676 103525f36337 commitablectx: move _date from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19675 diff changeset	1423
21587 02a8612ddec2 committablectx: add subrev method to return None Sean Farley <sean.michael.farley@gmail.com> parents: 21586 diff changeset	1424 def subrev(self, subpath):
02a8612ddec2 committablectx: add subrev method to return None Sean Farley <sean.michael.farley@gmail.com> parents: 21586 diff changeset	1425 return None
02a8612ddec2 committablectx: add subrev method to return None Sean Farley <sean.michael.farley@gmail.com> parents: 21586 diff changeset	1426
24719 11e8fec00234 committablectx: override manifestnode() to return None Yuya Nishihara <yuya@tcha.org> parents: 24646 diff changeset	1427 def manifestnode(self):
11e8fec00234 committablectx: override manifestnode() to return None Yuya Nishihara <yuya@tcha.org> parents: 24646 diff changeset	1428 return None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1429
19675 84249d49f37c commitablectx: move user from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19674 diff changeset	1430 def user(self):
84249d49f37c commitablectx: move user from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19674 diff changeset	1431 return self._user or self._repo.ui.username()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1432
19677 e11415510352 commitablectx: move date from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19676 diff changeset	1433 def date(self):
e11415510352 commitablectx: move date from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19676 diff changeset	1434 return self._date
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1435
19678 897c2dbc0256 commitablectx: move description from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19677 diff changeset	1436 def description(self):
897c2dbc0256 commitablectx: move description from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19677 diff changeset	1437 return self._text
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1438
19679 f21804f1582e commitablectx: move files from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19678 diff changeset	1439 def files(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1440 return sorted(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1441 self._status.modified + self._status.added + self._status.removed
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1442 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1443
41798 2ba96fca8528 committablectx: move status-related methods closer together Martin von Zweigbergk <martinvonz@google.com> parents: 41785 diff changeset	1444 def modified(self):
2ba96fca8528 committablectx: move status-related methods closer together Martin von Zweigbergk <martinvonz@google.com> parents: 41785 diff changeset	1445 return self._status.modified
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1446
41798 2ba96fca8528 committablectx: move status-related methods closer together Martin von Zweigbergk <martinvonz@google.com> parents: 41785 diff changeset	1447 def added(self):
2ba96fca8528 committablectx: move status-related methods closer together Martin von Zweigbergk <martinvonz@google.com> parents: 41785 diff changeset	1448 return self._status.added
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1449
41798 2ba96fca8528 committablectx: move status-related methods closer together Martin von Zweigbergk <martinvonz@google.com> parents: 41785 diff changeset	1450 def removed(self):
2ba96fca8528 committablectx: move status-related methods closer together Martin von Zweigbergk <martinvonz@google.com> parents: 41785 diff changeset	1451 return self._status.removed
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1452
41798 2ba96fca8528 committablectx: move status-related methods closer together Martin von Zweigbergk <martinvonz@google.com> parents: 41785 diff changeset	1453 def deleted(self):
2ba96fca8528 committablectx: move status-related methods closer together Martin von Zweigbergk <martinvonz@google.com> parents: 41785 diff changeset	1454 return self._status.deleted
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1455
42396 65fa61ca20af context: add ctx.files{modified,added,removed}() methods Martin von Zweigbergk <martinvonz@google.com> parents: 42345 diff changeset	1456 filesmodified = modified
65fa61ca20af context: add ctx.files{modified,added,removed}() methods Martin von Zweigbergk <martinvonz@google.com> parents: 42345 diff changeset	1457 filesadded = added
65fa61ca20af context: add ctx.files{modified,added,removed}() methods Martin von Zweigbergk <martinvonz@google.com> parents: 42345 diff changeset	1458 filesremoved = removed
65fa61ca20af context: add ctx.files{modified,added,removed}() methods Martin von Zweigbergk <martinvonz@google.com> parents: 42345 diff changeset	1459
19687 54b3b4821bfb commitablectx: move branch from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19686 diff changeset	1460 def branch(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1461 return encoding.tolocal(self._extra[b'branch'])
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1462
19688 21e1068109a7 commitablectx: move closesbranch from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19687 diff changeset	1463 def closesbranch(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1464 return b'close' in self._extra
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1465
19689 8dbb66f339f3 commitablectx: move extra from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19688 diff changeset	1466 def extra(self):
8dbb66f339f3 commitablectx: move extra from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19688 diff changeset	1467 return self._extra
19680 fc33fcfa08f2 commitablectx: move modified from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19679 diff changeset	1468
34681 4dc8a2ee0f4f context: add is `isinmemory()` to filectx Phil Cohen <phillco@fb.com> parents: 34556 diff changeset	1469 def isinmemory(self):
4dc8a2ee0f4f context: add is `isinmemory()` to filectx Phil Cohen <phillco@fb.com> parents: 34556 diff changeset	1470 return False
4dc8a2ee0f4f context: add is `isinmemory()` to filectx Phil Cohen <phillco@fb.com> parents: 34556 diff changeset	1471
19690 65ff9fd67d8d commitablectx: move tags from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19689 diff changeset	1472 def tags(self):
25688 24cda1dd45ff workingctx: don't report the tags for its parents Matt Harbison <matt_harbison@yahoo.com> parents: 25660 diff changeset	1473 return []
19690 65ff9fd67d8d commitablectx: move tags from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19689 diff changeset	1474
19691 33ae2052d924 commitablectx: move bookmarks from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19690 diff changeset	1475 def bookmarks(self):
33ae2052d924 commitablectx: move bookmarks from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19690 diff changeset	1476 b = []
33ae2052d924 commitablectx: move bookmarks from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19690 diff changeset	1477 for p in self.parents():
33ae2052d924 commitablectx: move bookmarks from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19690 diff changeset	1478 b.extend(p.bookmarks())
33ae2052d924 commitablectx: move bookmarks from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19690 diff changeset	1479 return b
33ae2052d924 commitablectx: move bookmarks from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19690 diff changeset	1480
19692 594f4d2b0ce9 commitablectx: move phase from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19691 diff changeset	1481 def phase(self):
43968 bbcf78c4ff90 commitablectx: fix the default phase Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43807 diff changeset	1482 phase = phases.newcommitphase(self._repo.ui)
19692 594f4d2b0ce9 commitablectx: move phase from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19691 diff changeset	1483 for p in self.parents():
594f4d2b0ce9 commitablectx: move phase from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19691 diff changeset	1484 phase = max(phase, p.phase())
594f4d2b0ce9 commitablectx: move phase from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19691 diff changeset	1485 return phase
594f4d2b0ce9 commitablectx: move phase from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19691 diff changeset	1486
19693 56ba14d4bc02 commitablectx: move hidden from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19692 diff changeset	1487 def hidden(self):
56ba14d4bc02 commitablectx: move hidden from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19692 diff changeset	1488 return False
56ba14d4bc02 commitablectx: move hidden from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19692 diff changeset	1489
19694 ba4c01c34df9 commitablectx: move children from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19693 diff changeset	1490 def children(self):
ba4c01c34df9 commitablectx: move children from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19693 diff changeset	1491 return []
ba4c01c34df9 commitablectx: move children from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19693 diff changeset	1492
44791 4234c9af515d flags: read flag from dirstate/disk for workingcopyctx (issue5743) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44399 diff changeset	1493 def flags(self, path):
4234c9af515d flags: read flag from dirstate/disk for workingcopyctx (issue5743) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44399 diff changeset	1494 if '_manifest' in self.__dict__:
4234c9af515d flags: read flag from dirstate/disk for workingcopyctx (issue5743) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44399 diff changeset	1495 try:
4234c9af515d flags: read flag from dirstate/disk for workingcopyctx (issue5743) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44399 diff changeset	1496 return self._manifest.flags(path)
4234c9af515d flags: read flag from dirstate/disk for workingcopyctx (issue5743) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44399 diff changeset	1497 except KeyError:
4234c9af515d flags: read flag from dirstate/disk for workingcopyctx (issue5743) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44399 diff changeset	1498 return b''
4234c9af515d flags: read flag from dirstate/disk for workingcopyctx (issue5743) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44399 diff changeset	1499
4234c9af515d flags: read flag from dirstate/disk for workingcopyctx (issue5743) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44399 diff changeset	1500 try:
4234c9af515d flags: read flag from dirstate/disk for workingcopyctx (issue5743) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44399 diff changeset	1501 return self._flagfunc(path)
4234c9af515d flags: read flag from dirstate/disk for workingcopyctx (issue5743) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44399 diff changeset	1502 except OSError:
4234c9af515d flags: read flag from dirstate/disk for workingcopyctx (issue5743) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44399 diff changeset	1503 return b''
4234c9af515d flags: read flag from dirstate/disk for workingcopyctx (issue5743) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44399 diff changeset	1504
19696 210cc42a8ac2 commitablectx: move ancestor from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19695 diff changeset	1505 def ancestor(self, c2):
22389 94f77624dbb5 comments: describe ancestor consistently - avoid 'least common ancestor' Mads Kiilerich <madski@unity3d.com> parents: 22313 diff changeset	1506 """return the "best" ancestor context of self and c2"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1507 return self._parents[0].ancestor(c2) # punt on two parents for now
19696 210cc42a8ac2 commitablectx: move ancestor from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19695 diff changeset	1508
19698 8d4a8f4eb404 commitablectx: move ancestors from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19697 diff changeset	1509 def ancestors(self):
23616 11a160547d7f context: return dirstate parents in workingctx.ancestors() Durham Goode <durham@fb.com> parents: 23603 diff changeset	1510 for p in self._parents:
11a160547d7f context: return dirstate parents in workingctx.ancestors() Durham Goode <durham@fb.com> parents: 23603 diff changeset	1511 yield p
19698 8d4a8f4eb404 commitablectx: move ancestors from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19697 diff changeset	1512 for a in self._repo.changelog.ancestors(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1513 [p.rev() for p in self._parents]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1514 ):
39958 e1e3d1b498d3 context: reduce dependence of changectx constructor Martin von Zweigbergk <martinvonz@google.com> parents: 39912 diff changeset	1515 yield self._repo[a]
19698 8d4a8f4eb404 commitablectx: move ancestors from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19697 diff changeset	1516
19699 9fbc193b2358 commitablectx: move markcommitted from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19698 diff changeset	1517 def markcommitted(self, node):
9fbc193b2358 commitablectx: move markcommitted from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19698 diff changeset	1518 """Perform post-commit cleanup necessary after committing this ctx
9fbc193b2358 commitablectx: move markcommitted from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19698 diff changeset	1519
9fbc193b2358 commitablectx: move markcommitted from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19698 diff changeset	1520 Specifically, this updates backing stores this working context
9fbc193b2358 commitablectx: move markcommitted from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19698 diff changeset	1521 wraps to reflect the fact that the changes reflected by this
9fbc193b2358 commitablectx: move markcommitted from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19698 diff changeset	1522 workingctx have been committed. For example, it marks
9fbc193b2358 commitablectx: move markcommitted from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19698 diff changeset	1523 modified and added files as normal in the dirstate.
9fbc193b2358 commitablectx: move markcommitted from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19698 diff changeset	1524
9fbc193b2358 commitablectx: move markcommitted from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19698 diff changeset	1525 """
9fbc193b2358 commitablectx: move markcommitted from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19698 diff changeset	1526
32633 bf728e72a219 context: move dirty() to committablectx Sean Farley <sean@farley.io> parents: 32632 diff changeset	1527 def dirty(self, missing=False, merge=True, branch=True):
bf728e72a219 context: move dirty() to committablectx Sean Farley <sean@farley.io> parents: 32632 diff changeset	1528 return False
bf728e72a219 context: move dirty() to committablectx Sean Farley <sean@farley.io> parents: 32632 diff changeset	1529
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1530
19733 51988f008df3 context: use correct spelling of committable Sean Farley <sean.michael.farley@gmail.com> parents: 19705 diff changeset	1531 class workingctx(committablectx):
19671 367e95bba6e8 commitablectx: move _manifest from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19670 diff changeset	1532 """A workingctx object makes access to data related to
367e95bba6e8 commitablectx: move _manifest from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19670 diff changeset	1533 the current working directory convenient.
367e95bba6e8 commitablectx: move _manifest from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19670 diff changeset	1534 date - any valid date string or (unixtime, offset), or None.
367e95bba6e8 commitablectx: move _manifest from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19670 diff changeset	1535 user - username string, or None.
367e95bba6e8 commitablectx: move _manifest from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19670 diff changeset	1536 extra - a dictionary of extra values, or None.
367e95bba6e8 commitablectx: move _manifest from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19670 diff changeset	1537 changes - a list of file lists as returned by localrepo.status()
367e95bba6e8 commitablectx: move _manifest from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19670 diff changeset	1538 or None to use the repository status.
367e95bba6e8 commitablectx: move _manifest from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19670 diff changeset	1539 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1540
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1541 def __init__(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1542 self, repo, text=b"", user=None, date=None, extra=None, changes=None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1543 ):
42324 62bb49a1d05d context: default to using branch from dirstate only in workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42323 diff changeset	1544 branch = None
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1545 if not extra or b'branch' not in extra:
42324 62bb49a1d05d context: default to using branch from dirstate only in workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42323 diff changeset	1546 try:
62bb49a1d05d context: default to using branch from dirstate only in workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42323 diff changeset	1547 branch = repo.dirstate.branch()
62bb49a1d05d context: default to using branch from dirstate only in workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42323 diff changeset	1548 except UnicodeDecodeError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1549 raise error.Abort(_(b'branch name not in UTF-8!'))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1550 super(workingctx, self).__init__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1551 repo, text, user, date, extra, changes, branch=branch
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1552 )
19671 367e95bba6e8 commitablectx: move _manifest from workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 19670 diff changeset	1553
14129 81e6d42b3228 context: provide an efficient iterator for workingctx Matt Mackall <mpm@selenic.com> parents: 14004 diff changeset	1554 def __iter__(self):
81e6d42b3228 context: provide an efficient iterator for workingctx Matt Mackall <mpm@selenic.com> parents: 14004 diff changeset	1555 d = self._repo.dirstate
81e6d42b3228 context: provide an efficient iterator for workingctx Matt Mackall <mpm@selenic.com> parents: 14004 diff changeset	1556 for f in d:
48106 3fe500d15e7c dirstate-item: use `tracked` instead of the `state` in context's iter Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48105 diff changeset	1557 if d.get_entry(f).tracked:
14129 81e6d42b3228 context: provide an efficient iterator for workingctx Matt Mackall <mpm@selenic.com> parents: 14004 diff changeset	1558 yield f
81e6d42b3228 context: provide an efficient iterator for workingctx Matt Mackall <mpm@selenic.com> parents: 14004 diff changeset	1559
21845 04f5b5e3792e committablectx: move __contains__ into workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 21844 diff changeset	1560 def __contains__(self, key):
48105 5437a0254590 dirstate-item: use `tracked` instead of the `state` in context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47745 diff changeset	1561 return self._repo.dirstate.get_entry(key).tracked
21845 04f5b5e3792e committablectx: move __contains__ into workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 21844 diff changeset	1562
25590 183965a00c76 context: override workingctx.hex() to avoid a crash Matt Harbison <matt_harbison@yahoo.com> parents: 25465 diff changeset	1563 def hex(self):
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	1564 return self._repo.nodeconstants.wdirhex
25590 183965a00c76 context: override workingctx.hex() to avoid a crash Matt Harbison <matt_harbison@yahoo.com> parents: 25465 diff changeset	1565
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	1566 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	1567 def _parents(self):
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	1568 p = self._repo.dirstate.parents()
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	1569 if p[1] == self._repo.nodeconstants.nullid:
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	1570 p = p[:-1]
39960 43d3b09b3e5a repo: move unfiltered-repo optimization to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 39959 diff changeset	1571 # use unfiltered repo to delay/avoid loading obsmarkers
43d3b09b3e5a repo: move unfiltered-repo optimization to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 39959 diff changeset	1572 unfi = self._repo.unfiltered()
43787 f3b23d5c15fd changectx: mark the parents of the working copy as non filtered Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43784 diff changeset	1573 return [
f3b23d5c15fd changectx: mark the parents of the working copy as non filtered Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43784 diff changeset	1574 changectx(
f3b23d5c15fd changectx: mark the parents of the working copy as non filtered Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43784 diff changeset	1575 self._repo, unfi.changelog.rev(n), n, maybe_filtered=False
f3b23d5c15fd changectx: mark the parents of the working copy as non filtered Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43784 diff changeset	1576 )
f3b23d5c15fd changectx: mark the parents of the working copy as non filtered Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43784 diff changeset	1577 for n in p
f3b23d5c15fd changectx: mark the parents of the working copy as non filtered Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43784 diff changeset	1578 ]
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	1579
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	1580 def setparents(self, p1node, p2node=None):
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	1581 if p2node is None:
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	1582 p2node = self._repo.nodeconstants.nullid
44052 b74270da5eee workingctx: move setparents() logic from localrepo to mirror overlayworkingctx Martin von Zweigbergk <martinvonz@google.com> parents: 44051 diff changeset	1583 dirstate = self._repo.dirstate
b74270da5eee workingctx: move setparents() logic from localrepo to mirror overlayworkingctx Martin von Zweigbergk <martinvonz@google.com> parents: 44051 diff changeset	1584 with dirstate.parentchange():
b74270da5eee workingctx: move setparents() logic from localrepo to mirror overlayworkingctx Martin von Zweigbergk <martinvonz@google.com> parents: 44051 diff changeset	1585 copies = dirstate.setparents(p1node, p2node)
b74270da5eee workingctx: move setparents() logic from localrepo to mirror overlayworkingctx Martin von Zweigbergk <martinvonz@google.com> parents: 44051 diff changeset	1586 pctx = self._repo[p1node]
b74270da5eee workingctx: move setparents() logic from localrepo to mirror overlayworkingctx Martin von Zweigbergk <martinvonz@google.com> parents: 44051 diff changeset	1587 if copies:
b74270da5eee workingctx: move setparents() logic from localrepo to mirror overlayworkingctx Martin von Zweigbergk <martinvonz@google.com> parents: 44051 diff changeset	1588 # Adjust copy records, the dirstate cannot do it, it
b74270da5eee workingctx: move setparents() logic from localrepo to mirror overlayworkingctx Martin von Zweigbergk <martinvonz@google.com> parents: 44051 diff changeset	1589 # requires access to parents manifests. Preserve them
b74270da5eee workingctx: move setparents() logic from localrepo to mirror overlayworkingctx Martin von Zweigbergk <martinvonz@google.com> parents: 44051 diff changeset	1590 # only for entries added to first parent.
b74270da5eee workingctx: move setparents() logic from localrepo to mirror overlayworkingctx Martin von Zweigbergk <martinvonz@google.com> parents: 44051 diff changeset	1591 for f in copies:
b74270da5eee workingctx: move setparents() logic from localrepo to mirror overlayworkingctx Martin von Zweigbergk <martinvonz@google.com> parents: 44051 diff changeset	1592 if f not in pctx and copies[f] in pctx:
b74270da5eee workingctx: move setparents() logic from localrepo to mirror overlayworkingctx Martin von Zweigbergk <martinvonz@google.com> parents: 44051 diff changeset	1593 dirstate.copy(copies[f], f)
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	1594 if p2node == self._repo.nodeconstants.nullid:
44052 b74270da5eee workingctx: move setparents() logic from localrepo to mirror overlayworkingctx Martin von Zweigbergk <martinvonz@google.com> parents: 44051 diff changeset	1595 for f, s in sorted(dirstate.copies().items()):
b74270da5eee workingctx: move setparents() logic from localrepo to mirror overlayworkingctx Martin von Zweigbergk <martinvonz@google.com> parents: 44051 diff changeset	1596 if f not in pctx and s not in pctx:
b74270da5eee workingctx: move setparents() logic from localrepo to mirror overlayworkingctx Martin von Zweigbergk <martinvonz@google.com> parents: 44051 diff changeset	1597 dirstate.copy(None, f)
b74270da5eee workingctx: move setparents() logic from localrepo to mirror overlayworkingctx Martin von Zweigbergk <martinvonz@google.com> parents: 44051 diff changeset	1598
37447 067e8d1178a2 workingctx: build _manifest on filenode() or flags() request Yuya Nishihara <yuya@tcha.org> parents: 37391 diff changeset	1599 def _fileinfo(self, path):
067e8d1178a2 workingctx: build _manifest on filenode() or flags() request Yuya Nishihara <yuya@tcha.org> parents: 37391 diff changeset	1600 # populate __dict__['_manifest'] as workingctx has no _manifestdelta
067e8d1178a2 workingctx: build _manifest on filenode() or flags() request Yuya Nishihara <yuya@tcha.org> parents: 37391 diff changeset	1601 self._manifest
067e8d1178a2 workingctx: build _manifest on filenode() or flags() request Yuya Nishihara <yuya@tcha.org> parents: 37391 diff changeset	1602 return super(workingctx, self)._fileinfo(path)
067e8d1178a2 workingctx: build _manifest on filenode() or flags() request Yuya Nishihara <yuya@tcha.org> parents: 37391 diff changeset	1603
42319 491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1604 def _buildflagfunc(self):
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1605 # Create a fallback function for getting file flags when the
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1606 # filesystem doesn't support them
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1607
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1608 copiesget = self._repo.dirstate.copies().get
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1609 parents = self.parents()
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1610 if len(parents) < 2:
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1611 # when we have one parent, it's easy: copy from parent
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1612 man = parents[0].manifest()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1613
42319 491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1614 def func(f):
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1615 f = copiesget(f, f)
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1616 return man.flags(f)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1617
42319 491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1618 else:
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1619 # merges are tricky: we try to reconstruct the unstored
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1620 # result from the merge (issue1802)
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1621 p1, p2 = parents
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1622 pa = p1.ancestor(p2)
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1623 m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest()
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1624
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1625 def func(f):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1626 f = copiesget(f, f) # may be wrong for merges with copies
42319 491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1627 fl1, fl2, fla = m1.flags(f), m2.flags(f), ma.flags(f)
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1628 if fl1 == fl2:
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1629 return fl1
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1630 if fl1 == fla:
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1631 return fl2
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1632 if fl2 == fla:
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1633 return fl1
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1634 return b'' # punt for conflicts
42319 491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1635
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1636 return func
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1637
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1638 @propertycache
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1639 def _flagfunc(self):
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1640 return self._repo.dirstate.flagfunc(self._buildflagfunc)
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1641
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1642 def flags(self, path):
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1643 try:
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1644 return self._flagfunc(path)
491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1645 except OSError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1646 return b''
42319 491855ea9d62 context: move flags overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42318 diff changeset	1647
3966 b4eaa68dea1b context: create a filectxt with filelog reuse Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3965 diff changeset	1648 def filectx(self, path, filelog=None):
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	1649 """get a file context from the working directory"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1650 return workingfilectx(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1651 self._repo, path, workingctx=self, filelog=filelog
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1652 )
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	1653
16491 bfe89d65d651 update: make --check abort with dirty subrepos Patrick Mezard <patrick@mezard.eu> parents: 16410 diff changeset	1654 def dirty(self, missing=False, merge=True, branch=True):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43787 diff changeset	1655 """check whether a working directory is modified"""
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: 11106 diff changeset	1656 # check subrepos first
18364 6252b4f1c4b4 subrepos: process subrepos in sorted order Mads Kiilerich <mads@kiilerich.com> parents: 18252 diff changeset	1657 for s in sorted(self.substate):
33364 bf2daeddd42b subrepo: consider the parent repo dirty when a file is missing Matt Harbison <matt_harbison@yahoo.com> parents: 33353 diff changeset	1658 if self.sub(s).dirty(missing=missing):
11110 22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: 11106 diff changeset	1659 return True
22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: 11106 diff changeset	1660 # check current working dir
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1661 return (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1662 (merge and self.p2())
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1663 or (branch and self.branch() != self.p1().branch())
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1664 or self.modified()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1665 or self.added()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1666 or self.removed()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1667 or (missing and self.deleted())
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1668 )
8717 e8de59577257 context: add a dirty method to detect modified contexts Matt Mackall <mpm@selenic.com> parents: 8528 diff changeset	1669
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1670 def add(self, list, prefix=b""):
27809 37a75d69eb43 with: use context manager for wlock in workingctx.add Bryan O'Sullivan <bryano@fb.com> parents: 27749 diff changeset	1671 with self._repo.wlock():
37a75d69eb43 with: use context manager for wlock in workingctx.add Bryan O'Sullivan <bryano@fb.com> parents: 27749 diff changeset	1672 ui, ds = self._repo.ui, self._repo.dirstate
33501 7008f6819002 context: name files relative to cwd in warning messages Matt Harbison <matt_harbison@yahoo.com> parents: 33499 diff changeset	1673 uipath = lambda f: ds.pathto(pathutil.join(prefix, f))
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	1674 rejected = []
19900 7c21e3398931 context: use "vfs.lstat()" instead of "os.lstat()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19734 diff changeset	1675 lstat = self._repo.wvfs.lstat
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	1676 for f in list:
33501 7008f6819002 context: name files relative to cwd in warning messages Matt Harbison <matt_harbison@yahoo.com> parents: 33499 diff changeset	1677 # ds.pathto() returns an absolute file when this is invoked from
7008f6819002 context: name files relative to cwd in warning messages Matt Harbison <matt_harbison@yahoo.com> parents: 33499 diff changeset	1678 # the keyword extension. That gets flagged as non-portable on
7008f6819002 context: name files relative to cwd in warning messages Matt Harbison <matt_harbison@yahoo.com> parents: 33499 diff changeset	1679 # Windows, since it contains the drive letter and colon.
7008f6819002 context: name files relative to cwd in warning messages Matt Harbison <matt_harbison@yahoo.com> parents: 33499 diff changeset	1680 scmutil.checkportable(ui, os.path.join(prefix, f))
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	1681 try:
19900 7c21e3398931 context: use "vfs.lstat()" instead of "os.lstat()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19734 diff changeset	1682 st = lstat(f)
14004 97ed99d1f419 eliminate various naked except clauses Idan Kamara <idankk86@gmail.com> parents: 13962 diff changeset	1683 except OSError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1684 ui.warn(_(b"%s does not exist!\n") % uipath(f))
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	1685 rejected.append(f)
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	1686 continue
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1687 limit = ui.configbytes(b'ui', b'large-file-limit')
38601 a936d1368fc5 ui: make the large file warning limit fully configurable Joerg Sonnenberger <joerg@bec.de> parents: 38590 diff changeset	1688 if limit != 0 and st.st_size > limit:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1689 ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1690 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1691 b"%s: up to %d MB of RAM may be required "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1692 b"to manage this file\n"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1693 b"(use 'hg revert %s' to cancel the "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1694 b"pending addition)\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1695 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1696 % (f, 3 * st.st_size // 1000000, uipath(f))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1697 )
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	1698 if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1699 ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1700 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1701 b"%s not added: only files and symlinks "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1702 b"supported currently\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1703 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1704 % uipath(f)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1705 )
19900 7c21e3398931 context: use "vfs.lstat()" instead of "os.lstat()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19734 diff changeset	1706 rejected.append(f)
47594 0cef28b121a4 context: use `dirstate.set_tracked` in `context.add` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47356 diff changeset	1707 elif not ds.set_tracked(f):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1708 ui.warn(_(b"%s already tracked!\n") % uipath(f))
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	1709 return rejected
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	1710
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1711 def forget(self, files, prefix=b""):
27810 8c81975fe145 with: use context manager for wlock in workingctx.forget Bryan O'Sullivan <bryano@fb.com> parents: 27809 diff changeset	1712 with self._repo.wlock():
33501 7008f6819002 context: name files relative to cwd in warning messages Matt Harbison <matt_harbison@yahoo.com> parents: 33499 diff changeset	1713 ds = self._repo.dirstate
7008f6819002 context: name files relative to cwd in warning messages Matt Harbison <matt_harbison@yahoo.com> parents: 33499 diff changeset	1714 uipath = lambda f: ds.pathto(pathutil.join(prefix, f))
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15895 diff changeset	1715 rejected = []
14435 5f6090e559fa context: make forget work like commands.forget Matt Mackall <mpm@selenic.com> parents: 14434 diff changeset	1716 for f in files:
47600 f636dfe83554 context: use `dirstate.set_untracked` in `context.forget` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47595 diff changeset	1717 if not ds.set_untracked(f):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1718 self._repo.ui.warn(_(b"%s not tracked!\n") % uipath(f))
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15895 diff changeset	1719 rejected.append(f)
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15895 diff changeset	1720 return rejected
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	1721
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	1722 def copy(self, source, dest):
19902 12a8bdd97b4f context: use "vfs.lstat()" to examine target path instead of "os.path." FUJIWARA Katsunori <foozy@lares.dti.ne.jp>* parents: 19901 diff changeset	1723 try:
12a8bdd97b4f context: use "vfs.lstat()" to examine target path instead of "os.path." FUJIWARA Katsunori <foozy@lares.dti.ne.jp>* parents: 19901 diff changeset	1724 st = self._repo.wvfs.lstat(dest)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25600 diff changeset	1725 except OSError as err:
19902 12a8bdd97b4f context: use "vfs.lstat()" to examine target path instead of "os.path." FUJIWARA Katsunori <foozy@lares.dti.ne.jp>* parents: 19901 diff changeset	1726 if err.errno != errno.ENOENT:
12a8bdd97b4f context: use "vfs.lstat()" to examine target path instead of "os.path." FUJIWARA Katsunori <foozy@lares.dti.ne.jp>* parents: 19901 diff changeset	1727 raise
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1728 self._repo.ui.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1729 _(b"%s does not exist!\n") % self._repo.dirstate.pathto(dest)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1730 )
19902 12a8bdd97b4f context: use "vfs.lstat()" to examine target path instead of "os.path." FUJIWARA Katsunori <foozy@lares.dti.ne.jp>* parents: 19901 diff changeset	1731 return
12a8bdd97b4f context: use "vfs.lstat()" to examine target path instead of "os.path." FUJIWARA Katsunori <foozy@lares.dti.ne.jp>* parents: 19901 diff changeset	1732 if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1733 self._repo.ui.warn(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	1734 _(b"copy failed: %s is not a file or a symbolic link\n")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1735 % self._repo.dirstate.pathto(dest)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1736 )
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	1737 else:
27812 28d0c0ef327b with: use context manager for wlock in copy Bryan O'Sullivan <bryano@fb.com> parents: 27811 diff changeset	1738 with self._repo.wlock():
41625 fbd4ce55bcbd context: replace repeated "self._repo.dirstate" by "ds" variable Martin von Zweigbergk <martinvonz@google.com> parents: 41624 diff changeset	1739 ds = self._repo.dirstate
47595 14e2f4bd5f16 context: use `dirstate.set_tracked` in context.copy Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47594 diff changeset	1740 ds.set_tracked(dest)
41625 fbd4ce55bcbd context: replace repeated "self._repo.dirstate" by "ds" variable Martin von Zweigbergk <martinvonz@google.com> parents: 41624 diff changeset	1741 ds.copy(source, dest)
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	1742
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1743 def match(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1744 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1745 pats=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1746 include=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1747 exclude=None,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1748 default=b'glob',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1749 listsubrepos=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1750 badfn=None,
44012 e685fac56693 match: resolve filesets against the passed `cwd`, not the current one Matt Harbison <matt_harbison@yahoo.com> parents: 43968 diff changeset	1751 cwd=None,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1752 ):
24790 baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns Matt Harbison <matt_harbison@yahoo.com> parents: 24776 diff changeset	1753 r = self._repo
44012 e685fac56693 match: resolve filesets against the passed `cwd`, not the current one Matt Harbison <matt_harbison@yahoo.com> parents: 43968 diff changeset	1754 if not cwd:
e685fac56693 match: resolve filesets against the passed `cwd`, not the current one Matt Harbison <matt_harbison@yahoo.com> parents: 43968 diff changeset	1755 cwd = r.getcwd()
24790 baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns Matt Harbison <matt_harbison@yahoo.com> parents: 24776 diff changeset	1756
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns Matt Harbison <matt_harbison@yahoo.com> parents: 24776 diff changeset	1757 # Only a case insensitive filesystem needs magic to translate user input
baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns Matt Harbison <matt_harbison@yahoo.com> parents: 24776 diff changeset	1758 # to actual case in the filesystem.
32439 284b18303f61 match: replace icasefsmatch() function by flag to regular match() Martin von Zweigbergk <martinvonz@google.com> parents: 32433 diff changeset	1759 icasefs = not util.fscasesensitive(r.root)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1760 return matchmod.match(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1761 r.root,
44012 e685fac56693 match: resolve filesets against the passed `cwd`, not the current one Matt Harbison <matt_harbison@yahoo.com> parents: 43968 diff changeset	1762 cwd,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1763 pats,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1764 include,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1765 exclude,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1766 default,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1767 auditor=r.auditor,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1768 ctx=self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1769 listsubrepos=listsubrepos,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1770 badfn=badfn,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1771 icasefs=icasefs,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1772 )
24790 baa11dde8c0e match: add a subclass for dirstate normalizing of the matched patterns Matt Harbison <matt_harbison@yahoo.com> parents: 24776 diff changeset	1773
21393 a45af4da0421 localrepo: move symlink logic to workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 21238 diff changeset	1774 def _filtersuspectsymlink(self, files):
a45af4da0421 localrepo: move symlink logic to workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 21238 diff changeset	1775 if not files or self._repo.dirstate._checklink:
a45af4da0421 localrepo: move symlink logic to workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 21238 diff changeset	1776 return files
a45af4da0421 localrepo: move symlink logic to workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 21238 diff changeset	1777
a45af4da0421 localrepo: move symlink logic to workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 21238 diff changeset	1778 # Symlink placeholders may get non-symlink-like contents
a45af4da0421 localrepo: move symlink logic to workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 21238 diff changeset	1779 # via user error or dereferencing by NFS or Samba servers,
a45af4da0421 localrepo: move symlink logic to workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 21238 diff changeset	1780 # so we filter out any placeholders that don't look like a
a45af4da0421 localrepo: move symlink logic to workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 21238 diff changeset	1781 # symlink
a45af4da0421 localrepo: move symlink logic to workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 21238 diff changeset	1782 sane = []
a45af4da0421 localrepo: move symlink logic to workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 21238 diff changeset	1783 for f in files:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1784 if self.flags(f) == b'l':
21393 a45af4da0421 localrepo: move symlink logic to workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 21238 diff changeset	1785 d = self[f].data()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1786 if (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1787 d == b''
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1788 or len(d) >= 1024
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1789 or b'\n' in d
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1790 or stringutil.binary(d)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1791 ):
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1792 self._repo.ui.debug(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	1793 b'ignoring suspect symlink placeholder "%s"\n' % f
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1794 )
21393 a45af4da0421 localrepo: move symlink logic to workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 21238 diff changeset	1795 continue
a45af4da0421 localrepo: move symlink logic to workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 21238 diff changeset	1796 sane.append(f)
a45af4da0421 localrepo: move symlink logic to workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 21238 diff changeset	1797 return sane
a45af4da0421 localrepo: move symlink logic to workingctx Sean Farley <sean.michael.farley@gmail.com> parents: 21238 diff changeset	1798
21395 f251b92d9ed9 localrepo: factor out parentworking logic for comparing files Sean Farley <sean.michael.farley@gmail.com> parents: 21393 diff changeset	1799 def _checklookup(self, files):
f251b92d9ed9 localrepo: factor out parentworking logic for comparing files Sean Farley <sean.michael.farley@gmail.com> parents: 21393 diff changeset	1800 # check for any possibly clean files
f251b92d9ed9 localrepo: factor out parentworking logic for comparing files Sean Farley <sean.michael.farley@gmail.com> parents: 21393 diff changeset	1801 if not files:
32141 c850f0ed54c1 status: don't crash if a lookup file disappears Siddharth Agarwal <sid0@fb.com> parents: 32069 diff changeset	1802 return [], [], []
21395 f251b92d9ed9 localrepo: factor out parentworking logic for comparing files Sean Farley <sean.michael.farley@gmail.com> parents: 21393 diff changeset	1803
f251b92d9ed9 localrepo: factor out parentworking logic for comparing files Sean Farley <sean.michael.farley@gmail.com> parents: 21393 diff changeset	1804 modified = []
32141 c850f0ed54c1 status: don't crash if a lookup file disappears Siddharth Agarwal <sid0@fb.com> parents: 32069 diff changeset	1805 deleted = []
21395 f251b92d9ed9 localrepo: factor out parentworking logic for comparing files Sean Farley <sean.michael.farley@gmail.com> parents: 21393 diff changeset	1806 fixup = []
f251b92d9ed9 localrepo: factor out parentworking logic for comparing files Sean Farley <sean.michael.farley@gmail.com> parents: 21393 diff changeset	1807 pctx = self._parents[0]
f251b92d9ed9 localrepo: factor out parentworking logic for comparing files Sean Farley <sean.michael.farley@gmail.com> parents: 21393 diff changeset	1808 # do a full compare of any files that might have changed
f251b92d9ed9 localrepo: factor out parentworking logic for comparing files Sean Farley <sean.michael.farley@gmail.com> parents: 21393 diff changeset	1809 for f in sorted(files):
32141 c850f0ed54c1 status: don't crash if a lookup file disappears Siddharth Agarwal <sid0@fb.com> parents: 32069 diff changeset	1810 try:
c850f0ed54c1 status: don't crash if a lookup file disappears Siddharth Agarwal <sid0@fb.com> parents: 32069 diff changeset	1811 # This will return True for a file that got replaced by a
c850f0ed54c1 status: don't crash if a lookup file disappears Siddharth Agarwal <sid0@fb.com> parents: 32069 diff changeset	1812 # directory in the interim, but fixing that is pretty hard.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1813 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1814 f not in pctx
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1815 or self.flags(f) != pctx.flags(f)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1816 or pctx[f].cmp(self[f])
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1817 ):
32141 c850f0ed54c1 status: don't crash if a lookup file disappears Siddharth Agarwal <sid0@fb.com> parents: 32069 diff changeset	1818 modified.append(f)
c850f0ed54c1 status: don't crash if a lookup file disappears Siddharth Agarwal <sid0@fb.com> parents: 32069 diff changeset	1819 else:
48429 41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	1820 # XXX note that we have a race windows here since we gather
41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	1821 # the stats after we compared so the file might have
41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	1822 # changed.
41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	1823 #
41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	1824 # However this have always been the case and the
41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	1825 # refactoring moving the code here is improving the
41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	1826 # situation by narrowing the race and moving the two steps
41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	1827 # (comparison + stat) in the same location.
41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	1828 #
41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	1829 # Making this code "correct" is now possible.
41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	1830 s = self[f].lstat()
41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	1831 mode = s.st_mode
41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	1832 size = s.st_size
41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	1833 mtime = timestamp.mtime_of(s)
41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	1834 fixup.append((f, (mode, size, mtime)))
32141 c850f0ed54c1 status: don't crash if a lookup file disappears Siddharth Agarwal <sid0@fb.com> parents: 32069 diff changeset	1835 except (IOError, OSError):
c850f0ed54c1 status: don't crash if a lookup file disappears Siddharth Agarwal <sid0@fb.com> parents: 32069 diff changeset	1836 # A file become inaccessible in between? Mark it as deleted,
c850f0ed54c1 status: don't crash if a lookup file disappears Siddharth Agarwal <sid0@fb.com> parents: 32069 diff changeset	1837 # matching dirstate behavior (issue5584).
c850f0ed54c1 status: don't crash if a lookup file disappears Siddharth Agarwal <sid0@fb.com> parents: 32069 diff changeset	1838 # The dirstate has more complex behavior around whether a
c850f0ed54c1 status: don't crash if a lookup file disappears Siddharth Agarwal <sid0@fb.com> parents: 32069 diff changeset	1839 # missing file matches a directory, etc, but we don't need to
c850f0ed54c1 status: don't crash if a lookup file disappears Siddharth Agarwal <sid0@fb.com> parents: 32069 diff changeset	1840 # bother with that: if f has made it to this point, we're sure
c850f0ed54c1 status: don't crash if a lookup file disappears Siddharth Agarwal <sid0@fb.com> parents: 32069 diff changeset	1841 # it's in the dirstate.
c850f0ed54c1 status: don't crash if a lookup file disappears Siddharth Agarwal <sid0@fb.com> parents: 32069 diff changeset	1842 deleted.append(f)
21395 f251b92d9ed9 localrepo: factor out parentworking logic for comparing files Sean Farley <sean.michael.farley@gmail.com> parents: 21393 diff changeset	1843
32831 add613cddcb6 workingctx: factor out post-status dirstate fixup Siddharth Agarwal <sid0@fb.com> parents: 32801 diff changeset	1844 return modified, deleted, fixup
add613cddcb6 workingctx: factor out post-status dirstate fixup Siddharth Agarwal <sid0@fb.com> parents: 32801 diff changeset	1845
32832 6d73b7ff8f92 workingctx: also pass status tuple into poststatusfixup Siddharth Agarwal <sid0@fb.com> parents: 32831 diff changeset	1846 def _poststatusfixup(self, status, fixup):
32831 add613cddcb6 workingctx: factor out post-status dirstate fixup Siddharth Agarwal <sid0@fb.com> parents: 32801 diff changeset	1847 """update dirstate for files that are actually clean"""
32833 2083d1643d69 workingctx: add a way for extensions to run code at status fixup time Siddharth Agarwal <sid0@fb.com> parents: 32832 diff changeset	1848 poststatus = self._repo.postdsstatus()
47356 04d1f17f49e7 dirstate-v2: Write .hg/dirstate back to disk on directory cache changes Simon Sapin <simon.sapin@octobus.net> parents: 47202 diff changeset	1849 if fixup or poststatus or self._repo.dirstate._dirty:
21395 f251b92d9ed9 localrepo: factor out parentworking logic for comparing files Sean Farley <sean.michael.farley@gmail.com> parents: 21393 diff changeset	1850 try:
32772 dc7efa2826e4 context: avoid writing outdated dirstate out (issue5584) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32748 diff changeset	1851 oldid = self._repo.dirstate.identity()
dc7efa2826e4 context: avoid writing outdated dirstate out (issue5584) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32748 diff changeset	1852
21395 f251b92d9ed9 localrepo: factor out parentworking logic for comparing files Sean Farley <sean.michael.farley@gmail.com> parents: 21393 diff changeset	1853 # updating the dirstate is optional
f251b92d9ed9 localrepo: factor out parentworking logic for comparing files Sean Farley <sean.michael.farley@gmail.com> parents: 21393 diff changeset	1854 # so we don't wait on the lock
21990 48e32c2c499b context: call normal on the right object Siddharth Agarwal <sid0@fb.com> parents: 21973 diff changeset	1855 # wlock can invalidate the dirstate, so cache normal _after_
48e32c2c499b context: call normal on the right object Siddharth Agarwal <sid0@fb.com> parents: 21973 diff changeset	1856 # taking the lock
27813 ff20fe74e5c6 with: use context manager for wlock in checklookup Bryan O'Sullivan <bryano@fb.com> parents: 27812 diff changeset	1857 with self._repo.wlock(False):
47705 6975cef3add1 context: use new API instead of `normal` during fixup post status Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47605 diff changeset	1858 dirstate = self._repo.dirstate
6975cef3add1 context: use new API instead of `normal` during fixup post status Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47605 diff changeset	1859 if dirstate.identity() == oldid:
32833 2083d1643d69 workingctx: add a way for extensions to run code at status fixup time Siddharth Agarwal <sid0@fb.com> parents: 32832 diff changeset	1860 if fixup:
47705 6975cef3add1 context: use new API instead of `normal` during fixup post status Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47605 diff changeset	1861 if dirstate.pendingparentchange():
48429 41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	1862 normal = lambda f, pfd: dirstate.update_file(
47705 6975cef3add1 context: use new API instead of `normal` during fixup post status Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47605 diff changeset	1863 f, p1_tracked=True, wc_tracked=True
6975cef3add1 context: use new API instead of `normal` during fixup post status Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47605 diff changeset	1864 )
6975cef3add1 context: use new API instead of `normal` during fixup post status Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47605 diff changeset	1865 else:
6975cef3add1 context: use new API instead of `normal` during fixup post status Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47605 diff changeset	1866 normal = dirstate.set_clean
48429 41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	1867 for f, pdf in fixup:
41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	1868 normal(f, pdf)
32833 2083d1643d69 workingctx: add a way for extensions to run code at status fixup time Siddharth Agarwal <sid0@fb.com> parents: 32832 diff changeset	1869 # write changes out explicitly, because nesting
2083d1643d69 workingctx: add a way for extensions to run code at status fixup time Siddharth Agarwal <sid0@fb.com> parents: 32832 diff changeset	1870 # wlock at runtime may prevent 'wlock.release()'
2083d1643d69 workingctx: add a way for extensions to run code at status fixup time Siddharth Agarwal <sid0@fb.com> parents: 32832 diff changeset	1871 # after this block from doing so for subsequent
2083d1643d69 workingctx: add a way for extensions to run code at status fixup time Siddharth Agarwal <sid0@fb.com> parents: 32832 diff changeset	1872 # changing files
2083d1643d69 workingctx: add a way for extensions to run code at status fixup time Siddharth Agarwal <sid0@fb.com> parents: 32832 diff changeset	1873 tr = self._repo.currenttransaction()
2083d1643d69 workingctx: add a way for extensions to run code at status fixup time Siddharth Agarwal <sid0@fb.com> parents: 32832 diff changeset	1874 self._repo.dirstate.write(tr)
2083d1643d69 workingctx: add a way for extensions to run code at status fixup time Siddharth Agarwal <sid0@fb.com> parents: 32832 diff changeset	1875
2083d1643d69 workingctx: add a way for extensions to run code at status fixup time Siddharth Agarwal <sid0@fb.com> parents: 32832 diff changeset	1876 if poststatus:
2083d1643d69 workingctx: add a way for extensions to run code at status fixup time Siddharth Agarwal <sid0@fb.com> parents: 32832 diff changeset	1877 for ps in poststatus:
2083d1643d69 workingctx: add a way for extensions to run code at status fixup time Siddharth Agarwal <sid0@fb.com> parents: 32832 diff changeset	1878 ps(self, status)
32772 dc7efa2826e4 context: avoid writing outdated dirstate out (issue5584) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32748 diff changeset	1879 else:
dc7efa2826e4 context: avoid writing outdated dirstate out (issue5584) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32748 diff changeset	1880 # in this case, writing changes out breaks
dc7efa2826e4 context: avoid writing outdated dirstate out (issue5584) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32748 diff changeset	1881 # consistency, because .hg/dirstate was
dc7efa2826e4 context: avoid writing outdated dirstate out (issue5584) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32748 diff changeset	1882 # already changed simultaneously after last
dc7efa2826e4 context: avoid writing outdated dirstate out (issue5584) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32748 diff changeset	1883 # caching (see also issue5584 for detail)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1884 self._repo.ui.debug(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	1885 b'skip updating dirstate: identity mismatch\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1886 )
21395 f251b92d9ed9 localrepo: factor out parentworking logic for comparing files Sean Farley <sean.michael.farley@gmail.com> parents: 21393 diff changeset	1887 except error.LockError:
f251b92d9ed9 localrepo: factor out parentworking logic for comparing files Sean Farley <sean.michael.farley@gmail.com> parents: 21393 diff changeset	1888 pass
32833 2083d1643d69 workingctx: add a way for extensions to run code at status fixup time Siddharth Agarwal <sid0@fb.com> parents: 32832 diff changeset	1889 finally:
2083d1643d69 workingctx: add a way for extensions to run code at status fixup time Siddharth Agarwal <sid0@fb.com> parents: 32832 diff changeset	1890 # Even if the wlock couldn't be grabbed, clear out the list.
2083d1643d69 workingctx: add a way for extensions to run code at status fixup time Siddharth Agarwal <sid0@fb.com> parents: 32832 diff changeset	1891 self._repo.clearpostdsstatus()
21395 f251b92d9ed9 localrepo: factor out parentworking logic for comparing files Sean Farley <sean.michael.farley@gmail.com> parents: 21393 diff changeset	1892
33955 e43264525ce5 context: remove unnecessary default values for matchers (API) Martin von Zweigbergk <martinvonz@google.com> parents: 33954 diff changeset	1893 def _dirstatestatus(self, match, ignored=False, clean=False, unknown=False):
21397 38743c59f3f8 context: add private _dirstatestatus method Sean Farley <sean.michael.farley@gmail.com> parents: 21396 diff changeset	1894 '''Gets the status from the dirstate -- internal use only.'''
38743c59f3f8 context: add private _dirstatestatus method Sean Farley <sean.michael.farley@gmail.com> parents: 21396 diff changeset	1895 subrepos = []
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1896 if b'.hgsub' in self:
21397 38743c59f3f8 context: add private _dirstatestatus method Sean Farley <sean.michael.farley@gmail.com> parents: 21396 diff changeset	1897 subrepos = sorted(self.substate)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1898 cmp, s = self._repo.dirstate.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1899 match, subrepos, ignored=ignored, clean=clean, unknown=unknown
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1900 )
21397 38743c59f3f8 context: add private _dirstatestatus method Sean Farley <sean.michael.farley@gmail.com> parents: 21396 diff changeset	1901
38743c59f3f8 context: add private _dirstatestatus method Sean Farley <sean.michael.farley@gmail.com> parents: 21396 diff changeset	1902 # check for any possibly clean files
32831 add613cddcb6 workingctx: factor out post-status dirstate fixup Siddharth Agarwal <sid0@fb.com> parents: 32801 diff changeset	1903 fixup = []
21397 38743c59f3f8 context: add private _dirstatestatus method Sean Farley <sean.michael.farley@gmail.com> parents: 21396 diff changeset	1904 if cmp:
32141 c850f0ed54c1 status: don't crash if a lookup file disappears Siddharth Agarwal <sid0@fb.com> parents: 32069 diff changeset	1905 modified2, deleted2, fixup = self._checklookup(cmp)
23303 3f269bd4826c context.status: avoid de- and reconstructing status tuple Martin von Zweigbergk <martinvonz@google.com> parents: 23302 diff changeset	1906 s.modified.extend(modified2)
32141 c850f0ed54c1 status: don't crash if a lookup file disappears Siddharth Agarwal <sid0@fb.com> parents: 32069 diff changeset	1907 s.deleted.extend(deleted2)
21397 38743c59f3f8 context: add private _dirstatestatus method Sean Farley <sean.michael.farley@gmail.com> parents: 21396 diff changeset	1908
34351 ac0cd81e2f83 dirstate: use keyword arguments to clarify status()'s callers Martin von Zweigbergk <martinvonz@google.com> parents: 34350 diff changeset	1909 if fixup and clean:
48429 41f40f35278a status: gather fixup info at comparison time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48107 diff changeset	1910 s.clean.extend((f for f, _ in fixup))
21397 38743c59f3f8 context: add private _dirstatestatus method Sean Farley <sean.michael.farley@gmail.com> parents: 21396 diff changeset	1911
32832 6d73b7ff8f92 workingctx: also pass status tuple into poststatusfixup Siddharth Agarwal <sid0@fb.com> parents: 32831 diff changeset	1912 self._poststatusfixup(s, fixup)
32831 add613cddcb6 workingctx: factor out post-status dirstate fixup Siddharth Agarwal <sid0@fb.com> parents: 32801 diff changeset	1913
23776 70bf92b87410 status: cache dirstate status in _dirstatestatus() Martin von Zweigbergk <martinvonz@google.com> parents: 23770 diff changeset	1914 if match.always():
70bf92b87410 status: cache dirstate status in _dirstatestatus() Martin von Zweigbergk <martinvonz@google.com> parents: 23770 diff changeset	1915 # cache for performance
70bf92b87410 status: cache dirstate status in _dirstatestatus() Martin von Zweigbergk <martinvonz@google.com> parents: 23770 diff changeset	1916 if s.unknown or s.ignored or s.clean:
70bf92b87410 status: cache dirstate status in _dirstatestatus() Martin von Zweigbergk <martinvonz@google.com> parents: 23770 diff changeset	1917 # "_status" is cached with list*=False in the normal route
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1918 self._status = scmutil.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1919 s.modified, s.added, s.removed, s.deleted, [], [], []
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1920 )
23776 70bf92b87410 status: cache dirstate status in _dirstatestatus() Martin von Zweigbergk <martinvonz@google.com> parents: 23770 diff changeset	1921 else:
70bf92b87410 status: cache dirstate status in _dirstatestatus() Martin von Zweigbergk <martinvonz@google.com> parents: 23770 diff changeset	1922 self._status = s
70bf92b87410 status: cache dirstate status in _dirstatestatus() Martin von Zweigbergk <martinvonz@google.com> parents: 23770 diff changeset	1923
23303 3f269bd4826c context.status: avoid de- and reconstructing status tuple Martin von Zweigbergk <martinvonz@google.com> parents: 23302 diff changeset	1924 return s
21397 38743c59f3f8 context: add private _dirstatestatus method Sean Farley <sean.michael.farley@gmail.com> parents: 21396 diff changeset	1925
31269 6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1926 @propertycache
42318 a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	1927 def _copies(self):
a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	1928 p1copies = {}
a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	1929 p2copies = {}
a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	1930 parents = self._repo.dirstate.parents()
a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	1931 p1manifest = self._repo[parents[0]].manifest()
a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	1932 p2manifest = self._repo[parents[1]].manifest()
42865 2b869a515ba6 context: filter out invalid copies from workingctx.p[12]copies() Martin von Zweigbergk <martinvonz@google.com> parents: 42785 diff changeset	1933 changedset = set(self.added()) \| set(self.modified())
42318 a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	1934 narrowmatch = self._repo.narrowmatch()
a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	1935 for dst, src in self._repo.dirstate.copies().items():
42865 2b869a515ba6 context: filter out invalid copies from workingctx.p[12]copies() Martin von Zweigbergk <martinvonz@google.com> parents: 42785 diff changeset	1936 if dst not in changedset or not narrowmatch(dst):
42318 a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	1937 continue
a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	1938 if src in p1manifest:
a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	1939 p1copies[dst] = src
a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	1940 elif src in p2manifest:
a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	1941 p2copies[dst] = src
a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	1942 return p1copies, p2copies
a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	1943
a13b30555ffb context: reuse changectx._copies() in all but workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42317 diff changeset	1944 @propertycache
31269 6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1945 def _manifest(self):
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1946 """generate a manifest corresponding to the values in self._status
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1947
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1948 This reuse the file nodeid from parent, but we use special node
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1949 identifiers for added and modified files. This is used by manifests
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1950 merge to see that files are different and by update logic to avoid
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1951 deleting newly added files.
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1952 """
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1953 return self._buildstatusmanifest(self._status)
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1954
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1955 def _buildstatusmanifest(self, status):
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1956 """Builds a manifest that includes the given status results."""
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1957 parents = self.parents()
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1958
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1959 man = parents[0].manifest().copy()
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1960
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1961 ff = self._flagfunc
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1962 for i, l in (
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	1963 (self._repo.nodeconstants.addednodeid, status.added),
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	1964 (self._repo.nodeconstants.modifiednodeid, status.modified),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1965 ):
31269 6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1966 for f in l:
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1967 man[f] = i
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1968 try:
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1969 man.setflag(f, ff(f))
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1970 except OSError:
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1971 pass
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1972
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1973 for f in status.deleted + status.removed:
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1974 if f in man:
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1975 del man[f]
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1976
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1977 return man
6a9d0d24fdb4 context: move _manifest from committablectx to workingctx Durham Goode <durham@fb.com> parents: 31268 diff changeset	1978
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1979 def _buildstatus(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1980 self, other, s, match, listignored, listclean, listunknown
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1981 ):
21480 d19f491e5d5b workingctx: use inheritance for _buildstatus while keeping the fastpath Sean Farley <sean.michael.farley@gmail.com> parents: 21477 diff changeset	1982 """build a status with respect to another context
d19f491e5d5b workingctx: use inheritance for _buildstatus while keeping the fastpath Sean Farley <sean.michael.farley@gmail.com> parents: 21477 diff changeset	1983
d19f491e5d5b workingctx: use inheritance for _buildstatus while keeping the fastpath Sean Farley <sean.michael.farley@gmail.com> parents: 21477 diff changeset	1984 This includes logic for maintaining the fast path of status when
d19f491e5d5b workingctx: use inheritance for _buildstatus while keeping the fastpath Sean Farley <sean.michael.farley@gmail.com> parents: 21477 diff changeset	1985 comparing the working directory against its parent, which is to skip
d19f491e5d5b workingctx: use inheritance for _buildstatus while keeping the fastpath Sean Farley <sean.michael.farley@gmail.com> parents: 21477 diff changeset	1986 building a new manifest if self (working directory) is not comparing
d19f491e5d5b workingctx: use inheritance for _buildstatus while keeping the fastpath Sean Farley <sean.michael.farley@gmail.com> parents: 21477 diff changeset	1987 against its parent (repo['.']).
d19f491e5d5b workingctx: use inheritance for _buildstatus while keeping the fastpath Sean Farley <sean.michael.farley@gmail.com> parents: 21477 diff changeset	1988 """
23239 9fbb50444d55 context.status: call _dirstatestatus() from within _buildstatus() Martin von Zweigbergk <martinvonz@gmail.com> parents: 23238 diff changeset	1989 s = self._dirstatestatus(match, listignored, listclean, listunknown)
23543 4dd8a6a1240d spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23410 diff changeset	1990 # Filter out symlinks that, in the case of FAT32 and NTFS filesystems,
23242 18168938e1c1 context.status: only filter suspect symlinks in the dirstate status Martin von Zweigbergk <martinvonz@google.com> parents: 23241 diff changeset	1991 # might have accidentally ended up with the entire contents of the file
23543 4dd8a6a1240d spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23410 diff changeset	1992 # they are supposed to be linking to.
23302 24f67ad49da7 context.status: make _dirstatestatus() return an status tuple Martin von Zweigbergk <martinvonz@google.com> parents: 23301 diff changeset	1993 s.modified[:] = self._filtersuspectsymlink(s.modified)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1994 if other != self._repo[b'.']:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1995 s = super(workingctx, self)._buildstatus(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1996 other, s, match, listignored, listclean, listunknown
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	1997 )
21480 d19f491e5d5b workingctx: use inheritance for _buildstatus while keeping the fastpath Sean Farley <sean.michael.farley@gmail.com> parents: 21477 diff changeset	1998 return s
d19f491e5d5b workingctx: use inheritance for _buildstatus while keeping the fastpath Sean Farley <sean.michael.farley@gmail.com> parents: 21477 diff changeset	1999
23237 98f41a2f8fba context.status: remove unused arguments from _matchstatus() Martin von Zweigbergk <martinvonz@gmail.com> parents: 23236 diff changeset	2000 def _matchstatus(self, other, match):
21482 869a28d016e9 workingctx: override _matchstatus for parentworking case Sean Farley <sean.michael.farley@gmail.com> parents: 21481 diff changeset	2001 """override the match method with a filter for directory patterns
869a28d016e9 workingctx: override _matchstatus for parentworking case Sean Farley <sean.michael.farley@gmail.com> parents: 21481 diff changeset	2002
869a28d016e9 workingctx: override _matchstatus for parentworking case Sean Farley <sean.michael.farley@gmail.com> parents: 21481 diff changeset	2003 We use inheritance to customize the match.bad method only in cases of
869a28d016e9 workingctx: override _matchstatus for parentworking case Sean Farley <sean.michael.farley@gmail.com> parents: 21481 diff changeset	2004 workingctx since it belongs only to the working directory when
869a28d016e9 workingctx: override _matchstatus for parentworking case Sean Farley <sean.michael.farley@gmail.com> parents: 21481 diff changeset	2005 comparing against the parent changeset.
869a28d016e9 workingctx: override _matchstatus for parentworking case Sean Farley <sean.michael.farley@gmail.com> parents: 21481 diff changeset	2006
869a28d016e9 workingctx: override _matchstatus for parentworking case Sean Farley <sean.michael.farley@gmail.com> parents: 21481 diff changeset	2007 If we aren't comparing against the working directory's parent, then we
869a28d016e9 workingctx: override _matchstatus for parentworking case Sean Farley <sean.michael.farley@gmail.com> parents: 21481 diff changeset	2008 just use the default match object sent to us.
869a28d016e9 workingctx: override _matchstatus for parentworking case Sean Farley <sean.michael.farley@gmail.com> parents: 21481 diff changeset	2009 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2010 if other != self._repo[b'.']:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2011
21482 869a28d016e9 workingctx: override _matchstatus for parentworking case Sean Farley <sean.michael.farley@gmail.com> parents: 21481 diff changeset	2012 def bad(f, msg):
869a28d016e9 workingctx: override _matchstatus for parentworking case Sean Farley <sean.michael.farley@gmail.com> parents: 21481 diff changeset	2013 # 'f' may be a directory pattern from 'match.files()',
869a28d016e9 workingctx: override _matchstatus for parentworking case Sean Farley <sean.michael.farley@gmail.com> parents: 21481 diff changeset	2014 # so 'f not in ctx1' is not enough
24326 637da5711122 manifest: have context use self.hasdir() Drew Gottlieb <drgott@google.com> parents: 24325 diff changeset	2015 if f not in other and not other.hasdir(f):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2016 self._repo.ui.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2017 b'%s: %s\n' % (self._repo.dirstate.pathto(f), msg)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2018 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2019
21482 869a28d016e9 workingctx: override _matchstatus for parentworking case Sean Farley <sean.michael.farley@gmail.com> parents: 21481 diff changeset	2020 match.bad = bad
869a28d016e9 workingctx: override _matchstatus for parentworking case Sean Farley <sean.michael.farley@gmail.com> parents: 21481 diff changeset	2021 return match
869a28d016e9 workingctx: override _matchstatus for parentworking case Sean Farley <sean.michael.farley@gmail.com> parents: 21481 diff changeset	2022
42320 4fbfc893e6b9 context: move walk() and match() overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42319 diff changeset	2023 def walk(self, match):
4fbfc893e6b9 context: move walk() and match() overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42319 diff changeset	2024 '''Generates matching file names.'''
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2025 return sorted(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2026 self._repo.dirstate.walk(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2027 self._repo.narrowmatch(match),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2028 subrepos=sorted(self.substate),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2029 unknown=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2030 ignored=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2031 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2032 )
42320 4fbfc893e6b9 context: move walk() and match() overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42319 diff changeset	2033
4fbfc893e6b9 context: move walk() and match() overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42319 diff changeset	2034 def matches(self, match):
4fbfc893e6b9 context: move walk() and match() overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42319 diff changeset	2035 match = self._repo.narrowmatch(match)
4fbfc893e6b9 context: move walk() and match() overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42319 diff changeset	2036 ds = self._repo.dirstate
48107 20d0149b8a0a dirstate-item: use `tracked` instead of `state` in context.matches Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48106 diff changeset	2037 return sorted(f for f in ds.matches(match) if ds.get_entry(f).tracked)
42320 4fbfc893e6b9 context: move walk() and match() overrides from committablectx to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42319 diff changeset	2038
33353 160efb559f67 sparse: move post commit actions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33283 diff changeset	2039 def markcommitted(self, node):
42322 fdd4d668ceb5 context: move contents of committablectx.markcommitted() to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42320 diff changeset	2040 with self._repo.dirstate.parentchange():
fdd4d668ceb5 context: move contents of committablectx.markcommitted() to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42320 diff changeset	2041 for f in self.modified() + self.added():
47706 5bbf304271a0 context: use `update_file` instead of `normal` in `markcommitted` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47705 diff changeset	2042 self._repo.dirstate.update_file(
5bbf304271a0 context: use `update_file` instead of `normal` in `markcommitted` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47705 diff changeset	2043 f, p1_tracked=True, wc_tracked=True
5bbf304271a0 context: use `update_file` instead of `normal` in `markcommitted` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47705 diff changeset	2044 )
42322 fdd4d668ceb5 context: move contents of committablectx.markcommitted() to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42320 diff changeset	2045 for f in self.removed():
47745 06d57a91441e context: use `update_file` instead of `drop` in `markcommitted` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47706 diff changeset	2046 self._repo.dirstate.update_file(
06d57a91441e context: use `update_file` instead of `drop` in `markcommitted` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47706 diff changeset	2047 f, p1_tracked=False, wc_tracked=False
06d57a91441e context: use `update_file` instead of `drop` in `markcommitted` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47706 diff changeset	2048 )
42322 fdd4d668ceb5 context: move contents of committablectx.markcommitted() to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42320 diff changeset	2049 self._repo.dirstate.setparents(node)
44104 85c4cd73996b localrepo: also fastpath access to working copy parents when possible Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44052 diff changeset	2050 self._repo._quick_access_changeid_invalidate()
42322 fdd4d668ceb5 context: move contents of committablectx.markcommitted() to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42320 diff changeset	2051
47605 a5701ffc10e4 sparse: make sure we adjust the dirstate at the same time as the parent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47600 diff changeset	2052 sparse.aftercommit(self._repo, node)
a5701ffc10e4 sparse: make sure we adjust the dirstate at the same time as the parent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47600 diff changeset	2053
42322 fdd4d668ceb5 context: move contents of committablectx.markcommitted() to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42320 diff changeset	2054 # write changes out explicitly, because nesting wlock at
fdd4d668ceb5 context: move contents of committablectx.markcommitted() to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42320 diff changeset	2055 # runtime may prevent 'wlock.release()' in 'repo.commit()'
fdd4d668ceb5 context: move contents of committablectx.markcommitted() to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42320 diff changeset	2056 # from immediately doing so for subsequent changing files
fdd4d668ceb5 context: move contents of committablectx.markcommitted() to workingctx Martin von Zweigbergk <martinvonz@google.com> parents: 42320 diff changeset	2057 self._repo.dirstate.write(self._repo.currenttransaction())
33353 160efb559f67 sparse: move post commit actions into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33283 diff changeset	2058
44916 e607099d8b93 context: implement mergestate() method Augie Fackler <augie@google.com> parents: 44399 diff changeset	2059 def mergestate(self, clean=False):
e607099d8b93 context: implement mergestate() method Augie Fackler <augie@google.com> parents: 44399 diff changeset	2060 if clean:
e607099d8b93 context: implement mergestate() method Augie Fackler <augie@google.com> parents: 44399 diff changeset	2061 return mergestatemod.mergestate.clean(self._repo)
e607099d8b93 context: implement mergestate() method Augie Fackler <augie@google.com> parents: 44399 diff changeset	2062 return mergestatemod.mergestate.read(self._repo)
e607099d8b93 context: implement mergestate() method Augie Fackler <augie@google.com> parents: 44399 diff changeset	2063
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2064
19733 51988f008df3 context: use correct spelling of committable Sean Farley <sean.michael.farley@gmail.com> parents: 19705 diff changeset	2065 class committablefilectx(basefilectx):
51988f008df3 context: use correct spelling of committable Sean Farley <sean.michael.farley@gmail.com> parents: 19705 diff changeset	2066 """A committablefilectx provides common functionality for a file context
51988f008df3 context: use correct spelling of committable Sean Farley <sean.michael.farley@gmail.com> parents: 19705 diff changeset	2067 that wants the ability to commit, e.g. workingfilectx or memfilectx."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2068
19701 f0f8380ec516 commitablefilectx: add a class that will be used for mutable file contexts Sean Farley <sean.michael.farley@gmail.com> parents: 19700 diff changeset	2069 def __init__(self, repo, path, filelog=None, ctx=None):
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	2070 self._repo = repo
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	2071 self._path = path
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	2072 self._changeid = None
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	2073 self._filerev = self._filenode = None
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	2074
19149 921b64e1f7b9 filecontext: use 'is not None' to check for filelog existence Durham Goode <durham@fb.com> parents: 19061 diff changeset	2075 if filelog is not None:
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	2076 self._filelog = filelog
19702 d25fdd4c2fd1 commitablefilectx: move __init__ from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19701 diff changeset	2077 if ctx:
d25fdd4c2fd1 commitablefilectx: move __init__ from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19701 diff changeset	2078 self._changectx = ctx
d25fdd4c2fd1 commitablefilectx: move __init__ from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19701 diff changeset	2079
19703 d2936bec530b commitablefilectx: move __nonzero__ from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19702 diff changeset	2080 def __nonzero__(self):
d2936bec530b commitablefilectx: move __nonzero__ from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19702 diff changeset	2081 return True
d2936bec530b commitablefilectx: move __nonzero__ from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19702 diff changeset	2082
31483 413b44003462 py3: add __bool__ to every class defining __nonzero__ Gregory Szorc <gregory.szorc@gmail.com> parents: 31473 diff changeset	2083 __bool__ = __nonzero__
413b44003462 py3: add __bool__ to every class defining __nonzero__ Gregory Szorc <gregory.szorc@gmail.com> parents: 31473 diff changeset	2084
24420 065b886f61c6 committablefilectx: override linkrev() to point to the associated changectx Yuya Nishihara <yuya@tcha.org> parents: 24415 diff changeset	2085 def linkrev(self):
065b886f61c6 committablefilectx: override linkrev() to point to the associated changectx Yuya Nishihara <yuya@tcha.org> parents: 24415 diff changeset	2086 # linked to self._changectx no matter if file is modified or not
065b886f61c6 committablefilectx: override linkrev() to point to the associated changectx Yuya Nishihara <yuya@tcha.org> parents: 24415 diff changeset	2087 return self.rev()
065b886f61c6 committablefilectx: override linkrev() to point to the associated changectx Yuya Nishihara <yuya@tcha.org> parents: 24415 diff changeset	2088
41779 c7a843aa4b42 context: move equivalent renamed() implementations to superclass Martin von Zweigbergk <martinvonz@google.com> parents: 41778 diff changeset	2089 def renamed(self):
c7a843aa4b42 context: move equivalent renamed() implementations to superclass Martin von Zweigbergk <martinvonz@google.com> parents: 41778 diff changeset	2090 path = self.copysource()
c7a843aa4b42 context: move equivalent renamed() implementations to superclass Martin von Zweigbergk <martinvonz@google.com> parents: 41778 diff changeset	2091 if not path:
c7a843aa4b42 context: move equivalent renamed() implementations to superclass Martin von Zweigbergk <martinvonz@google.com> parents: 41778 diff changeset	2092 return None
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	2093 return (
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	2094 path,
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	2095 self._changectx._parents[0]._manifest.get(
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	2096 path, self._repo.nodeconstants.nullid
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	2097 ),
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	2098 )
41779 c7a843aa4b42 context: move equivalent renamed() implementations to superclass Martin von Zweigbergk <martinvonz@google.com> parents: 41778 diff changeset	2099
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	2100 def parents(self):
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	2101 '''return parent filectxs, following copies if necessary'''
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2102
8528 4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	2103 def filenode(ctx, path):
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	2104 return ctx._manifest.get(path, self._repo.nodeconstants.nullid)
8528 4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	2105
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	2106 path = self._path
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	2107 fl = self._filelog
8528 4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	2108 pcl = self._changectx._parents
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	2109 renamed = self.renamed()
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	2110
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	2111 if renamed:
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	2112 pl = [renamed + (None,)]
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	2113 else:
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	2114 pl = [(path, filenode(pcl[0], path), fl)]
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	2115
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	2116 for pc in pcl[1:]:
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	2117 pl.append((path, filenode(pc, path), fl))
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	2118
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2119 return [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2120 self._parentfilectx(p, fileid=n, filelog=l)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2121 for p, n, l in pl
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	2122 if n != self._repo.nodeconstants.nullid
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2123 ]
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	2124
19705 79792c8ea6da commitablefilectx: move children from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19704 diff changeset	2125 def children(self):
79792c8ea6da commitablefilectx: move children from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19704 diff changeset	2126 return []
79792c8ea6da commitablefilectx: move children from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19704 diff changeset	2127
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2128
19733 51988f008df3 context: use correct spelling of committable Sean Farley <sean.michael.farley@gmail.com> parents: 19705 diff changeset	2129 class workingfilectx(committablefilectx):
19704 bad0bd99ac96 commitablefilectx: move parents from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19703 diff changeset	2130 """A workingfilectx object makes access to data related to a particular
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45911 diff changeset	2131 file in the working directory convenient."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2132
19704 bad0bd99ac96 commitablefilectx: move parents from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19703 diff changeset	2133 def __init__(self, repo, path, filelog=None, workingctx=None):
bad0bd99ac96 commitablefilectx: move parents from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19703 diff changeset	2134 super(workingfilectx, self).__init__(repo, path, filelog, workingctx)
bad0bd99ac96 commitablefilectx: move parents from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19703 diff changeset	2135
bad0bd99ac96 commitablefilectx: move parents from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19703 diff changeset	2136 @propertycache
bad0bd99ac96 commitablefilectx: move parents from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19703 diff changeset	2137 def _changectx(self):
bad0bd99ac96 commitablefilectx: move parents from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19703 diff changeset	2138 return workingctx(self._repo)
bad0bd99ac96 commitablefilectx: move parents from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19703 diff changeset	2139
bad0bd99ac96 commitablefilectx: move parents from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19703 diff changeset	2140 def data(self):
bad0bd99ac96 commitablefilectx: move parents from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19703 diff changeset	2141 return self._repo.wread(self._path)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2142
41777 041d829575ed context: add specialized way of getting copy source file only Martin von Zweigbergk <martinvonz@google.com> parents: 41775 diff changeset	2143 def copysource(self):
041d829575ed context: add specialized way of getting copy source file only Martin von Zweigbergk <martinvonz@google.com> parents: 41775 diff changeset	2144 return self._repo.dirstate.copied(self._path)
19704 bad0bd99ac96 commitablefilectx: move parents from workingfilectx Sean Farley <sean.michael.farley@gmail.com> parents: 19703 diff changeset	2145
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	2146 def size(self):
19901 4d3ce1646dfc context: use "vfs.lstat()" instead of "os.lstat()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19900 diff changeset	2147 return self._repo.wvfs.lstat(self._path).st_size
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2148
42472 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42426 diff changeset	2149 def lstat(self):
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42426 diff changeset	2150 return self._repo.wvfs.lstat(self._path)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2151
3962 2b8825c94c5a add date attribute to workingfilectx Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3961 diff changeset	2152 def date(self):
2b8825c94c5a add date attribute to workingfilectx Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3961 diff changeset	2153 t, tz = self._changectx.date()
2b8825c94c5a add date attribute to workingfilectx Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3961 diff changeset	2154 try:
36789 ffa3026d4196 cleanup: use stat_result[stat.ST_MTIME] instead of stat_result.st_mtime Augie Fackler <augie@google.com> parents: 36744 diff changeset	2155 return (self._repo.wvfs.lstat(self._path)[stat.ST_MTIME], tz)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25600 diff changeset	2156 except OSError as err:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	2157 if err.errno != errno.ENOENT:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	2158 raise
3962 2b8825c94c5a add date attribute to workingfilectx Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3961 diff changeset	2159 return (t, tz)
3310 0e370798eebf context: add cmp for filectxs Matt Mackall <mpm@selenic.com> parents: 3302 diff changeset	2160
33283 634b259079c5 workingfilectx: add exists, lexists Phil Cohen <phillco@fb.com> parents: 33098 diff changeset	2161 def exists(self):
634b259079c5 workingfilectx: add exists, lexists Phil Cohen <phillco@fb.com> parents: 33098 diff changeset	2162 return self._repo.wvfs.exists(self._path)
634b259079c5 workingfilectx: add exists, lexists Phil Cohen <phillco@fb.com> parents: 33098 diff changeset	2163
634b259079c5 workingfilectx: add exists, lexists Phil Cohen <phillco@fb.com> parents: 33098 diff changeset	2164 def lexists(self):
634b259079c5 workingfilectx: add exists, lexists Phil Cohen <phillco@fb.com> parents: 33098 diff changeset	2165 return self._repo.wvfs.lexists(self._path)
634b259079c5 workingfilectx: add exists, lexists Phil Cohen <phillco@fb.com> parents: 33098 diff changeset	2166
33098 eb4c49f55f1f workingfilectx: add audit() as a wrapper for wvfs.audit() Phil Cohen <phillco@fb.com> parents: 33097 diff changeset	2167 def audit(self):
eb4c49f55f1f workingfilectx: add audit() as a wrapper for wvfs.audit() Phil Cohen <phillco@fb.com> parents: 33097 diff changeset	2168 return self._repo.wvfs.audit(self._path)
eb4c49f55f1f workingfilectx: add audit() as a wrapper for wvfs.audit() Phil Cohen <phillco@fb.com> parents: 33097 diff changeset	2169
11702 eb07fbc21e9c filectx: use cmp(self, fctx) instead of cmp(self, text) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11605 diff changeset	2170 def cmp(self, fctx):
eb07fbc21e9c filectx: use cmp(self, fctx) instead of cmp(self, text) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11605 diff changeset	2171 """compare with other file context
11539 a463e3c50212 cmp: document the fact that we return True if content is different Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11538 diff changeset	2172
11702 eb07fbc21e9c filectx: use cmp(self, fctx) instead of cmp(self, text) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11605 diff changeset	2173 returns True if different than fctx.
11539 a463e3c50212 cmp: document the fact that we return True if content is different Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11538 diff changeset	2174 """
17425 e95ec38f86b0 fix wording and not-completely-trivial spelling errors and bad docstrings Mads Kiilerich <mads@kiilerich.com> parents: 17424 diff changeset	2175 # fctx should be a filectx (not a workingfilectx)
11703 55a2af02e45c context: reuse filecontext.cmp in workingfilecontext.cmp Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11702 diff changeset	2176 # invert comparison to reuse the same code path
55a2af02e45c context: reuse filecontext.cmp in workingfilecontext.cmp Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11702 diff changeset	2177 return fctx.cmp(self)
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	2178
22073 0c48bc3d0eb2 workingfilectx: add remove and write methods Sean Farley <sean.michael.farley@gmail.com> parents: 22072 diff changeset	2179 def remove(self, ignoremissing=False):
0c48bc3d0eb2 workingfilectx: add remove and write methods Sean Farley <sean.michael.farley@gmail.com> parents: 22072 diff changeset	2180 """wraps unlink for a repo's working directory"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2181 rmdir = self._repo.ui.configbool(b'experimental', b'removeemptydirs')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2182 self._repo.wvfs.unlinkpath(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2183 self._path, ignoremissing=ignoremissing, rmdir=rmdir
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2184 )
22073 0c48bc3d0eb2 workingfilectx: add remove and write methods Sean Farley <sean.michael.farley@gmail.com> parents: 22072 diff changeset	2185
35725 2a7e777c9eed write: add the possibility to pass keyword argument from batchget to vfs Boris Feld <boris.feld@octobus.net> parents: 35610 diff changeset	2186 def write(self, data, flags, backgroundclose=False, **kwargs):
22073 0c48bc3d0eb2 workingfilectx: add remove and write methods Sean Farley <sean.michael.farley@gmail.com> parents: 22072 diff changeset	2187 """wraps repo.wwrite"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2188 return self._repo.wwrite(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2189 self._path, data, flags, backgroundclose=backgroundclose, **kwargs
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2190 )
22073 0c48bc3d0eb2 workingfilectx: add remove and write methods Sean Farley <sean.michael.farley@gmail.com> parents: 22072 diff changeset	2191
34787 754b5117622f context: add workingfilectx.markcopied Phil Cohen <phillco@fb.com> parents: 34783 diff changeset	2192 def markcopied(self, src):
754b5117622f context: add workingfilectx.markcopied Phil Cohen <phillco@fb.com> parents: 34783 diff changeset	2193 """marks this file a copy of `src`"""
42345 313812cbf4ca copies: fix duplicatecopies() with overlay context Martin von Zweigbergk <martinvonz@google.com> parents: 42324 diff changeset	2194 self._repo.dirstate.copy(src, self._path)
34787 754b5117622f context: add workingfilectx.markcopied Phil Cohen <phillco@fb.com> parents: 34783 diff changeset	2195
34054 65ae54582713 merge: move some of the logic in batchget() to workingfilectx Phil Cohen <phillco@fb.com> parents: 34017 diff changeset	2196 def clearunknown(self):
65ae54582713 merge: move some of the logic in batchget() to workingfilectx Phil Cohen <phillco@fb.com> parents: 34017 diff changeset	2197 """Removes conflicting items in the working directory so that
65ae54582713 merge: move some of the logic in batchget() to workingfilectx Phil Cohen <phillco@fb.com> parents: 34017 diff changeset	2198 ``write()`` can be called successfully.
65ae54582713 merge: move some of the logic in batchget() to workingfilectx Phil Cohen <phillco@fb.com> parents: 34017 diff changeset	2199 """
65ae54582713 merge: move some of the logic in batchget() to workingfilectx Phil Cohen <phillco@fb.com> parents: 34017 diff changeset	2200 wvfs = self._repo.wvfs
34556 7a8a16f8ea22 context: also consider path conflicts when clearing unknown files Mark Thomas <mbthomas@fb.com> parents: 34480 diff changeset	2201 f = self._path
34833 07bbb208a924 context: audit paths before clearing unknown files and dirs Mark Thomas <mbthomas@fb.com> parents: 34787 diff changeset	2202 wvfs.audit(f)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2203 if self._repo.ui.configbool(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2204 b'experimental', b'merge.checkpathconflicts'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2205 ):
38775 8c6775e812d8 merge: do not delete untracked files silently (issue5962) Yuya Nishihara <yuya@tcha.org> parents: 38761 diff changeset	2206 # remove files under the directory as they should already be
8c6775e812d8 merge: do not delete untracked files silently (issue5962) Yuya Nishihara <yuya@tcha.org> parents: 38761 diff changeset	2207 # warned and backed up
8c6775e812d8 merge: do not delete untracked files silently (issue5962) Yuya Nishihara <yuya@tcha.org> parents: 38761 diff changeset	2208 if wvfs.isdir(f) and not wvfs.islink(f):
8c6775e812d8 merge: do not delete untracked files silently (issue5962) Yuya Nishihara <yuya@tcha.org> parents: 38761 diff changeset	2209 wvfs.rmtree(f, forcibly=True)
43677 0b7733719d21 utils: move finddirs() to pathutil Martin von Zweigbergk <martinvonz@google.com> parents: 43554 diff changeset	2210 for p in reversed(list(pathutil.finddirs(f))):
37104 656ac240f392 context: skip path conflicts by default when clearing unknown file (issue5776) Matt Harbison <matt_harbison@yahoo.com> parents: 37087 diff changeset	2211 if wvfs.isfileorlink(p):
656ac240f392 context: skip path conflicts by default when clearing unknown file (issue5776) Matt Harbison <matt_harbison@yahoo.com> parents: 37087 diff changeset	2212 wvfs.unlink(p)
656ac240f392 context: skip path conflicts by default when clearing unknown file (issue5776) Matt Harbison <matt_harbison@yahoo.com> parents: 37087 diff changeset	2213 break
38775 8c6775e812d8 merge: do not delete untracked files silently (issue5962) Yuya Nishihara <yuya@tcha.org> parents: 38761 diff changeset	2214 else:
8c6775e812d8 merge: do not delete untracked files silently (issue5962) Yuya Nishihara <yuya@tcha.org> parents: 38761 diff changeset	2215 # don't remove files if path conflicts are not processed
8c6775e812d8 merge: do not delete untracked files silently (issue5962) Yuya Nishihara <yuya@tcha.org> parents: 38761 diff changeset	2216 if wvfs.isdir(f) and not wvfs.islink(f):
8c6775e812d8 merge: do not delete untracked files silently (issue5962) Yuya Nishihara <yuya@tcha.org> parents: 38761 diff changeset	2217 wvfs.removedirs(f)
34054 65ae54582713 merge: move some of the logic in batchget() to workingfilectx Phil Cohen <phillco@fb.com> parents: 34017 diff changeset	2218
33096 873f638fd7db merge: change repo.wvfs.setflags calls to a new wctx[f].setflags function Phil Cohen <phillco@fb.com> parents: 33038 diff changeset	2219 def setflags(self, l, x):
873f638fd7db merge: change repo.wvfs.setflags calls to a new wctx[f].setflags function Phil Cohen <phillco@fb.com> parents: 33038 diff changeset	2220 self._repo.wvfs.setflags(self._path, l, x)
873f638fd7db merge: change repo.wvfs.setflags calls to a new wctx[f].setflags function Phil Cohen <phillco@fb.com> parents: 33038 diff changeset	2221
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2222
35332 8e1386b342f7 overlayworkingctx: inherit from committablectx instead of workingctx Phil Cohen <phillco@fb.com> parents: 35331 diff changeset	2223 class overlayworkingctx(committablectx):
8e1386b342f7 overlayworkingctx: inherit from committablectx instead of workingctx Phil Cohen <phillco@fb.com> parents: 35331 diff changeset	2224 """Wraps another mutable context with a write-back cache that can be
8e1386b342f7 overlayworkingctx: inherit from committablectx instead of workingctx Phil Cohen <phillco@fb.com> parents: 35331 diff changeset	2225 converted into a commit context.
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2226
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2227 self._cache[path] maps to a dict with keys: {
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2228 'exists': bool?
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2229 'date': date?
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2230 'data': str?
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2231 'flags': str?
35302 8b3a636bb341 overlayworkingctx: track copy information in the context Phil Cohen <phillco@fb.com> parents: 35298 diff changeset	2232 'copied': str? (path or None)
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2233 }
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2234 If `exists` is True, `flags` must be non-None and 'date' is non-None. If it
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2235 is `False`, the file was deleted.
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2236 """
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2237
35298 2f8c476c49fe overlayworkingctx: move _wrappedctx out of the constructor Phil Cohen <phillco@fb.com> parents: 35295 diff changeset	2238 def __init__(self, repo):
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2239 super(overlayworkingctx, self).__init__(repo)
35295 307b1689e3f8 overlayworkingctx: make clean() public Phil Cohen <phillco@fb.com> parents: 35294 diff changeset	2240 self.clean()
35298 2f8c476c49fe overlayworkingctx: move _wrappedctx out of the constructor Phil Cohen <phillco@fb.com> parents: 35295 diff changeset	2241
2f8c476c49fe overlayworkingctx: move _wrappedctx out of the constructor Phil Cohen <phillco@fb.com> parents: 35295 diff changeset	2242 def setbase(self, wrappedctx):
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2243 self._wrappedctx = wrappedctx
35298 2f8c476c49fe overlayworkingctx: move _wrappedctx out of the constructor Phil Cohen <phillco@fb.com> parents: 35295 diff changeset	2244 self._parents = [wrappedctx]
35336 777cb4497d8d overlayworkingctx: invalidate the manifest cache when changing parents Phil Cohen <phillco@fb.com> parents: 35335 diff changeset	2245 # Drop old manifest cache as it is now out of date.
777cb4497d8d overlayworkingctx: invalidate the manifest cache when changing parents Phil Cohen <phillco@fb.com> parents: 35335 diff changeset	2246 # This is necessary when, e.g., rebasing several nodes with one
777cb4497d8d overlayworkingctx: invalidate the manifest cache when changing parents Phil Cohen <phillco@fb.com> parents: 35335 diff changeset	2247 # ``overlayworkingctx`` (e.g. with --collapse).
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2248 util.clearcachedproperty(self, b'_manifest')
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2249
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	2250 def setparents(self, p1node, p2node=None):
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	2251 if p2node is None:
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	2252 p2node = self._repo.nodeconstants.nullid
44051 436d106de670 overlayworkginctx: implement a setparents() to mirror dirstate.setparents() Martin von Zweigbergk <martinvonz@google.com> parents: 44050 diff changeset	2253 assert p1node == self._wrappedctx.node()
436d106de670 overlayworkginctx: implement a setparents() to mirror dirstate.setparents() Martin von Zweigbergk <martinvonz@google.com> parents: 44050 diff changeset	2254 self._parents = [self._wrappedctx, self._repo.unfiltered()[p2node]]
436d106de670 overlayworkginctx: implement a setparents() to mirror dirstate.setparents() Martin von Zweigbergk <martinvonz@google.com> parents: 44050 diff changeset	2255
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2256 def data(self, path):
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2257 if self.isdirty(path):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2258 if self._cache[path][b'exists']:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2259 if self._cache[path][b'data'] is not None:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2260 return self._cache[path][b'data']
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2261 else:
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2262 # Must fallback here, too, because we only set flags.
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2263 return self._wrappedctx[path].data()
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2264 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2265 raise error.ProgrammingError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2266 b"No such file or directory: %s" % path
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2267 )
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2268 else:
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2269 return self._wrappedctx[path].data()
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2270
35330 2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2271 @propertycache
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2272 def _manifest(self):
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2273 parents = self.parents()
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2274 man = parents[0].manifest().copy()
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2275
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2276 flag = self._flagfunc
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2277 for path in self.added():
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	2278 man[path] = self._repo.nodeconstants.addednodeid
35330 2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2279 man.setflag(path, flag(path))
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2280 for path in self.modified():
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	2281 man[path] = self._repo.nodeconstants.modifiednodeid
35330 2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2282 man.setflag(path, flag(path))
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2283 for path in self.removed():
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2284 del man[path]
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2285 return man
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2286
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2287 @propertycache
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2288 def _flagfunc(self):
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2289 def f(path):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2290 return self._cache[path][b'flags']
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2291
35330 2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2292 return f
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2293
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2294 def files(self):
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2295 return sorted(self.added() + self.modified() + self.removed())
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2296
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2297 def modified(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2298 return [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2299 f
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2300 for f in self._cache.keys()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2301 if self._cache[f][b'exists'] and self._existsinparent(f)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2302 ]
35330 2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2303
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2304 def added(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2305 return [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2306 f
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2307 for f in self._cache.keys()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2308 if self._cache[f][b'exists'] and not self._existsinparent(f)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2309 ]
35330 2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2310
2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2311 def removed(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2312 return [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2313 f
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2314 for f in self._cache.keys()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2315 if not self._cache[f][b'exists'] and self._existsinparent(f)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2316 ]
35330 2e1c32a9c97b overlayworkingctx: add _manifest, files(), added(), removed(), modified() Phil Cohen <phillco@fb.com> parents: 35328 diff changeset	2317
41764 a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	2318 def p1copies(self):
44040 f652b7ddc1d4 overlwayworkingctx: remove doubly bad reference to wrapped ctx for copies Martin von Zweigbergk <martinvonz@google.com> parents: 44025 diff changeset	2319 copies = {}
41764 a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	2320 narrowmatch = self._repo.narrowmatch()
a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	2321 for f in self._cache.keys():
a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	2322 if not narrowmatch(f):
a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	2323 continue
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2324 copies.pop(f, None) # delete if it exists
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2325 source = self._cache[f][b'copied']
41764 a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	2326 if source:
a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	2327 copies[f] = source
a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	2328 return copies
a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	2329
a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	2330 def p2copies(self):
44040 f652b7ddc1d4 overlwayworkingctx: remove doubly bad reference to wrapped ctx for copies Martin von Zweigbergk <martinvonz@google.com> parents: 44025 diff changeset	2331 copies = {}
41764 a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	2332 narrowmatch = self._repo.narrowmatch()
a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	2333 for f in self._cache.keys():
a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	2334 if not narrowmatch(f):
a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	2335 continue
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2336 copies.pop(f, None) # delete if it exists
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2337 source = self._cache[f][b'copied']
41764 a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	2338 if source:
a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	2339 copies[f] = source
a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	2340 return copies
a4358f7345b4 context: introduce p[12]copies() methods and debugp[12]copies commands Martin von Zweigbergk <martinvonz@google.com> parents: 41657 diff changeset	2341
34681 4dc8a2ee0f4f context: add is `isinmemory()` to filectx Phil Cohen <phillco@fb.com> parents: 34556 diff changeset	2342 def isinmemory(self):
4dc8a2ee0f4f context: add is `isinmemory()` to filectx Phil Cohen <phillco@fb.com> parents: 34556 diff changeset	2343 return True
4dc8a2ee0f4f context: add is `isinmemory()` to filectx Phil Cohen <phillco@fb.com> parents: 34556 diff changeset	2344
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2345 def filedate(self, path):
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2346 if self.isdirty(path):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2347 return self._cache[path][b'date']
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2348 else:
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2349 return self._wrappedctx[path].date()
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2350
35302 8b3a636bb341 overlayworkingctx: track copy information in the context Phil Cohen <phillco@fb.com> parents: 35298 diff changeset	2351 def markcopied(self, path, origin):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2352 self._markdirty(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2353 path,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2354 exists=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2355 date=self.filedate(path),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2356 flags=self.flags(path),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2357 copied=origin,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2358 )
35302 8b3a636bb341 overlayworkingctx: track copy information in the context Phil Cohen <phillco@fb.com> parents: 35298 diff changeset	2359
8b3a636bb341 overlayworkingctx: track copy information in the context Phil Cohen <phillco@fb.com> parents: 35298 diff changeset	2360 def copydata(self, path):
8b3a636bb341 overlayworkingctx: track copy information in the context Phil Cohen <phillco@fb.com> parents: 35298 diff changeset	2361 if self.isdirty(path):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2362 return self._cache[path][b'copied']
35302 8b3a636bb341 overlayworkingctx: track copy information in the context Phil Cohen <phillco@fb.com> parents: 35298 diff changeset	2363 else:
42315 cdcebc897529 overlaycontext: allow calling copydata() on clean context Martin von Zweigbergk <martinvonz@google.com> parents: 42156 diff changeset	2364 return None
35302 8b3a636bb341 overlayworkingctx: track copy information in the context Phil Cohen <phillco@fb.com> parents: 35298 diff changeset	2365
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2366 def flags(self, path):
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2367 if self.isdirty(path):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2368 if self._cache[path][b'exists']:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2369 return self._cache[path][b'flags']
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2370 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2371 raise error.ProgrammingError(
44975 b2e5ec0c596b context: fix creation of ProgrammingError to not use non-existent field Martin von Zweigbergk <martinvonz@google.com> parents: 44965 diff changeset	2372 b"No such file or directory: %s" % path
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2373 )
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2374 else:
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2375 return self._wrappedctx[path].flags()
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2376
40456 44c2e80db985 rebase: fix dir/file conflict detection when using in-mem merge Martin von Zweigbergk <martinvonz@google.com> parents: 40302 diff changeset	2377 def __contains__(self, key):
44c2e80db985 rebase: fix dir/file conflict detection when using in-mem merge Martin von Zweigbergk <martinvonz@google.com> parents: 40302 diff changeset	2378 if key in self._cache:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2379 return self._cache[key][b'exists']
40456 44c2e80db985 rebase: fix dir/file conflict detection when using in-mem merge Martin von Zweigbergk <martinvonz@google.com> parents: 40302 diff changeset	2380 return key in self.p1()
44c2e80db985 rebase: fix dir/file conflict detection when using in-mem merge Martin von Zweigbergk <martinvonz@google.com> parents: 40302 diff changeset	2381
35304 bea46aed1e1b overlayworkingctx: add `_checkexist(path)` Phil Cohen <phillco@fb.com> parents: 35303 diff changeset	2382 def _existsinparent(self, path):
bea46aed1e1b overlayworkingctx: add `_checkexist(path)` Phil Cohen <phillco@fb.com> parents: 35303 diff changeset	2383 try:
bea46aed1e1b overlayworkingctx: add `_checkexist(path)` Phil Cohen <phillco@fb.com> parents: 35303 diff changeset	2384 # ``commitctx` raises a ``ManifestLookupError`` if a path does not
bea46aed1e1b overlayworkingctx: add `_checkexist(path)` Phil Cohen <phillco@fb.com> parents: 35303 diff changeset	2385 # exist, unlike ``workingctx``, which returns a ``workingfilectx``
bea46aed1e1b overlayworkingctx: add `_checkexist(path)` Phil Cohen <phillco@fb.com> parents: 35303 diff changeset	2386 # with an ``exists()`` function.
bea46aed1e1b overlayworkingctx: add `_checkexist(path)` Phil Cohen <phillco@fb.com> parents: 35303 diff changeset	2387 self._wrappedctx[path]
bea46aed1e1b overlayworkingctx: add `_checkexist(path)` Phil Cohen <phillco@fb.com> parents: 35303 diff changeset	2388 return True
bea46aed1e1b overlayworkingctx: add `_checkexist(path)` Phil Cohen <phillco@fb.com> parents: 35303 diff changeset	2389 except error.ManifestLookupError:
bea46aed1e1b overlayworkingctx: add `_checkexist(path)` Phil Cohen <phillco@fb.com> parents: 35303 diff changeset	2390 return False
bea46aed1e1b overlayworkingctx: add `_checkexist(path)` Phil Cohen <phillco@fb.com> parents: 35303 diff changeset	2391
35333 72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2392 def _auditconflicts(self, path):
72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2393 """Replicates conflict checks done by wvfs.write().
72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2394
72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2395 Since we never write to the filesystem and never call `applyupdates` in
72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2396 IMM, we'll never check that a path is actually writable -- e.g., because
72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2397 it adds `a/foo`, but `a` is actually a file in the other commit.
72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2398 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2399
35333 72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2400 def fail(path, component):
72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2401 # p1() is the base and we're receiving "writes" for p2()'s
72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2402 # files.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2403 if b'l' in self.p1()[component].flags():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2404 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2405 b"error: %s conflicts with symlink %s "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2406 b"in %d." % (path, component, self.p1().rev())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2407 )
35333 72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2408 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2409 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2410 b"error: '%s' conflicts with file '%s' in "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2411 b"%d." % (path, component, self.p1().rev())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2412 )
35333 72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2413
72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2414 # Test that each new directory to be created to write this path from p2
72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2415 # is not a file in p1.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2416 components = path.split(b'/')
38823 e7aa113b14f7 global: use pycompat.xrange() Gregory Szorc <gregory.szorc@gmail.com> parents: 38816 diff changeset	2417 for i in pycompat.xrange(len(components)):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2418 component = b"/".join(components[0:i])
40456 44c2e80db985 rebase: fix dir/file conflict detection when using in-mem merge Martin von Zweigbergk <martinvonz@google.com> parents: 40302 diff changeset	2419 if component in self:
35333 72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2420 fail(path, component)
72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2421
72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2422 # Test the other direction -- that this path from p2 isn't a directory
40461 1c8c54cf9725 rebase: fix path auditing to audit path relative to repo root (issue5818) Martin von Zweigbergk <martinvonz@google.com> parents: 40456 diff changeset	2423 # in p1 (test that p1 doesn't have any paths matching `path/*`).
42102 976f069e0ad6 overlayworkingctx: remove misleading trailing slash from directory pattern Martin von Zweigbergk <martinvonz@google.com> parents: 42101 diff changeset	2424 match = self.match([path], default=b'path')
44310 beea86e4d332 context: use manifest.walk() instead of manifest.match() to get file list Augie Fackler <augie@google.com> parents: 44109 diff changeset	2425 mfiles = list(self.p1().manifest().walk(match))
39592 fa4d16daf1be context: don't count deleted files as candidates for path conflicts in IMM Pulkit Goyal <pulkit@yandex-team.ru> parents: 39319 diff changeset	2426 if len(mfiles) > 0:
fa4d16daf1be context: don't count deleted files as candidates for path conflicts in IMM Pulkit Goyal <pulkit@yandex-team.ru> parents: 39319 diff changeset	2427 if len(mfiles) == 1 and mfiles[0] == path:
fa4d16daf1be context: don't count deleted files as candidates for path conflicts in IMM Pulkit Goyal <pulkit@yandex-team.ru> parents: 39319 diff changeset	2428 return
fa4d16daf1be context: don't count deleted files as candidates for path conflicts in IMM Pulkit Goyal <pulkit@yandex-team.ru> parents: 39319 diff changeset	2429 # omit the files which are deleted in current IMM wctx
40456 44c2e80db985 rebase: fix dir/file conflict detection when using in-mem merge Martin von Zweigbergk <martinvonz@google.com> parents: 40302 diff changeset	2430 mfiles = [m for m in mfiles if m in self]
39592 fa4d16daf1be context: don't count deleted files as candidates for path conflicts in IMM Pulkit Goyal <pulkit@yandex-team.ru> parents: 39319 diff changeset	2431 if not mfiles:
35333 72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2432 return
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2433 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2434 b"error: file '%s' cannot be written because "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2435 b" '%s/' is a directory in %s (containing %d "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2436 b"entries: %s)"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2437 % (path, path, self.p1(), len(mfiles), b', '.join(mfiles))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2438 )
35333 72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2439
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2440 def write(self, path, data, flags=b'', **kwargs):
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2441 if data is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2442 raise error.ProgrammingError(b"data must be non-None")
35333 72fbdd373de8 overlayworkingctx: add _auditconflicts to write() Phil Cohen <phillco@fb.com> parents: 35332 diff changeset	2443 self._auditconflicts(path)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2444 self._markdirty(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2445 path, exists=True, data=data, date=dateutil.makedate(), flags=flags
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2446 )
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2447
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2448 def setflags(self, path, l, x):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2449 flag = b''
39103 2488dcfa71f8 context: safegaurd from 'lx' being passed as file flag in manifest Pulkit Goyal <pulkit@yandex-team.ru> parents: 38858 diff changeset	2450 if l:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2451 flag = b'l'
39103 2488dcfa71f8 context: safegaurd from 'lx' being passed as file flag in manifest Pulkit Goyal <pulkit@yandex-team.ru> parents: 38858 diff changeset	2452 elif x:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2453 flag = b'x'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2454 self._markdirty(path, exists=True, date=dateutil.makedate(), flags=flag)
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2455
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2456 def remove(self, path):
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2457 self._markdirty(path, exists=False)
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2458
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2459 def exists(self, path):
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2460 """exists behaves like `lexists`, but needs to follow symlinks and
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2461 return False if they are broken.
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2462 """
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2463 if self.isdirty(path):
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2464 # If this path exists and is a symlink, "follow" it by calling
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2465 # exists on the destination path.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2466 if (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2467 self._cache[path][b'exists']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2468 and b'l' in self._cache[path][b'flags']
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2469 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2470 return self.exists(self._cache[path][b'data'].strip())
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2471 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2472 return self._cache[path][b'exists']
35304 bea46aed1e1b overlayworkingctx: add `_checkexist(path)` Phil Cohen <phillco@fb.com> parents: 35303 diff changeset	2473
bea46aed1e1b overlayworkingctx: add `_checkexist(path)` Phil Cohen <phillco@fb.com> parents: 35303 diff changeset	2474 return self._existsinparent(path)
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2475
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2476 def lexists(self, path):
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2477 """lexists returns True if the path exists"""
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2478 if self.isdirty(path):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2479 return self._cache[path][b'exists']
35304 bea46aed1e1b overlayworkingctx: add `_checkexist(path)` Phil Cohen <phillco@fb.com> parents: 35303 diff changeset	2480
bea46aed1e1b overlayworkingctx: add `_checkexist(path)` Phil Cohen <phillco@fb.com> parents: 35303 diff changeset	2481 return self._existsinparent(path)
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2482
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2483 def size(self, path):
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2484 if self.isdirty(path):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2485 if self._cache[path][b'exists']:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2486 return len(self._cache[path][b'data'])
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2487 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2488 raise error.ProgrammingError(
44975 b2e5ec0c596b context: fix creation of ProgrammingError to not use non-existent field Martin von Zweigbergk <martinvonz@google.com> parents: 44965 diff changeset	2489 b"No such file or directory: %s" % path
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2490 )
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2491 return self._wrappedctx[path].size()
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2492
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2493 def tomemctx(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2494 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2495 text,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2496 branch=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2497 extra=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2498 date=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2499 parents=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2500 user=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2501 editor=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2502 ):
35334 71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2503 """Converts this ``overlayworkingctx`` into a ``memctx`` ready to be
71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2504 committed.
71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2505
71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2506 ``text`` is the commit message.
71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2507 ``parents`` (optional) are rev numbers.
71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2508 """
44051 436d106de670 overlayworkginctx: implement a setparents() to mirror dirstate.setparents() Martin von Zweigbergk <martinvonz@google.com> parents: 44050 diff changeset	2509 # Default parents to the wrapped context if not passed.
35334 71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2510 if parents is None:
44051 436d106de670 overlayworkginctx: implement a setparents() to mirror dirstate.setparents() Martin von Zweigbergk <martinvonz@google.com> parents: 44050 diff changeset	2511 parents = self.parents()
35334 71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2512 if len(parents) == 1:
71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2513 parents = (parents[0], None)
71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2514
71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2515 # ``parents`` is passed as rev numbers; convert to ``commitctxs``.
71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2516 if parents[1] is None:
71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2517 parents = (self._repo[parents[0]], None)
71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2518 else:
71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2519 parents = (self._repo[parents[0]], self._repo[parents[1]])
71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2520
42317 e79aeb518aa1 overlayworkingctx: don't include added-then-deleted files in memctx Martin von Zweigbergk <martinvonz@google.com> parents: 42315 diff changeset	2521 files = self.files()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2522
35334 71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2523 def getfile(repo, memctx, path):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2524 if self._cache[path][b'exists']:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2525 return memfilectx(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2526 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2527 memctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2528 path,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2529 self._cache[path][b'data'],
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2530 b'l' in self._cache[path][b'flags'],
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2531 b'x' in self._cache[path][b'flags'],
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2532 self._cache[path][b'copied'],
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2533 )
35334 71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2534 else:
71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2535 # Returning None, but including the path in `files`, is
71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2536 # necessary for memctx to register a deletion.
71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2537 return None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2538
44050 2ecbc4ec87d8 overlayworkingctx: default branch to base context's branch Martin von Zweigbergk <martinvonz@google.com> parents: 44040 diff changeset	2539 if branch is None:
2ecbc4ec87d8 overlayworkingctx: default branch to base context's branch Martin von Zweigbergk <martinvonz@google.com> parents: 44040 diff changeset	2540 branch = self._wrappedctx.branch()
2ecbc4ec87d8 overlayworkingctx: default branch to base context's branch Martin von Zweigbergk <martinvonz@google.com> parents: 44040 diff changeset	2541
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2542 return memctx(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2543 self._repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2544 parents,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2545 text,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2546 files,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2547 getfile,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2548 date=date,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2549 extra=extra,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2550 user=user,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2551 branch=branch,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2552 editor=editor,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2553 )
35334 71edd38c4bb4 overlayworkingctx: add ``tomemctx()`` Phil Cohen <phillco@fb.com> parents: 35333 diff changeset	2554
44399 7c4b98a4e536 copy: add experimetal support for unmarking committed copies Martin von Zweigbergk <martinvonz@google.com> parents: 44388 diff changeset	2555 def tomemctx_for_amend(self, precursor):
7c4b98a4e536 copy: add experimetal support for unmarking committed copies Martin von Zweigbergk <martinvonz@google.com> parents: 44388 diff changeset	2556 extra = precursor.extra().copy()
7c4b98a4e536 copy: add experimetal support for unmarking committed copies Martin von Zweigbergk <martinvonz@google.com> parents: 44388 diff changeset	2557 extra[b'amend_source'] = precursor.hex()
7c4b98a4e536 copy: add experimetal support for unmarking committed copies Martin von Zweigbergk <martinvonz@google.com> parents: 44388 diff changeset	2558 return self.tomemctx(
7c4b98a4e536 copy: add experimetal support for unmarking committed copies Martin von Zweigbergk <martinvonz@google.com> parents: 44388 diff changeset	2559 text=precursor.description(),
7c4b98a4e536 copy: add experimetal support for unmarking committed copies Martin von Zweigbergk <martinvonz@google.com> parents: 44388 diff changeset	2560 branch=precursor.branch(),
7c4b98a4e536 copy: add experimetal support for unmarking committed copies Martin von Zweigbergk <martinvonz@google.com> parents: 44388 diff changeset	2561 extra=extra,
7c4b98a4e536 copy: add experimetal support for unmarking committed copies Martin von Zweigbergk <martinvonz@google.com> parents: 44388 diff changeset	2562 date=precursor.date(),
7c4b98a4e536 copy: add experimetal support for unmarking committed copies Martin von Zweigbergk <martinvonz@google.com> parents: 44388 diff changeset	2563 user=precursor.user(),
7c4b98a4e536 copy: add experimetal support for unmarking committed copies Martin von Zweigbergk <martinvonz@google.com> parents: 44388 diff changeset	2564 )
7c4b98a4e536 copy: add experimetal support for unmarking committed copies Martin von Zweigbergk <martinvonz@google.com> parents: 44388 diff changeset	2565
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2566 def isdirty(self, path):
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2567 return path in self._cache
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2568
35295 307b1689e3f8 overlayworkingctx: make clean() public Phil Cohen <phillco@fb.com> parents: 35294 diff changeset	2569 def clean(self):
45510 19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	2570 self._mergestate = None
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2571 self._cache = {}
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2572
45199 1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2573 def _compact(self):
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2574 """Removes keys from the cache that are actually clean, by comparing
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2575 them with the underlying context.
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2576
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2577 This can occur during the merge process, e.g. by passing --tool :local
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2578 to resolve a conflict.
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2579 """
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2580 keys = []
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2581 # This won't be perfect, but can help performance significantly when
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2582 # using things like remotefilelog.
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2583 scmutil.prefetchfiles(
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2584 self.repo(),
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2585 [
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2586 (
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2587 self.p1().rev(),
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2588 scmutil.matchfiles(self.repo(), self._cache.keys()),
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2589 )
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2590 ],
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2591 )
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2592
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2593 for path in self._cache.keys():
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2594 cache = self._cache[path]
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2595 try:
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2596 underlying = self._wrappedctx[path]
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2597 if (
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2598 underlying.data() == cache[b'data']
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2599 and underlying.flags() == cache[b'flags']
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2600 ):
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2601 keys.append(path)
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2602 except error.ManifestLookupError:
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2603 # Path not in the underlying manifest (created).
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2604 continue
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2605
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2606 for path in keys:
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2607 del self._cache[path]
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2608 return keys
1476ec96965f context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842 Manuel Jacob <me@manueljacob.de> parents: 45092 diff changeset	2609
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2610 def _markdirty(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2611 self, path, exists, data=None, date=None, flags=b'', copied=None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2612 ):
39164 95bd19f60957 overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960) Kyle Lippincott <spectral@google.com> parents: 39115 diff changeset	2613 # data not provided, let's see if we already have some; if not, let's
95bd19f60957 overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960) Kyle Lippincott <spectral@google.com> parents: 39115 diff changeset	2614 # grab it from our underlying context, so that we always have data if
95bd19f60957 overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960) Kyle Lippincott <spectral@google.com> parents: 39115 diff changeset	2615 # the file is marked as existing.
95bd19f60957 overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960) Kyle Lippincott <spectral@google.com> parents: 39115 diff changeset	2616 if exists and data is None:
95bd19f60957 overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960) Kyle Lippincott <spectral@google.com> parents: 39115 diff changeset	2617 oldentry = self._cache.get(path) or {}
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2618 data = oldentry.get(b'data')
42535 e079e001d536 rebase: fix in-memory rebasing of copy of empty file Martin von Zweigbergk <martinvonz@google.com> parents: 42472 diff changeset	2619 if data is None:
e079e001d536 rebase: fix in-memory rebasing of copy of empty file Martin von Zweigbergk <martinvonz@google.com> parents: 42472 diff changeset	2620 data = self._wrappedctx[path].data()
39164 95bd19f60957 overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960) Kyle Lippincott <spectral@google.com> parents: 39115 diff changeset	2621
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2622 self._cache[path] = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2623 b'exists': exists,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2624 b'data': data,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2625 b'date': date,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2626 b'flags': flags,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2627 b'copied': copied,
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2628 }
46484 bc3f3b59d0a4 context: add missing manifest invalidation after write in overlayworkingctx Augie Fackler <augie@google.com> parents: 45957 diff changeset	2629 util.clearcachedproperty(self, b'_manifest')
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2630
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2631 def filectx(self, path, filelog=None):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2632 return overlayworkingfilectx(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2633 self._repo, path, parent=self, filelog=filelog
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2634 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2635
45510 19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	2636 def mergestate(self, clean=False):
19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	2637 if clean or self._mergestate is None:
19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	2638 self._mergestate = mergestatemod.memmergestate(self._repo)
19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	2639 return self._mergestate
19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	2640
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2641
35332 8e1386b342f7 overlayworkingctx: inherit from committablectx instead of workingctx Phil Cohen <phillco@fb.com> parents: 35331 diff changeset	2642 class overlayworkingfilectx(committablefilectx):
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2643 """Wrap a ``workingfilectx`` but intercepts all writes into an in-memory
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2644 cache, which can be flushed through later by calling ``flush()``."""
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2645
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2646 def __init__(self, repo, path, filelog=None, parent=None):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2647 super(overlayworkingfilectx, self).__init__(repo, path, filelog, parent)
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2648 self._repo = repo
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2649 self._parent = parent
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2650 self._path = path
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2651
34783 0c812885586b context: add overlayfilectx.cmp() Phil Cohen <phillco@fb.com> parents: 34685 diff changeset	2652 def cmp(self, fctx):
0c812885586b context: add overlayfilectx.cmp() Phil Cohen <phillco@fb.com> parents: 34685 diff changeset	2653 return self.data() != fctx.data()
0c812885586b context: add overlayfilectx.cmp() Phil Cohen <phillco@fb.com> parents: 34685 diff changeset	2654
35290 010179e21e91 context: switch ctx() use to changectx() Phil Cohen <phillco@fb.com> parents: 35280 diff changeset	2655 def changectx(self):
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2656 return self._parent
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2657
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2658 def data(self):
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2659 return self._parent.data(self._path)
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2660
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2661 def date(self):
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2662 return self._parent.filedate(self._path)
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2663
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2664 def exists(self):
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2665 return self.lexists()
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2666
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2667 def lexists(self):
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2668 return self._parent.exists(self._path)
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2669
41777 041d829575ed context: add specialized way of getting copy source file only Martin von Zweigbergk <martinvonz@google.com> parents: 41775 diff changeset	2670 def copysource(self):
041d829575ed context: add specialized way of getting copy source file only Martin von Zweigbergk <martinvonz@google.com> parents: 41775 diff changeset	2671 return self._parent.copydata(self._path)
041d829575ed context: add specialized way of getting copy source file only Martin von Zweigbergk <martinvonz@google.com> parents: 41775 diff changeset	2672
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2673 def size(self):
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2674 return self._parent.size(self._path)
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2675
35302 8b3a636bb341 overlayworkingctx: track copy information in the context Phil Cohen <phillco@fb.com> parents: 35298 diff changeset	2676 def markcopied(self, origin):
8b3a636bb341 overlayworkingctx: track copy information in the context Phil Cohen <phillco@fb.com> parents: 35298 diff changeset	2677 self._parent.markcopied(self._path, origin)
8b3a636bb341 overlayworkingctx: track copy information in the context Phil Cohen <phillco@fb.com> parents: 35298 diff changeset	2678
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2679 def audit(self):
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2680 pass
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2681
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2682 def flags(self):
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2683 return self._parent.flags(self._path)
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2684
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2685 def setflags(self, islink, isexec):
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2686 return self._parent.setflags(self._path, islink, isexec)
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2687
35725 2a7e777c9eed write: add the possibility to pass keyword argument from batchget to vfs Boris Feld <boris.feld@octobus.net> parents: 35610 diff changeset	2688 def write(self, data, flags, backgroundclose=False, **kwargs):
2a7e777c9eed write: add the possibility to pass keyword argument from batchget to vfs Boris Feld <boris.feld@octobus.net> parents: 35610 diff changeset	2689 return self._parent.write(self._path, data, flags, **kwargs)
34119 f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2690
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2691 def remove(self, ignoremissing=False):
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2692 return self._parent.remove(self._path)
f698bb31bdfb context: add overlayworkingcontext and overlayworkingfilectx Phil Cohen <phillco@fb.com> parents: 34068 diff changeset	2693
35331 baf58e621363 overlayworkingctx: add a no-op ``clearunknown()`` Phil Cohen <phillco@fb.com> parents: 35330 diff changeset	2694 def clearunknown(self):
baf58e621363 overlayworkingctx: add a no-op ``clearunknown()`` Phil Cohen <phillco@fb.com> parents: 35330 diff changeset	2695 pass
baf58e621363 overlayworkingctx: add a no-op ``clearunknown()`` Phil Cohen <phillco@fb.com> parents: 35330 diff changeset	2696
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2697
23710 745e3b485632 context: add workingcommitctx for exact context to be committed FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23709 diff changeset	2698 class workingcommitctx(workingctx):
745e3b485632 context: add workingcommitctx for exact context to be committed FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23709 diff changeset	2699 """A workingcommitctx object makes access to data related to
745e3b485632 context: add workingcommitctx for exact context to be committed FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23709 diff changeset	2700 the revision being committed convenient.
745e3b485632 context: add workingcommitctx for exact context to be committed FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23709 diff changeset	2701
745e3b485632 context: add workingcommitctx for exact context to be committed FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23709 diff changeset	2702 This hides changes in the working directory, if they aren't
745e3b485632 context: add workingcommitctx for exact context to be committed FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23709 diff changeset	2703 committed in this context.
745e3b485632 context: add workingcommitctx for exact context to be committed FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23709 diff changeset	2704 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2705
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2706 def __init__(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2707 self, repo, changes, text=b"", user=None, date=None, extra=None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2708 ):
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2709 super(workingcommitctx, self).__init__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2710 repo, text, user, date, extra, changes
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2711 )
23710 745e3b485632 context: add workingcommitctx for exact context to be committed FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23709 diff changeset	2712
33955 e43264525ce5 context: remove unnecessary default values for matchers (API) Martin von Zweigbergk <martinvonz@google.com> parents: 33954 diff changeset	2713 def _dirstatestatus(self, match, ignored=False, clean=False, unknown=False):
23712 bfce25d25c96 context: override _dirstatestatus in workingcommitctx for correct matching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23711 diff changeset	2714 """Return matched files only in ``self._status``
bfce25d25c96 context: override _dirstatestatus in workingcommitctx for correct matching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23711 diff changeset	2715
bfce25d25c96 context: override _dirstatestatus in workingcommitctx for correct matching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23711 diff changeset	2716 Uncommitted files appear "clean" via this context, even if
bfce25d25c96 context: override _dirstatestatus in workingcommitctx for correct matching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23711 diff changeset	2717 they aren't actually so in the working directory.
bfce25d25c96 context: override _dirstatestatus in workingcommitctx for correct matching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23711 diff changeset	2718 """
bfce25d25c96 context: override _dirstatestatus in workingcommitctx for correct matching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23711 diff changeset	2719 if clean:
bfce25d25c96 context: override _dirstatestatus in workingcommitctx for correct matching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23711 diff changeset	2720 clean = [f for f in self._manifest if f not in self._changedset]
bfce25d25c96 context: override _dirstatestatus in workingcommitctx for correct matching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23711 diff changeset	2721 else:
bfce25d25c96 context: override _dirstatestatus in workingcommitctx for correct matching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23711 diff changeset	2722 clean = []
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2723 return scmutil.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2724 [f for f in self._status.modified if match(f)],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2725 [f for f in self._status.added if match(f)],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2726 [f for f in self._status.removed if match(f)],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2727 [],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2728 [],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2729 [],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2730 clean,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2731 )
23712 bfce25d25c96 context: override _dirstatestatus in workingcommitctx for correct matching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23711 diff changeset	2732
bfce25d25c96 context: override _dirstatestatus in workingcommitctx for correct matching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23711 diff changeset	2733 @propertycache
bfce25d25c96 context: override _dirstatestatus in workingcommitctx for correct matching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23711 diff changeset	2734 def _changedset(self):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45911 diff changeset	2735 """Return the set of files changed in this context"""
23712 bfce25d25c96 context: override _dirstatestatus in workingcommitctx for correct matching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23711 diff changeset	2736 changed = set(self._status.modified)
bfce25d25c96 context: override _dirstatestatus in workingcommitctx for correct matching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23711 diff changeset	2737 changed.update(self._status.added)
bfce25d25c96 context: override _dirstatestatus in workingcommitctx for correct matching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23711 diff changeset	2738 changed.update(self._status.removed)
bfce25d25c96 context: override _dirstatestatus in workingcommitctx for correct matching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23711 diff changeset	2739 return changed
bfce25d25c96 context: override _dirstatestatus in workingcommitctx for correct matching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23711 diff changeset	2740
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2741
27906 c183f7b79541 context: don't use util.cachefunc due to cycle creation (issue5043) Gregory Szorc <gregory.szorc@gmail.com> parents: 27813 diff changeset	2742 def makecachingfilectxfn(func):
c183f7b79541 context: don't use util.cachefunc due to cycle creation (issue5043) Gregory Szorc <gregory.szorc@gmail.com> parents: 27813 diff changeset	2743 """Create a filectxfn that caches based on the path.
c183f7b79541 context: don't use util.cachefunc due to cycle creation (issue5043) Gregory Szorc <gregory.szorc@gmail.com> parents: 27813 diff changeset	2744
c183f7b79541 context: don't use util.cachefunc due to cycle creation (issue5043) Gregory Szorc <gregory.szorc@gmail.com> parents: 27813 diff changeset	2745 We can't use util.cachefunc because it uses all arguments as the cache
c183f7b79541 context: don't use util.cachefunc due to cycle creation (issue5043) Gregory Szorc <gregory.szorc@gmail.com> parents: 27813 diff changeset	2746 key and this creates a cycle since the arguments include the repo and
c183f7b79541 context: don't use util.cachefunc due to cycle creation (issue5043) Gregory Szorc <gregory.szorc@gmail.com> parents: 27813 diff changeset	2747 memctx.
c183f7b79541 context: don't use util.cachefunc due to cycle creation (issue5043) Gregory Szorc <gregory.szorc@gmail.com> parents: 27813 diff changeset	2748 """
c183f7b79541 context: don't use util.cachefunc due to cycle creation (issue5043) Gregory Szorc <gregory.szorc@gmail.com> parents: 27813 diff changeset	2749 cache = {}
c183f7b79541 context: don't use util.cachefunc due to cycle creation (issue5043) Gregory Szorc <gregory.szorc@gmail.com> parents: 27813 diff changeset	2750
c183f7b79541 context: don't use util.cachefunc due to cycle creation (issue5043) Gregory Szorc <gregory.szorc@gmail.com> parents: 27813 diff changeset	2751 def getfilectx(repo, memctx, path):
c183f7b79541 context: don't use util.cachefunc due to cycle creation (issue5043) Gregory Szorc <gregory.szorc@gmail.com> parents: 27813 diff changeset	2752 if path not in cache:
c183f7b79541 context: don't use util.cachefunc due to cycle creation (issue5043) Gregory Szorc <gregory.szorc@gmail.com> parents: 27813 diff changeset	2753 cache[path] = func(repo, memctx, path)
c183f7b79541 context: don't use util.cachefunc due to cycle creation (issue5043) Gregory Szorc <gregory.szorc@gmail.com> parents: 27813 diff changeset	2754 return cache[path]
c183f7b79541 context: don't use util.cachefunc due to cycle creation (issue5043) Gregory Szorc <gregory.szorc@gmail.com> parents: 27813 diff changeset	2755
c183f7b79541 context: don't use util.cachefunc due to cycle creation (issue5043) Gregory Szorc <gregory.szorc@gmail.com> parents: 27813 diff changeset	2756 return getfilectx
c183f7b79541 context: don't use util.cachefunc due to cycle creation (issue5043) Gregory Szorc <gregory.szorc@gmail.com> parents: 27813 diff changeset	2757
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2758
32783 34be21aa2b26 memctx: refactor inline getfilectx into convenience method Sean Farley <sean@farley.io> parents: 32772 diff changeset	2759 def memfilefromctx(ctx):
34be21aa2b26 memctx: refactor inline getfilectx into convenience method Sean Farley <sean@farley.io> parents: 32772 diff changeset	2760 """Given a context return a memfilectx for ctx[path]
34be21aa2b26 memctx: refactor inline getfilectx into convenience method Sean Farley <sean@farley.io> parents: 32772 diff changeset	2761
34be21aa2b26 memctx: refactor inline getfilectx into convenience method Sean Farley <sean@farley.io> parents: 32772 diff changeset	2762 This is a convenience method for building a memctx based on another
34be21aa2b26 memctx: refactor inline getfilectx into convenience method Sean Farley <sean@farley.io> parents: 32772 diff changeset	2763 context.
34be21aa2b26 memctx: refactor inline getfilectx into convenience method Sean Farley <sean@farley.io> parents: 32772 diff changeset	2764 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2765
32783 34be21aa2b26 memctx: refactor inline getfilectx into convenience method Sean Farley <sean@farley.io> parents: 32772 diff changeset	2766 def getfilectx(repo, memctx, path):
34be21aa2b26 memctx: refactor inline getfilectx into convenience method Sean Farley <sean@farley.io> parents: 32772 diff changeset	2767 fctx = ctx[path]
41994 550a172a603b memctx: rename constructor argument "copied" to "copysource" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41972 diff changeset	2768 copysource = fctx.copysource()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2769 return memfilectx(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2770 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2771 memctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2772 path,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2773 fctx.data(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2774 islink=fctx.islink(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2775 isexec=fctx.isexec(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2776 copysource=copysource,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2777 )
32783 34be21aa2b26 memctx: refactor inline getfilectx into convenience method Sean Farley <sean@farley.io> parents: 32772 diff changeset	2778
34be21aa2b26 memctx: refactor inline getfilectx into convenience method Sean Farley <sean@farley.io> parents: 32772 diff changeset	2779 return getfilectx
34be21aa2b26 memctx: refactor inline getfilectx into convenience method Sean Farley <sean@farley.io> parents: 32772 diff changeset	2780
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2781
32784 ec302748edd8 context: add convenience method for returning a memfilectx from a patch Sean Farley <sean@farley.io> parents: 32783 diff changeset	2782 def memfilefrompatch(patchstore):
ec302748edd8 context: add convenience method for returning a memfilectx from a patch Sean Farley <sean@farley.io> parents: 32783 diff changeset	2783 """Given a patch (e.g. patchstore object) return a memfilectx
ec302748edd8 context: add convenience method for returning a memfilectx from a patch Sean Farley <sean@farley.io> parents: 32783 diff changeset	2784
ec302748edd8 context: add convenience method for returning a memfilectx from a patch Sean Farley <sean@farley.io> parents: 32783 diff changeset	2785 This is a convenience method for building a memctx based on a patchstore.
ec302748edd8 context: add convenience method for returning a memfilectx from a patch Sean Farley <sean@farley.io> parents: 32783 diff changeset	2786 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2787
32784 ec302748edd8 context: add convenience method for returning a memfilectx from a patch Sean Farley <sean@farley.io> parents: 32783 diff changeset	2788 def getfilectx(repo, memctx, path):
41994 550a172a603b memctx: rename constructor argument "copied" to "copysource" (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41972 diff changeset	2789 data, mode, copysource = patchstore.getfile(path)
32784 ec302748edd8 context: add convenience method for returning a memfilectx from a patch Sean Farley <sean@farley.io> parents: 32783 diff changeset	2790 if data is None:
ec302748edd8 context: add convenience method for returning a memfilectx from a patch Sean Farley <sean@farley.io> parents: 32783 diff changeset	2791 return None
ec302748edd8 context: add convenience method for returning a memfilectx from a patch Sean Farley <sean@farley.io> parents: 32783 diff changeset	2792 islink, isexec = mode
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2793 return memfilectx(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2794 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2795 memctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2796 path,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2797 data,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2798 islink=islink,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2799 isexec=isexec,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2800 copysource=copysource,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2801 )
32784 ec302748edd8 context: add convenience method for returning a memfilectx from a patch Sean Farley <sean@farley.io> parents: 32783 diff changeset	2802
ec302748edd8 context: add convenience method for returning a memfilectx from a patch Sean Farley <sean@farley.io> parents: 32783 diff changeset	2803 return getfilectx
ec302748edd8 context: add convenience method for returning a memfilectx from a patch Sean Farley <sean@farley.io> parents: 32783 diff changeset	2804
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2805
21665 d2743be1bb06 memctx: inherit from committablectx Sean Farley <sean.michael.farley@gmail.com> parents: 21664 diff changeset	2806 class memctx(committablectx):
7077 ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2807 """Use memctx to perform in-memory commits via localrepo.commitctx().
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	2808
7077 ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2809 Revision information is supplied at initialization time while
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2810 related files data and is made available through a callback
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2811 mechanism. 'repo' is the current localrepo, 'parents' is a
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2812 sequence of two parent revisions identifiers (pass None for every
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2813 missing parent), 'text' is the commit message and 'files' lists
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2814 names of files touched by the revision (normalized and relative to
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2815 repository root).
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	2816
7077 ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2817 filectxfn(repo, memctx, path) is a callable receiving the
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2818 repository, the current memctx object and the normalized path of
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2819 requested file, relative to repository root. It is fired by the
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2820 commit function for every file in 'files', but calls order is
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2821 undefined. If the file is available in the revision being
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2822 committed (updated or added), filectxfn returns a memfilectx
31617 c93cdfa131a8 misc: update descriptions about removed file for filectxfn FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31483 diff changeset	2823 object. If the file was removed, filectxfn return None for recent
c93cdfa131a8 misc: update descriptions about removed file for filectxfn FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 31483 diff changeset	2824 Mercurial. Moved files are represented by marking the source file
7077 ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2825 removed and the new file added with copy information (see
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2826 memfilectx).
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2827
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2828 user receives the committer name and defaults to current
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2829 repository username, date is the commit date in any format
36636 c6061cadb400 util: extract all date-related utils in utils/dateutil module Boris Feld <boris.feld@octobus.net> parents: 36441 diff changeset	2830 supported by dateutil.parsedate() and defaults to current date, extra
7077 ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2831 is a dictionary of metadata or is left empty.
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	2832 """
22313 d226fe36e362 memctx: allow extensions to determine what filectxfn should do Siddharth Agarwal <sid0@fb.com> parents: 22296 diff changeset	2833
d226fe36e362 memctx: allow extensions to determine what filectxfn should do Siddharth Agarwal <sid0@fb.com> parents: 22296 diff changeset	2834 # Mercurial <= 3.1 expects the filectxfn to raise IOError for missing files.
d226fe36e362 memctx: allow extensions to determine what filectxfn should do Siddharth Agarwal <sid0@fb.com> parents: 22296 diff changeset	2835 # Extensions that need to retain compatibility across Mercurial 3.1 can use
d226fe36e362 memctx: allow extensions to determine what filectxfn should do Siddharth Agarwal <sid0@fb.com> parents: 22296 diff changeset	2836 # this field to determine what to do in filectxfn.
d226fe36e362 memctx: allow extensions to determine what filectxfn should do Siddharth Agarwal <sid0@fb.com> parents: 22296 diff changeset	2837 _returnnoneformissingfiles = True
d226fe36e362 memctx: allow extensions to determine what filectxfn should do Siddharth Agarwal <sid0@fb.com> parents: 22296 diff changeset	2838
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2839 def __init__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2840 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2841 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2842 parents,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2843 text,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2844 files,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2845 filectxfn,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2846 user=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2847 date=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2848 extra=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2849 branch=None,
44025 3216cabffd4a commit: change default `editor` parameter to None Matt Harbison <matt_harbison@yahoo.com> parents: 44012 diff changeset	2850 editor=None,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2851 ):
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2852 super(memctx, self).__init__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2853 repo, text, user, date, extra, branch=branch
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2854 )
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	2855 self._rev = None
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	2856 self._node = None
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	2857 parents = [(p or self._repo.nodeconstants.nullid) for p in parents]
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	2858 p1, p2 = parents
37175 05ff1a155a21 memctx: create parent contexts using "repo[p]" syntax Martin von Zweigbergk <martinvonz@google.com> parents: 37173 diff changeset	2859 self._parents = [self._repo[p] for p in (p1, p2)]
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8207 diff changeset	2860 files = sorted(set(files))
23587 8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2861 self._files = files
21938 c8411fb5dfef memctx: substate needs to be {} instead of None Sean Farley <sean.michael.farley@gmail.com> parents: 21895 diff changeset	2862 self.substate = {}
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	2863
32785 041d976b662a context: inline makememctx (API) Sean Farley <sean@farley.io> parents: 32784 diff changeset	2864 if isinstance(filectxfn, patch.filestore):
32801 448fc659a430 memctx: always use cache for filectxfn Sean Farley <sean@farley.io> parents: 32785 diff changeset	2865 filectxfn = memfilefrompatch(filectxfn)
32785 041d976b662a context: inline makememctx (API) Sean Farley <sean@farley.io> parents: 32784 diff changeset	2866 elif not callable(filectxfn):
041d976b662a context: inline makememctx (API) Sean Farley <sean@farley.io> parents: 32784 diff changeset	2867 # if store is not callable, wrap it in a function
32801 448fc659a430 memctx: always use cache for filectxfn Sean Farley <sean@farley.io> parents: 32785 diff changeset	2868 filectxfn = memfilefromctx(filectxfn)
448fc659a430 memctx: always use cache for filectxfn Sean Farley <sean@farley.io> parents: 32785 diff changeset	2869
448fc659a430 memctx: always use cache for filectxfn Sean Farley <sean@farley.io> parents: 32785 diff changeset	2870 # memoizing increases performance for e.g. vcs convert scenarios.
448fc659a430 memctx: always use cache for filectxfn Sean Farley <sean@farley.io> parents: 32785 diff changeset	2871 self._filectxfn = makecachingfilectxfn(filectxfn)
22072 443ef664fb55 memctx: create a filectxfn if it is not callable Sean Farley <sean.michael.farley@gmail.com> parents: 22055 diff changeset	2872
21238 25d6fdc0294a context: move editor invocation from "makememctx()" to "memctx.__init__()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21203 diff changeset	2873 if editor:
25d6fdc0294a context: move editor invocation from "makememctx()" to "memctx.__init__()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21203 diff changeset	2874 self._text = editor(self._repo, self, [])
25d6fdc0294a context: move editor invocation from "makememctx()" to "memctx.__init__()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21203 diff changeset	2875 self._repo.savecommitmessage(self._text)
25d6fdc0294a context: move editor invocation from "makememctx()" to "memctx.__init__()" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21203 diff changeset	2876
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	2877 def filectx(self, path, filelog=None):
22296 650b5b6e75ed convert: use None value for missing files instead of overloading IOError Mads Kiilerich <madski@unity3d.com> parents: 22207 diff changeset	2878 """get a file context from the working directory
650b5b6e75ed convert: use None value for missing files instead of overloading IOError Mads Kiilerich <madski@unity3d.com> parents: 22207 diff changeset	2879
650b5b6e75ed convert: use None value for missing files instead of overloading IOError Mads Kiilerich <madski@unity3d.com> parents: 22207 diff changeset	2880 Returns None if file doesn't exist and should be removed."""
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	2881 return self._filectxfn(self._repo, self, path)
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	2882
11151 c5c190822501 slightly improve memctx api Alexander Solovyov <piranha@piranha.org.ua> parents: 11144 diff changeset	2883 def commit(self):
c5c190822501 slightly improve memctx api Alexander Solovyov <piranha@piranha.org.ua> parents: 11144 diff changeset	2884 """commit context to the repo"""
c5c190822501 slightly improve memctx api Alexander Solovyov <piranha@piranha.org.ua> parents: 11144 diff changeset	2885 return self._repo.commitctx(self)
c5c190822501 slightly improve memctx api Alexander Solovyov <piranha@piranha.org.ua> parents: 11144 diff changeset	2886
21835 b342c3e2518a memctx: add _manifest implementation that computes the filenode Sean Farley <sean.michael.farley@gmail.com> parents: 21834 diff changeset	2887 @propertycache
b342c3e2518a memctx: add _manifest implementation that computes the filenode Sean Farley <sean.michael.farley@gmail.com> parents: 21834 diff changeset	2888 def _manifest(self):
b342c3e2518a memctx: add _manifest implementation that computes the filenode Sean Farley <sean.michael.farley@gmail.com> parents: 21834 diff changeset	2889 """generate a manifest based on the return values of filectxfn"""
b342c3e2518a memctx: add _manifest implementation that computes the filenode Sean Farley <sean.michael.farley@gmail.com> parents: 21834 diff changeset	2890
b342c3e2518a memctx: add _manifest implementation that computes the filenode Sean Farley <sean.michael.farley@gmail.com> parents: 21834 diff changeset	2891 # keep this simple for now; just worry about p1
b342c3e2518a memctx: add _manifest implementation that computes the filenode Sean Farley <sean.michael.farley@gmail.com> parents: 21834 diff changeset	2892 pctx = self._parents[0]
b342c3e2518a memctx: add _manifest implementation that computes the filenode Sean Farley <sean.michael.farley@gmail.com> parents: 21834 diff changeset	2893 man = pctx.manifest().copy()
b342c3e2518a memctx: add _manifest implementation that computes the filenode Sean Farley <sean.michael.farley@gmail.com> parents: 21834 diff changeset	2894
23603 d74eb8d477d5 memctx: calculate manifest more efficiently FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23602 diff changeset	2895 for f in self._status.modified:
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	2896 man[f] = self._repo.nodeconstants.modifiednodeid
21835 b342c3e2518a memctx: add _manifest implementation that computes the filenode Sean Farley <sean.michael.farley@gmail.com> parents: 21834 diff changeset	2897
23588 87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	2898 for f in self._status.added:
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	2899 man[f] = self._repo.nodeconstants.addednodeid
23588 87a76cff7147 memctx: calculate manifest including newly added files correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23587 diff changeset	2900
23589 200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	2901 for f in self._status.removed:
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	2902 if f in man:
200215cdf7aa memctx: calculate manifest correctly with newly-removed files (issue4470) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23588 diff changeset	2903 del man[f]
21835 b342c3e2518a memctx: add _manifest implementation that computes the filenode Sean Farley <sean.michael.farley@gmail.com> parents: 21834 diff changeset	2904
b342c3e2518a memctx: add _manifest implementation that computes the filenode Sean Farley <sean.michael.farley@gmail.com> parents: 21834 diff changeset	2905 return man
b342c3e2518a memctx: add _manifest implementation that computes the filenode Sean Farley <sean.michael.farley@gmail.com> parents: 21834 diff changeset	2906
23587 8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2907 @propertycache
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2908 def _status(self):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45911 diff changeset	2909 """Calculate exact status from ``files`` specified at construction"""
23587 8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2910 man1 = self.p1().manifest()
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2911 p2 = self._parents[1]
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2912 # "1 < len(self._parents)" can't be used for checking
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2913 # existence of the 2nd parent, because "memctx._parents" is
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2914 # explicitly initialized by the list, of which length is 2.
46843 728d89f6f9b1 refactor: prefer checks against nullrev over nullid Joerg Sonnenberger <joerg@bec.de> parents: 46842 diff changeset	2915 if p2.rev() != nullrev:
23587 8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2916 man2 = p2.manifest()
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2917 managing = lambda f: f in man1 or f in man2
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2918 else:
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2919 managing = lambda f: f in man1
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2920
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2921 modified, added, removed = [], [], []
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2922 for f in self._files:
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2923 if not managing(f):
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2924 added.append(f)
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2925 elif self[f]:
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2926 modified.append(f)
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2927 else:
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2928 removed.append(f)
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2929
8063901e56cd memctx: calculate exact status being committed from specified files FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23584 diff changeset	2930 return scmutil.status(modified, added, removed, [], [], [], [])
21835 b342c3e2518a memctx: add _manifest implementation that computes the filenode Sean Farley <sean.michael.farley@gmail.com> parents: 21834 diff changeset	2931
45090 d085fcb11c56 memctx: make `parents()` return list of one element if it?s not a merge Manuel Jacob <me@manueljacob.de> parents: 45089 diff changeset	2932 def parents(self):
46843 728d89f6f9b1 refactor: prefer checks against nullrev over nullid Joerg Sonnenberger <joerg@bec.de> parents: 46842 diff changeset	2933 if self._parents[1].rev() == nullrev:
45090 d085fcb11c56 memctx: make `parents()` return list of one element if it?s not a merge Manuel Jacob <me@manueljacob.de> parents: 45089 diff changeset	2934 return [self._parents[0]]
d085fcb11c56 memctx: make `parents()` return list of one element if it?s not a merge Manuel Jacob <me@manueljacob.de> parents: 45089 diff changeset	2935 return self._parents
d085fcb11c56 memctx: make `parents()` return list of one element if it?s not a merge Manuel Jacob <me@manueljacob.de> parents: 45089 diff changeset	2936
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2937
21688 cc677803bad4 memfilectx: inherit from committablefilectx Sean Farley <sean.michael.farley@gmail.com> parents: 21687 diff changeset	2938 class memfilectx(committablefilectx):
7077 ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2939 """memfilectx represents an in-memory file to commit.
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2940
23139 e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23110 diff changeset	2941 See memctx and committablefilectx for more details.
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	2942 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2943
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2944 def __init__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2945 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2946 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2947 changectx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2948 path,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2949 data,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2950 islink=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2951 isexec=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2952 copysource=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	2953 ):
7077 ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2954 """
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2955 path is the normalized file path relative to repository root.
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2956 data is the file content as a string.
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2957 islink is True if the file is a symbolic link.
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2958 isexec is True if the file is executable.
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2959 copied is the source file path if current file was copied in the
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	2960 revision being committed, or None."""
35407 8a0cac20a1ad memfilectx: make changectx argument mandatory in constructor (API) Martin von Zweigbergk <martinvonz@google.com> parents: 35362 diff changeset	2961 super(memfilectx, self).__init__(repo, path, None, changectx)
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	2962 self._data = data
38761 d558e53cd6b6 context: safegaurd against 'lx' being passed as file flag in manifest Pulkit Goyal <pulkit@yandex-team.ru> parents: 38755 diff changeset	2963 if islink:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2964 self._flags = b'l'
38761 d558e53cd6b6 context: safegaurd against 'lx' being passed as file flag in manifest Pulkit Goyal <pulkit@yandex-team.ru> parents: 38755 diff changeset	2965 elif isexec:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2966 self._flags = b'x'
38761 d558e53cd6b6 context: safegaurd against 'lx' being passed as file flag in manifest Pulkit Goyal <pulkit@yandex-team.ru> parents: 38755 diff changeset	2967 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2968 self._flags = b''
41995 6fef387af1da memfilectx: override copysource() instead of using dummy nodeid Martin von Zweigbergk <martinvonz@google.com> parents: 41994 diff changeset	2969 self._copysource = copysource
6fef387af1da memfilectx: override copysource() instead of using dummy nodeid Martin von Zweigbergk <martinvonz@google.com> parents: 41994 diff changeset	2970
6fef387af1da memfilectx: override copysource() instead of using dummy nodeid Martin von Zweigbergk <martinvonz@google.com> parents: 41994 diff changeset	2971 def copysource(self):
6fef387af1da memfilectx: override copysource() instead of using dummy nodeid Martin von Zweigbergk <martinvonz@google.com> parents: 41994 diff changeset	2972 return self._copysource
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	2973
40470 328557af18eb context: reimplement memfilectx.cmp() Yuya Nishihara <yuya@tcha.org> parents: 40461 diff changeset	2974 def cmp(self, fctx):
328557af18eb context: reimplement memfilectx.cmp() Yuya Nishihara <yuya@tcha.org> parents: 40461 diff changeset	2975 return self.data() != fctx.data()
328557af18eb context: reimplement memfilectx.cmp() Yuya Nishihara <yuya@tcha.org> parents: 40461 diff changeset	2976
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	2977 def data(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	2978 return self._data
22074 fbe967b027bd memfilectx: add remove and write methods Sean Farley <sean.michael.farley@gmail.com> parents: 22073 diff changeset	2979
fbe967b027bd memfilectx: add remove and write methods Sean Farley <sean.michael.farley@gmail.com> parents: 22073 diff changeset	2980 def remove(self, ignoremissing=False):
fbe967b027bd memfilectx: add remove and write methods Sean Farley <sean.michael.farley@gmail.com> parents: 22073 diff changeset	2981 """wraps unlink for a repo's working directory"""
fbe967b027bd memfilectx: add remove and write methods Sean Farley <sean.michael.farley@gmail.com> parents: 22073 diff changeset	2982 # need to figure out what to do here
fbe967b027bd memfilectx: add remove and write methods Sean Farley <sean.michael.farley@gmail.com> parents: 22073 diff changeset	2983 del self._changectx[self._path]
fbe967b027bd memfilectx: add remove and write methods Sean Farley <sean.michael.farley@gmail.com> parents: 22073 diff changeset	2984
35725 2a7e777c9eed write: add the possibility to pass keyword argument from batchget to vfs Boris Feld <boris.feld@octobus.net> parents: 35610 diff changeset	2985 def write(self, data, flags, **kwargs):
22074 fbe967b027bd memfilectx: add remove and write methods Sean Farley <sean.michael.farley@gmail.com> parents: 22073 diff changeset	2986 """wraps repo.wwrite"""
fbe967b027bd memfilectx: add remove and write methods Sean Farley <sean.michael.farley@gmail.com> parents: 22073 diff changeset	2987 self._data = data
30572 73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	2988
32283 07da778f3b58 filectx: add an overlayfilectx class Jun Wu <quark@fb.com> parents: 32282 diff changeset	2989
30572 73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	2990 class metadataonlyctx(committablectx):
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	2991 """Like memctx but it's reusing the manifest of different commit.
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	2992 Intended to be used by lightweight operations that are creating
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	2993 metadata-only changes.
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	2994
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	2995 Revision information is supplied at initialization time. 'repo' is the
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	2996 current localrepo, 'ctx' is original revision which manifest we're reuisng
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	2997 'parents' is a sequence of two parent revisions identifiers (pass None for
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	2998 every missing parent), 'text' is the commit.
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	2999
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3000 user receives the committer name and defaults to current repository
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3001 username, date is the commit date in any format supported by
36636 c6061cadb400 util: extract all date-related utils in utils/dateutil module Boris Feld <boris.feld@octobus.net> parents: 36441 diff changeset	3002 dateutil.parsedate() and defaults to current date, extra is a dictionary of
30572 73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3003 metadata or is left empty.
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3004 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3005
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3006 def __init__(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3007 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3008 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3009 originalctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3010 parents=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3011 text=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3012 user=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3013 date=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3014 extra=None,
44025 3216cabffd4a commit: change default `editor` parameter to None Matt Harbison <matt_harbison@yahoo.com> parents: 44012 diff changeset	3015 editor=None,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3016 ):
34016 becce02036e1 context: make parents and text optional in metadataonlyctx Jun Wu <quark@fb.com> parents: 33955 diff changeset	3017 if text is None:
becce02036e1 context: make parents and text optional in metadataonlyctx Jun Wu <quark@fb.com> parents: 33955 diff changeset	3018 text = originalctx.description()
30572 73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3019 super(metadataonlyctx, self).__init__(repo, text, user, date, extra)
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3020 self._rev = None
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3021 self._node = None
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3022 self._originalctx = originalctx
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3023 self._manifestnode = originalctx.manifestnode()
34016 becce02036e1 context: make parents and text optional in metadataonlyctx Jun Wu <quark@fb.com> parents: 33955 diff changeset	3024 if parents is None:
becce02036e1 context: make parents and text optional in metadataonlyctx Jun Wu <quark@fb.com> parents: 33955 diff changeset	3025 parents = originalctx.parents()
becce02036e1 context: make parents and text optional in metadataonlyctx Jun Wu <quark@fb.com> parents: 33955 diff changeset	3026 else:
becce02036e1 context: make parents and text optional in metadataonlyctx Jun Wu <quark@fb.com> parents: 33955 diff changeset	3027 parents = [repo[p] for p in parents if p is not None]
becce02036e1 context: make parents and text optional in metadataonlyctx Jun Wu <quark@fb.com> parents: 33955 diff changeset	3028 parents = parents[:]
becce02036e1 context: make parents and text optional in metadataonlyctx Jun Wu <quark@fb.com> parents: 33955 diff changeset	3029 while len(parents) < 2:
46842 ad878e3f282b refactor: prefer lookup by revision, even for null Joerg Sonnenberger <joerg@bec.de> parents: 46819 diff changeset	3030 parents.append(repo[nullrev])
34016 becce02036e1 context: make parents and text optional in metadataonlyctx Jun Wu <quark@fb.com> parents: 33955 diff changeset	3031 p1, p2 = self._parents = parents
30572 73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3032
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3033 # sanity check to ensure that the reused manifest parents are
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3034 # manifests of our commit parents
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3035 mp1, mp2 = self.manifestctx().parents
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	3036 if p1 != self._repo.nodeconstants.nullid and p1.manifestnode() != mp1:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3037 raise RuntimeError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3038 r"can't reuse the manifest: its p1 "
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3039 r"doesn't match the new ctx p1"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3040 )
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46843 diff changeset	3041 if p2 != self._repo.nodeconstants.nullid and p2.manifestnode() != mp2:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3042 raise RuntimeError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3043 r"can't reuse the manifest: "
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3044 r"its p2 doesn't match the new ctx p2"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3045 )
30572 73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3046
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3047 self._files = originalctx.files()
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3048 self.substate = {}
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3049
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3050 if editor:
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3051 self._text = editor(self._repo, self, [])
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3052 self._repo.savecommitmessage(self._text)
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3053
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3054 def manifestnode(self):
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3055 return self._manifestnode
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3056
32552 6ae068f801e3 context: do not cache manifestctx Jun Wu <quark@fb.com> parents: 32519 diff changeset	3057 @property
30572 73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3058 def _manifestctx(self):
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3059 return self._repo.manifestlog[self._manifestnode]
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3060
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3061 def filectx(self, path, filelog=None):
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3062 return self._originalctx.filectx(path, filelog=filelog)
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3063
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3064 def commit(self):
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3065 """commit context to the repo"""
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3066 return self._repo.commitctx(self)
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3067
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3068 @property
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3069 def _manifest(self):
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3070 return self._originalctx.manifest()
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3071
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3072 @propertycache
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3073 def _status(self):
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3074 """Calculate exact status from ``files`` specified in the ``origctx``
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3075 and parents manifests.
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3076 """
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3077 man1 = self.p1().manifest()
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3078 p2 = self._parents[1]
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3079 # "1 < len(self._parents)" can't be used for checking
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3080 # existence of the 2nd parent, because "metadataonlyctx._parents" is
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3081 # explicitly initialized by the list, of which length is 2.
46843 728d89f6f9b1 refactor: prefer checks against nullrev over nullid Joerg Sonnenberger <joerg@bec.de> parents: 46842 diff changeset	3082 if p2.rev() != nullrev:
30572 73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3083 man2 = p2.manifest()
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3084 managing = lambda f: f in man1 or f in man2
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3085 else:
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3086 managing = lambda f: f in man1
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3087
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3088 modified, added, removed = [], [], []
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3089 for f in self._files:
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3090 if not managing(f):
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3091 added.append(f)
34017 be814edf3306 metadataonlyctx: don't crash when reusing the manifest with deletions Jun Wu <quark@fb.com> parents: 34016 diff changeset	3092 elif f in self:
30572 73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3093 modified.append(f)
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3094 else:
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3095 removed.append(f)
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3096
73ce055b169a memctx: allow the metadataonlyctx thats reusing the manifest node Mateusz Kwapich <mitrandir@fb.com> parents: 30371 diff changeset	3097 return scmutil.status(modified, added, removed, [], [], [], [])
34068 d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3098
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3099
34068 d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3100 class arbitraryfilectx(object):
d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3101 """Allows you to use filectx-like functions on a file in an arbitrary
d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3102 location on disk, possibly not in the working directory.
d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3103 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 43025 diff changeset	3104
34685 6036e6e205ca context: add a fast-comparision for arbitraryfilectx and workingfilectx Phil Cohen <phillco@fb.com> parents: 34681 diff changeset	3105 def __init__(self, path, repo=None):
6036e6e205ca context: add a fast-comparision for arbitraryfilectx and workingfilectx Phil Cohen <phillco@fb.com> parents: 34681 diff changeset	3106 # Repo is optional because contrib/simplemerge uses this class.
6036e6e205ca context: add a fast-comparision for arbitraryfilectx and workingfilectx Phil Cohen <phillco@fb.com> parents: 34681 diff changeset	3107 self._repo = repo
34068 d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3108 self._path = path
d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3109
34685 6036e6e205ca context: add a fast-comparision for arbitraryfilectx and workingfilectx Phil Cohen <phillco@fb.com> parents: 34681 diff changeset	3110 def cmp(self, fctx):
34835 14c87708f432 arbitraryfilecontext: skip the cmp fast path if any side is a symlink Phil Cohen <phillco@fb.com> parents: 34833 diff changeset	3111 # filecmp follows symlinks whereas `cmp` should not, so skip the fast
14c87708f432 arbitraryfilecontext: skip the cmp fast path if any side is a symlink Phil Cohen <phillco@fb.com> parents: 34833 diff changeset	3112 # path if either side is a symlink.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	3113 symlinks = b'l' in self.flags() or b'l' in fctx.flags()
34835 14c87708f432 arbitraryfilecontext: skip the cmp fast path if any side is a symlink Phil Cohen <phillco@fb.com> parents: 34833 diff changeset	3114 if not symlinks and isinstance(fctx, workingfilectx) and self._repo:
34685 6036e6e205ca context: add a fast-comparision for arbitraryfilectx and workingfilectx Phil Cohen <phillco@fb.com> parents: 34681 diff changeset	3115 # Add a fast-path for merge if both sides are disk-backed.
34835 14c87708f432 arbitraryfilecontext: skip the cmp fast path if any side is a symlink Phil Cohen <phillco@fb.com> parents: 34833 diff changeset	3116 # Note that filecmp uses the opposite return values (True if same)
14c87708f432 arbitraryfilecontext: skip the cmp fast path if any side is a symlink Phil Cohen <phillco@fb.com> parents: 34833 diff changeset	3117 # from our cmp functions (True if different).
34685 6036e6e205ca context: add a fast-comparision for arbitraryfilectx and workingfilectx Phil Cohen <phillco@fb.com> parents: 34681 diff changeset	3118 return not filecmp.cmp(self.path(), self._repo.wjoin(fctx.path()))
6036e6e205ca context: add a fast-comparision for arbitraryfilectx and workingfilectx Phil Cohen <phillco@fb.com> parents: 34681 diff changeset	3119 return self.data() != fctx.data()
34068 d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3120
d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3121 def path(self):
d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3122 return self._path
d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3123
d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3124 def flags(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	3125 return b''
34068 d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3126
d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3127 def data(self):
d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3128 return util.readfile(self._path)
d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3129
d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3130 def decodeddata(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	3131 with open(self._path, b"rb") as f:
34068 d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3132 return f.read()
d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3133
d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3134 def remove(self):
d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3135 util.unlink(self._path)
d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3136
35725 2a7e777c9eed write: add the possibility to pass keyword argument from batchget to vfs Boris Feld <boris.feld@octobus.net> parents: 35610 diff changeset	3137 def write(self, data, flags, **kwargs):
34068 d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3138 assert not flags
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	3139 with open(self._path, b"wb") as f:
34068 d2fc88426d21 context: add arbitraryfilectx, which can represent files outside the workdir Phil Cohen <phillco@fb.com> parents: 34054 diff changeset	3140 f.write(data)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/context.py @ 48429:41f40f35278a