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

annotate mercurial/context.py @ 16143:fceb2964fa6c stable

context: add 'dirs()' to changectx/workingctx for directory patterns this patch adds 'dirs()' to changectx/workingctx, which returns map of all directories deduced from manifest, to examine whether specified pattern is related to the context as directory or not quickly. 'workingctx.dirs()' uses 'dirstate.dirs()' rather than building another copy of it.

author	FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date	Thu, 23 Feb 2012 00:07:54 +0900
parents	131d1a09108a
children	616c2e278f18

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 #
4635 63b9d2deed48 Updated copyright notices and add "and others" to "hg version" Thomas Arendsen Hein <thomas@intevation.de> parents: 4417 diff changeset	3 # Copyright 2006, 2007 Matt Mackall <mpm@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
6763 403682f1c678 context: add __int__ and hex methods Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	8 from node import nullid, nullrev, short, hex
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	9 from i18n import _
15818 57241845a4bb phases: store phase values in constant instead of using raw integer Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15738 diff changeset	10 import ancestor, mdiff, error, util, scmutil, subrepo, patch, encoding, phases
14669 2d2604adfdd6 context: add a match builder method Matt Mackall <mpm@selenic.com> parents: 14644 diff changeset	11 import match as matchmod
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	12 import os, errno, stat
3122 da85145d4571 filectx: add rename traversal for parents() Matt Mackall <mpm@selenic.com> parents: 2859 diff changeset	13
8207 dd8d5be57d65 util: take propertycache from context.py Matt Mackall <mpm@selenic.com> parents: 8157 diff changeset	14 propertycache = util.propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	15
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	16 class changectx(object):
482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	17 """A changecontext object makes access to data related to a particular
482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	18 changeset convenient."""
6741 5918e2b79859 context: simplify changeid logic Matt Mackall <mpm@selenic.com> parents: 6737 diff changeset	19 def __init__(self, repo, changeid=''):
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	20 """changeid is a revision number, node, or tag"""
6741 5918e2b79859 context: simplify changeid logic Matt Mackall <mpm@selenic.com> parents: 6737 diff changeset	21 if changeid == '':
5918e2b79859 context: simplify changeid logic Matt Mackall <mpm@selenic.com> parents: 6737 diff changeset	22 changeid = '.'
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	23 self._repo = repo
7367 ad0eb8762458 context: special-case changectx setup for integer changeid Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7361 diff changeset	24 if isinstance(changeid, (long, int)):
ad0eb8762458 context: special-case changectx setup for integer changeid Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7361 diff changeset	25 self._rev = changeid
ad0eb8762458 context: special-case changectx setup for integer changeid Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7361 diff changeset	26 self._node = self._repo.changelog.node(changeid)
ad0eb8762458 context: special-case changectx setup for integer changeid Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7361 diff changeset	27 else:
ad0eb8762458 context: special-case changectx setup for integer changeid Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7361 diff changeset	28 self._node = self._repo.lookup(changeid)
ad0eb8762458 context: special-case changectx setup for integer changeid Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7361 diff changeset	29 self._rev = self._repo.changelog.rev(self._node)
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	30
3166 ebdb3f616bc0 Add str methods to contexts Matt Mackall <mpm@selenic.com> parents: 3165 diff changeset	31 def __str__(self):
ebdb3f616bc0 Add str methods to contexts Matt Mackall <mpm@selenic.com> parents: 3165 diff changeset	32 return short(self.node())
ebdb3f616bc0 Add str methods to contexts Matt Mackall <mpm@selenic.com> parents: 3165 diff changeset	33
6763 403682f1c678 context: add __int__ and hex methods Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	34 def __int__(self):
403682f1c678 context: add __int__ and hex methods Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	35 return self.rev()
403682f1c678 context: add __int__ and hex methods Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	36
3151 6719b3dd7d50 context: add __repr__ methods Matt Mackall <mpm@selenic.com> parents: 3150 diff changeset	37 def __repr__(self):
3216 d865390c1781 context: simplify repr methods Matt Mackall <mpm@selenic.com> parents: 3215 diff changeset	38 return "<changectx %s>" % str(self)
3151 6719b3dd7d50 context: add __repr__ methods Matt Mackall <mpm@selenic.com> parents: 3150 diff changeset	39
6469 fb502719c75c python 2.6 compatibility: add __hash__ to classes that have __eq__ Paul Moore <p.f.moore@gmail.com> parents: 6286 diff changeset	40 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	41 try:
fb502719c75c python 2.6 compatibility: add __hash__ to classes that have __eq__ Paul Moore <p.f.moore@gmail.com> parents: 6286 diff changeset	42 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	43 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	44 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	45
3165 e78185746554 Add equality operators to changectx and filectx Matt Mackall <mpm@selenic.com> parents: 3152 diff changeset	46 def __eq__(self, other):
3715 6cb3aca69cdc Make context __eq__ handle arbitrary RHS values Brendan Cully <brendan@kublai.com> parents: 3712 diff changeset	47 try:
6cb3aca69cdc Make context __eq__ handle arbitrary RHS values Brendan Cully <brendan@kublai.com> parents: 3712 diff changeset	48 return self._rev == other._rev
6cb3aca69cdc Make context __eq__ handle arbitrary RHS values Brendan Cully <brendan@kublai.com> parents: 3712 diff changeset	49 except AttributeError:
6cb3aca69cdc Make context __eq__ handle arbitrary RHS values Brendan Cully <brendan@kublai.com> parents: 3712 diff changeset	50 return False
3165 e78185746554 Add equality operators to changectx and filectx Matt Mackall <mpm@selenic.com> parents: 3152 diff changeset	51
4748 8808ea7da86b merge: make test for fast-forward merge stricter (issue619) Matt Mackall <mpm@selenic.com> parents: 4663 diff changeset	52 def __ne__(self, other):
8808ea7da86b merge: make test for fast-forward merge stricter (issue619) Matt Mackall <mpm@selenic.com> parents: 4663 diff changeset	53 return not (self == other)
8808ea7da86b merge: make test for fast-forward merge stricter (issue619) Matt Mackall <mpm@selenic.com> parents: 4663 diff changeset	54
3168 05c588e1803d context: add __nonzero__ methods Matt Mackall <mpm@selenic.com> parents: 3166 diff changeset	55 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	56 return self._rev != nullrev
3168 05c588e1803d context: add __nonzero__ methods Matt Mackall <mpm@selenic.com> parents: 3166 diff changeset	57
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	58 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	59 def _changeset(self):
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	60 return self._repo.changelog.read(self.node())
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	61
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	62 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	63 def _manifest(self):
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	64 return self._repo.manifest.read(self._changeset[0])
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	65
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	66 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	67 def _manifestdelta(self):
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	68 return self._repo.manifest.readdelta(self._changeset[0])
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	69
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	70 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	71 def _parents(self):
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	72 p = self._repo.changelog.parentrevs(self._rev)
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	73 if p[1] == nullrev:
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	74 p = p[:-1]
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	75 return [changectx(self._repo, x) for x in p]
3215 931288cf58a7 contexts: use __getattr__ rather than try/except in changectx Matt Mackall <mpm@selenic.com> parents: 3214 diff changeset	76
8812 859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8717 diff changeset	77 @propertycache
859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8717 diff changeset	78 def substate(self):
11775 a8614c5a5e9a subrepos: support remapping of .hgsub source paths Martin Geisler <mg@lazybytes.net> parents: 11703 diff changeset	79 return subrepo.state(self, self._repo.ui)
8812 859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8717 diff changeset	80
4909 1fd7a99d98f6 context: add __contains__, __getitem__, and __iter__ Matt Mackall <mpm@selenic.com> parents: 4889 diff changeset	81 def __contains__(self, key):
1fd7a99d98f6 context: add __contains__, __getitem__, and __iter__ Matt Mackall <mpm@selenic.com> parents: 4889 diff changeset	82 return key in self._manifest
1fd7a99d98f6 context: add __contains__, __getitem__, and __iter__ Matt Mackall <mpm@selenic.com> parents: 4889 diff changeset	83
1fd7a99d98f6 context: add __contains__, __getitem__, and __iter__ Matt Mackall <mpm@selenic.com> parents: 4889 diff changeset	84 def __getitem__(self, key):
1fd7a99d98f6 context: add __contains__, __getitem__, and __iter__ Matt Mackall <mpm@selenic.com> parents: 4889 diff changeset	85 return self.filectx(key)
1fd7a99d98f6 context: add __contains__, __getitem__, and __iter__ Matt Mackall <mpm@selenic.com> parents: 4889 diff changeset	86
1fd7a99d98f6 context: add __contains__, __getitem__, and __iter__ Matt Mackall <mpm@selenic.com> parents: 4889 diff changeset	87 def __iter__(self):
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8207 diff changeset	88 for f in sorted(self._manifest):
5485 8c0756f7b18b Fix context iterator. Bryan O'Sullivan <bos@serpentine.com> parents: 5439 diff changeset	89 yield f
4909 1fd7a99d98f6 context: add __contains__, __getitem__, and __iter__ Matt Mackall <mpm@selenic.com> parents: 4889 diff changeset	90
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	91 def changeset(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	92 return self._changeset
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	93 def manifest(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	94 return self._manifest
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	95 def manifestnode(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	96 return self._changeset[0]
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	97
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	98 def rev(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	99 return self._rev
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	100 def node(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	101 return self._node
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	102 def hex(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	103 return hex(self._node)
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	104 def user(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	105 return self._changeset[1]
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	106 def date(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	107 return self._changeset[2]
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	108 def files(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	109 return self._changeset[3]
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	110 def description(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	111 return self._changeset[4]
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	112 def branch(self):
13047 6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	113 return encoding.tolocal(self._changeset[5].get("branch"))
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	114 def extra(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	115 return self._changeset[5]
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	116 def tags(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	117 return self._repo.nodetags(self._node)
13384 caa561759538 context: add method to return all bookmarks pointing to a node David Soria Parra <dsp@php.net> parents: 13235 diff changeset	118 def bookmarks(self):
caa561759538 context: add method to return all bookmarks pointing to a node David Soria Parra <dsp@php.net> parents: 13235 diff changeset	119 return self._repo.nodebookmarks(self._node)
15421 405ca90df2b1 phases: add a phase method to context Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15337 diff changeset	120 def phase(self):
15453 cff509500a24 phases: improve context.phase() Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15421 diff changeset	121 if self._rev == -1:
15818 57241845a4bb phases: store phase values in constant instead of using raw integer Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15738 diff changeset	122 return phases.public
15453 cff509500a24 phases: improve context.phase() Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15421 diff changeset	123 if self._rev >= len(self._repo._phaserev):
cff509500a24 phases: improve context.phase() Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15421 diff changeset	124 # outdated cache
cff509500a24 phases: improve context.phase() Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15421 diff changeset	125 del self._repo._phaserev
15421 405ca90df2b1 phases: add a phase method to context Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 15337 diff changeset	126 return self._repo._phaserev[self._rev]
15822 d523b6e7ad26 phases: add a phasestr method on context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15818 diff changeset	127 def phasestr(self):
d523b6e7ad26 phases: add a phasestr method on context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15818 diff changeset	128 return phases.phasenames[self.phase()]
15703 2a48422e27f6 phases: add a mutable boolean property on context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15528 diff changeset	129 def mutable(self):
15818 57241845a4bb phases: store phase values in constant instead of using raw integer Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15738 diff changeset	130 return self._repo._phaserev[self._rev] > phases.public
14644 f3a40fd7008c hidden: Add ``hidden`` method for context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 14528 diff changeset	131 def hidden(self):
f3a40fd7008c hidden: Add ``hidden`` method for context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 14528 diff changeset	132 return self._rev in self._repo.changelog.hiddenrevs
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	133
482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	134 def parents(self):
482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	135 """return contexts for each parent changeset"""
6742 2d54e7c1e69d context: clean up parents() Matt Mackall <mpm@selenic.com> parents: 6741 diff changeset	136 return self._parents
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	137
8406 6ad1f72bdf34 context: add p1 and p2 methods Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	138 def p1(self):
6ad1f72bdf34 context: add p1 and p2 methods Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	139 return self._parents[0]
6ad1f72bdf34 context: add p1 and p2 methods Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	140
6ad1f72bdf34 context: add p1 and p2 methods Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	141 def p2(self):
6ad1f72bdf34 context: add p1 and p2 methods Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	142 if len(self._parents) == 2:
6ad1f72bdf34 context: add p1 and p2 methods Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	143 return self._parents[1]
6ad1f72bdf34 context: add p1 and p2 methods Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	144 return changectx(self._repo, -1)
6ad1f72bdf34 context: add p1 and p2 methods Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	145
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	146 def children(self):
482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	147 """return contexts for each child changeset"""
2627 b779319a532b context.py: self.repo is not defined, change to self._repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2566 diff changeset	148 c = self._repo.changelog.children(self._node)
3673 eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3578 diff changeset	149 return [changectx(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	150
6876 077f1e637cd8 Merge with stable Matt Mackall <mpm@selenic.com> parents: 6846 diff changeset	151 def ancestors(self):
077f1e637cd8 Merge with stable Matt Mackall <mpm@selenic.com> parents: 6846 diff changeset	152 for a in self._repo.changelog.ancestors(self._rev):
077f1e637cd8 Merge with stable Matt Mackall <mpm@selenic.com> parents: 6846 diff changeset	153 yield changectx(self._repo, a)
077f1e637cd8 Merge with stable Matt Mackall <mpm@selenic.com> parents: 6846 diff changeset	154
077f1e637cd8 Merge with stable Matt Mackall <mpm@selenic.com> parents: 6846 diff changeset	155 def descendants(self):
077f1e637cd8 Merge with stable Matt Mackall <mpm@selenic.com> parents: 6846 diff changeset	156 for d in self._repo.changelog.descendants(self._rev):
077f1e637cd8 Merge with stable Matt Mackall <mpm@selenic.com> parents: 6846 diff changeset	157 yield changectx(self._repo, d)
077f1e637cd8 Merge with stable Matt Mackall <mpm@selenic.com> parents: 6846 diff changeset	158
5389 26c060922085 context: add fileflags() to avoid rebuilding manifests Patrick Mezard <pmezard@gmail.com> parents: 4909 diff changeset	159 def _fileinfo(self, path):
3336 e44eadc92ec4 context: check self.__dict__ instead of using hasattr Brendan Cully <brendan@kublai.com> parents: 3313 diff changeset	160 if '_manifest' in self.__dict__:
3242 1539f788e913 Make changectx.filenode raise repo.LookupError on failure Brendan Cully <brendan@kublai.com> parents: 3241 diff changeset	161 try:
5389 26c060922085 context: add fileflags() to avoid rebuilding manifests Patrick Mezard <pmezard@gmail.com> parents: 4909 diff changeset	162 return self._manifest[path], self._manifest.flags(path)
3242 1539f788e913 Make changectx.filenode raise repo.LookupError on failure Brendan Cully <brendan@kublai.com> parents: 3241 diff changeset	163 except KeyError:
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7516 diff changeset	164 raise error.LookupError(self._node, path,
08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7516 diff changeset	165 _('not found in manifest'))
3337 b02e60097bbe changectx: search manifest delta for filenode Brendan Cully <brendan@kublai.com> parents: 3336 diff changeset	166 if '_manifestdelta' in self.__dict__ or path in self.files():
b02e60097bbe changectx: search manifest delta for filenode Brendan Cully <brendan@kublai.com> parents: 3336 diff changeset	167 if path in self._manifestdelta:
5389 26c060922085 context: add fileflags() to avoid rebuilding manifests Patrick Mezard <pmezard@gmail.com> parents: 4909 diff changeset	168 return self._manifestdelta[path], self._manifestdelta.flags(path)
3215 931288cf58a7 contexts: use __getattr__ rather than try/except in changectx Matt Mackall <mpm@selenic.com> parents: 3214 diff changeset	169 node, flag = self._repo.manifest.find(self._changeset[0], path)
3242 1539f788e913 Make changectx.filenode raise repo.LookupError on failure Brendan Cully <brendan@kublai.com> parents: 3241 diff changeset	170 if not node:
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7516 diff changeset	171 raise error.LookupError(self._node, path,
08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7516 diff changeset	172 _('not found in manifest'))
3242 1539f788e913 Make changectx.filenode raise repo.LookupError on failure Brendan Cully <brendan@kublai.com> parents: 3241 diff changeset	173
5389 26c060922085 context: add fileflags() to avoid rebuilding manifests Patrick Mezard <pmezard@gmail.com> parents: 4909 diff changeset	174 return node, flag
26c060922085 context: add fileflags() to avoid rebuilding manifests Patrick Mezard <pmezard@gmail.com> parents: 4909 diff changeset	175
26c060922085 context: add fileflags() to avoid rebuilding manifests Patrick Mezard <pmezard@gmail.com> parents: 4909 diff changeset	176 def filenode(self, path):
26c060922085 context: add fileflags() to avoid rebuilding manifests Patrick Mezard <pmezard@gmail.com> parents: 4909 diff changeset	177 return self._fileinfo(path)[0]
26c060922085 context: add fileflags() to avoid rebuilding manifests Patrick Mezard <pmezard@gmail.com> parents: 4909 diff changeset	178
6743 86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6742 diff changeset	179 def flags(self, path):
5389 26c060922085 context: add fileflags() to avoid rebuilding manifests Patrick Mezard <pmezard@gmail.com> parents: 4909 diff changeset	180 try:
26c060922085 context: add fileflags() to avoid rebuilding manifests Patrick Mezard <pmezard@gmail.com> parents: 4909 diff changeset	181 return self._fileinfo(path)[1]
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7516 diff changeset	182 except error.LookupError:
5389 26c060922085 context: add fileflags() to avoid rebuilding manifests Patrick Mezard <pmezard@gmail.com> parents: 4909 diff changeset	183 return ''
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	184
3966 b4eaa68dea1b context: create a filectxt with filelog reuse Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3965 diff changeset	185 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	186 """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	187 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	188 fileid = self.filenode(path)
3966 b4eaa68dea1b context: create a filectxt with filelog reuse Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3965 diff changeset	189 return filectx(self._repo, path, fileid=fileid,
b4eaa68dea1b context: create a filectxt with filelog reuse Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3965 diff changeset	190 changectx=self, filelog=filelog)
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	191
3125 02b22fefc01f changectx: add ancestor function Matt Mackall <mpm@selenic.com> parents: 3124 diff changeset	192 def ancestor(self, c2):
02b22fefc01f changectx: add ancestor function Matt Mackall <mpm@selenic.com> parents: 3124 diff changeset	193 """
02b22fefc01f changectx: add ancestor function Matt Mackall <mpm@selenic.com> parents: 3124 diff changeset	194 return the ancestor context of self and c2
02b22fefc01f changectx: add ancestor function Matt Mackall <mpm@selenic.com> parents: 3124 diff changeset	195 """
9843 d1043c2ffe6c merge: fix changectx.ancestor(workingctx) (issue1327) Matt Mackall <mpm@selenic.com> parents: 9751 diff changeset	196 # deal with workingctxs
d1043c2ffe6c merge: fix changectx.ancestor(workingctx) (issue1327) Matt Mackall <mpm@selenic.com> parents: 9751 diff changeset	197 n2 = c2._node
13031 3da456d0c885 code style: prefer 'is' and 'is not' tests with singletons Martin Geisler <mg@aragost.com> parents: 13001 diff changeset	198 if n2 is None:
9843 d1043c2ffe6c merge: fix changectx.ancestor(workingctx) (issue1327) Matt Mackall <mpm@selenic.com> parents: 9751 diff changeset	199 n2 = c2._parents[0]._node
d1043c2ffe6c merge: fix changectx.ancestor(workingctx) (issue1327) Matt Mackall <mpm@selenic.com> parents: 9751 diff changeset	200 n = self._repo.changelog.ancestor(self._node, n2)
3125 02b22fefc01f changectx: add ancestor function Matt Mackall <mpm@selenic.com> parents: 3124 diff changeset	201 return changectx(self._repo, n)
02b22fefc01f changectx: add ancestor function Matt Mackall <mpm@selenic.com> parents: 3124 diff changeset	202
6764 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6763 diff changeset	203 def walk(self, match):
8380 a00a4db76a15 context: replace pseudo-set by real set Simon Heimberg <simohe@besonet.ch> parents: 8312 diff changeset	204 fset = set(match.files())
6764 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6763 diff changeset	205 # for dirstate.walk, files=['.'] means "walk the whole tree".
8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6763 diff changeset	206 # follow that here, too
8380 a00a4db76a15 context: replace pseudo-set by real set Simon Heimberg <simohe@besonet.ch> parents: 8312 diff changeset	207 fset.discard('.')
6764 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6763 diff changeset	208 for fn in self:
8380 a00a4db76a15 context: replace pseudo-set by real set Simon Heimberg <simohe@besonet.ch> parents: 8312 diff changeset	209 for ffn in fset:
6764 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6763 diff changeset	210 # match if the file is the exact name or a directory
8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6763 diff changeset	211 if ffn == fn or fn.startswith("%s/" % ffn):
8380 a00a4db76a15 context: replace pseudo-set by real set Simon Heimberg <simohe@besonet.ch> parents: 8312 diff changeset	212 fset.remove(ffn)
6764 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6763 diff changeset	213 break
8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6763 diff changeset	214 if match(fn):
8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6763 diff changeset	215 yield fn
8380 a00a4db76a15 context: replace pseudo-set by real set Simon Heimberg <simohe@besonet.ch> parents: 8312 diff changeset	216 for fn in sorted(fset):
12067 a4fbbe0fbc38 Lowercase error messages Martin Geisler <mg@lazybytes.net> parents: 12030 diff changeset	217 if match.bad(fn, _('no such file in rev %s') % self) and match(fn):
6764 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6763 diff changeset	218 yield fn
8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6763 diff changeset	219
8813 db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8812 diff changeset	220 def sub(self, path):
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8812 diff changeset	221 return subrepo.subrepo(self, path)
db3c1ab0e632 commit: recurse into subrepositories Matt Mackall <mpm@selenic.com> parents: 8812 diff changeset	222
14669 2d2604adfdd6 context: add a match builder method Matt Mackall <mpm@selenic.com> parents: 14644 diff changeset	223 def match(self, pats=[], include=None, exclude=None, default='glob'):
2d2604adfdd6 context: add a match builder method Matt Mackall <mpm@selenic.com> parents: 14644 diff changeset	224 r = self._repo
2d2604adfdd6 context: add a match builder method Matt Mackall <mpm@selenic.com> parents: 14644 diff changeset	225 return matchmod.match(r.root, r.getcwd(), pats,
14674 1c151b963254 match: allow passing a context object to match core Matt Mackall <mpm@selenic.com> parents: 14669 diff changeset	226 include, exclude, default,
1c151b963254 match: allow passing a context object to match core Matt Mackall <mpm@selenic.com> parents: 14669 diff changeset	227 auditor=r.auditor, ctx=self)
14669 2d2604adfdd6 context: add a match builder method Matt Mackall <mpm@selenic.com> parents: 14644 diff changeset	228
11106 213ca9ffcddb changectx: change diff() to accept keyword opts Steve Borho <steve@borho.org> parents: 11105 diff changeset	229 def diff(self, ctx2=None, match=None, **opts):
11097 9651fa5a3cbf context: add a changectx.diff() convenience function Steve Borho <steve@borho.org> parents: 10969 diff changeset	230 """Returns a diff generator for the given contexts and matcher"""
9651fa5a3cbf context: add a changectx.diff() convenience function Steve Borho <steve@borho.org> parents: 10969 diff changeset	231 if ctx2 is None:
9651fa5a3cbf context: add a changectx.diff() convenience function Steve Borho <steve@borho.org> parents: 10969 diff changeset	232 ctx2 = self.p1()
9651fa5a3cbf context: add a changectx.diff() convenience function Steve Borho <steve@borho.org> parents: 10969 diff changeset	233 if ctx2 is not None and not isinstance(ctx2, changectx):
9651fa5a3cbf context: add a changectx.diff() convenience function Steve Borho <steve@borho.org> parents: 10969 diff changeset	234 ctx2 = self._repo[ctx2]
11105 6f4543842795 changectx: use repo.ui diffopts, allow argument override Steve Borho <steve@borho.org> parents: 11101 diff changeset	235 diffopts = patch.diffopts(self._repo.ui, opts)
6f4543842795 changectx: use repo.ui diffopts, allow argument override Steve Borho <steve@borho.org> parents: 11101 diff changeset	236 return patch.diff(self._repo, ctx2.node(), self.node(),
6f4543842795 changectx: use repo.ui diffopts, allow argument override Steve Borho <steve@borho.org> parents: 11101 diff changeset	237 match=match, opts=diffopts)
11097 9651fa5a3cbf context: add a changectx.diff() convenience function Steve Borho <steve@borho.org> parents: 10969 diff changeset	238
16143 fceb2964fa6c context: add 'dirs()' to changectx/workingctx for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16111 diff changeset	239 @propertycache
fceb2964fa6c context: add 'dirs()' to changectx/workingctx for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16111 diff changeset	240 def _dirs(self):
fceb2964fa6c context: add 'dirs()' to changectx/workingctx for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16111 diff changeset	241 dirs = set()
fceb2964fa6c context: add 'dirs()' to changectx/workingctx for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16111 diff changeset	242 for f in self._manifest:
fceb2964fa6c context: add 'dirs()' to changectx/workingctx for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16111 diff changeset	243 pos = f.rfind('/')
fceb2964fa6c context: add 'dirs()' to changectx/workingctx for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16111 diff changeset	244 while pos != -1:
fceb2964fa6c context: add 'dirs()' to changectx/workingctx for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16111 diff changeset	245 f = f[:pos]
fceb2964fa6c context: add 'dirs()' to changectx/workingctx for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16111 diff changeset	246 if f in dirs:
fceb2964fa6c context: add 'dirs()' to changectx/workingctx for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16111 diff changeset	247 break # dirs already contains this and above
fceb2964fa6c context: add 'dirs()' to changectx/workingctx for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16111 diff changeset	248 dirs.add(f)
fceb2964fa6c context: add 'dirs()' to changectx/workingctx for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16111 diff changeset	249 pos = f.rfind('/')
fceb2964fa6c context: add 'dirs()' to changectx/workingctx for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16111 diff changeset	250 return dirs
fceb2964fa6c context: add 'dirs()' to changectx/workingctx for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16111 diff changeset	251
fceb2964fa6c context: add 'dirs()' to changectx/workingctx for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16111 diff changeset	252 def dirs(self):
fceb2964fa6c context: add 'dirs()' to changectx/workingctx for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16111 diff changeset	253 return self._dirs
fceb2964fa6c context: add 'dirs()' to changectx/workingctx for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16111 diff changeset	254
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	255 class filectx(object):
482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	256 """A filecontext object makes access to data related to a particular
482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	257 filerevision convenient."""
3214 696c656202a0 context: make filectx remember changectx in changectx.filectx Matt Mackall <mpm@selenic.com> parents: 3213 diff changeset	258 def __init__(self, repo, path, changeid=None, fileid=None,
696c656202a0 context: make filectx remember changectx in changectx.filectx Matt Mackall <mpm@selenic.com> parents: 3213 diff changeset	259 filelog=None, changectx=None):
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	260 """changeid can be a changeset revision, node, or tag.
482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	261 fileid can be a file revision or node."""
482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	262 self._repo = repo
482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	263 self._path = path
482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	264
3964 2308c39b9521 make it possible to use changectx to create a filectx Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3962 diff changeset	265 assert (changeid is not None
2308c39b9521 make it possible to use changectx to create a filectx Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3962 diff changeset	266 or fileid is not None
9024 10532b29cdee context: improve arg-checking assert. Greg Ward <greg@gerg.ca> parents: 8813 diff changeset	267 or changectx is not None), \
10532b29cdee context: improve arg-checking assert. Greg Ward <greg@gerg.ca> parents: 8813 diff changeset	268 ("bad args: changeid=%r, fileid=%r, changectx=%r"
10532b29cdee context: improve arg-checking assert. Greg Ward <greg@gerg.ca> parents: 8813 diff changeset	269 % (changeid, fileid, changectx))
2643 f23973ea3107 fix filectxt to really work Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2629 diff changeset	270
3124 4d021b91cb26 filectx: allow passing filelog in init to avoid opening new filelogs Matt Mackall <mpm@selenic.com> parents: 3123 diff changeset	271 if filelog:
4d021b91cb26 filectx: allow passing filelog in init to avoid opening new filelogs Matt Mackall <mpm@selenic.com> parents: 3123 diff changeset	272 self._filelog = filelog
4d021b91cb26 filectx: allow passing filelog in init to avoid opening new filelogs Matt Mackall <mpm@selenic.com> parents: 3123 diff changeset	273
5810 124577de40a7 context: preserve changeset in filectx if we have one Maxim Dounin <mdounin@mdounin.ru> parents: 5760 diff changeset	274 if changeid is not None:
124577de40a7 context: preserve changeset in filectx if we have one Maxim Dounin <mdounin@mdounin.ru> parents: 5760 diff changeset	275 self._changeid = changeid
124577de40a7 context: preserve changeset in filectx if we have one Maxim Dounin <mdounin@mdounin.ru> parents: 5760 diff changeset	276 if changectx is not None:
124577de40a7 context: preserve changeset in filectx if we have one Maxim Dounin <mdounin@mdounin.ru> parents: 5760 diff changeset	277 self._changectx = changectx
124577de40a7 context: preserve changeset in filectx if we have one Maxim Dounin <mdounin@mdounin.ru> parents: 5760 diff changeset	278 if fileid is not None:
3213 e8199702cf4e Make filectx lazier Matt Mackall <mpm@selenic.com> parents: 3209 diff changeset	279 self._fileid = fileid
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	280
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	281 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	282 def _changectx(self):
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	283 return changectx(self._repo, self._changeid)
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	284
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	285 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	286 def _filelog(self):
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	287 return self._repo.file(self._path)
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	288
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	289 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	290 def _changeid(self):
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	291 if '_changectx' in self.__dict__:
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	292 return self._changectx.rev()
3144 8342ad5abe0b Make filectx lazier - some users never use filenode Brendan Cully <brendan@kublai.com> parents: 3143 diff changeset	293 else:
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	294 return self._filelog.linkrev(self._filerev)
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	295
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	296 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	297 def _filenode(self):
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	298 if '_fileid' in self.__dict__:
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	299 return self._filelog.lookup(self._fileid)
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	300 else:
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	301 return self._changectx.filenode(self._path)
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	302
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	303 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	304 def _filerev(self):
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	305 return self._filelog.rev(self._filenode)
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	306
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	307 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	308 def _repopath(self):
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	309 return self._path
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	310
3168 05c588e1803d context: add __nonzero__ methods Matt Mackall <mpm@selenic.com> parents: 3166 diff changeset	311 def __nonzero__(self):
3712 1bd70d40ec57 context: None is not a valid filenode (revert from 23ede9e7ad4d) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3673 diff changeset	312 try:
7874 d812029cda85 cleanup: drop variables for unused return values Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7633 diff changeset	313 self._filenode
3712 1bd70d40ec57 context: None is not a valid filenode (revert from 23ede9e7ad4d) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3673 diff changeset	314 return True
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7516 diff changeset	315 except error.LookupError:
3712 1bd70d40ec57 context: None is not a valid filenode (revert from 23ede9e7ad4d) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3673 diff changeset	316 # file is missing
1bd70d40ec57 context: None is not a valid filenode (revert from 23ede9e7ad4d) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3673 diff changeset	317 return False
3168 05c588e1803d context: add __nonzero__ methods Matt Mackall <mpm@selenic.com> parents: 3166 diff changeset	318
3166 ebdb3f616bc0 Add str methods to contexts Matt Mackall <mpm@selenic.com> parents: 3165 diff changeset	319 def __str__(self):
ebdb3f616bc0 Add str methods to contexts Matt Mackall <mpm@selenic.com> parents: 3165 diff changeset	320 return "%s@%s" % (self.path(), short(self.node()))
ebdb3f616bc0 Add str methods to contexts Matt Mackall <mpm@selenic.com> parents: 3165 diff changeset	321
3151 6719b3dd7d50 context: add __repr__ methods Matt Mackall <mpm@selenic.com> parents: 3150 diff changeset	322 def __repr__(self):
3216 d865390c1781 context: simplify repr methods Matt Mackall <mpm@selenic.com> parents: 3215 diff changeset	323 return "<filectx %s>" % str(self)
3151 6719b3dd7d50 context: add __repr__ methods Matt Mackall <mpm@selenic.com> parents: 3150 diff changeset	324
6469 fb502719c75c python 2.6 compatibility: add __hash__ to classes that have __eq__ Paul Moore <p.f.moore@gmail.com> parents: 6286 diff changeset	325 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	326 try:
10942 6f26ce7ae175 filectx: _fileid isn't normalized, use _filenode instead Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10927 diff changeset	327 return hash((self._path, self._filenode))
6469 fb502719c75c python 2.6 compatibility: add __hash__ to classes that have __eq__ Paul Moore <p.f.moore@gmail.com> parents: 6286 diff changeset	328 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	329 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	330
3165 e78185746554 Add equality operators to changectx and filectx Matt Mackall <mpm@selenic.com> parents: 3152 diff changeset	331 def __eq__(self, other):
3715 6cb3aca69cdc Make context __eq__ handle arbitrary RHS values Brendan Cully <brendan@kublai.com> parents: 3712 diff changeset	332 try:
6cb3aca69cdc Make context __eq__ handle arbitrary RHS values Brendan Cully <brendan@kublai.com> parents: 3712 diff changeset	333 return (self._path == other._path
10942 6f26ce7ae175 filectx: _fileid isn't normalized, use _filenode instead Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10927 diff changeset	334 and self._filenode == other._filenode)
3715 6cb3aca69cdc Make context __eq__ handle arbitrary RHS values Brendan Cully <brendan@kublai.com> parents: 3712 diff changeset	335 except AttributeError:
6cb3aca69cdc Make context __eq__ handle arbitrary RHS values Brendan Cully <brendan@kublai.com> parents: 3712 diff changeset	336 return False
3165 e78185746554 Add equality operators to changectx and filectx Matt Mackall <mpm@selenic.com> parents: 3152 diff changeset	337
4748 8808ea7da86b merge: make test for fast-forward merge stricter (issue619) Matt Mackall <mpm@selenic.com> parents: 4663 diff changeset	338 def __ne__(self, other):
8808ea7da86b merge: make test for fast-forward merge stricter (issue619) Matt Mackall <mpm@selenic.com> parents: 4663 diff changeset	339 return not (self == other)
8808ea7da86b merge: make test for fast-forward merge stricter (issue619) Matt Mackall <mpm@selenic.com> parents: 4663 diff changeset	340
3207 0790dce2f3a8 Add lookup method to filectx Brendan Cully <brendan@kublai.com> parents: 3172 diff changeset	341 def filectx(self, fileid):
0790dce2f3a8 Add lookup method to filectx Brendan Cully <brendan@kublai.com> parents: 3172 diff changeset	342 '''opens an arbitrary revision of the file without
0790dce2f3a8 Add lookup method to filectx Brendan Cully <brendan@kublai.com> parents: 3172 diff changeset	343 opening a new filelog'''
0790dce2f3a8 Add lookup method to filectx Brendan Cully <brendan@kublai.com> parents: 3172 diff changeset	344 return filectx(self._repo, self._path, fileid=fileid,
0790dce2f3a8 Add lookup method to filectx Brendan Cully <brendan@kublai.com> parents: 3172 diff changeset	345 filelog=self._filelog)
0790dce2f3a8 Add lookup method to filectx Brendan Cully <brendan@kublai.com> parents: 3172 diff changeset	346
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	347 def filerev(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	348 return self._filerev
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	349 def filenode(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	350 return self._filenode
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	351 def flags(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	352 return self._changectx.flags(self._path)
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	353 def filelog(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	354 return self._filelog
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	355
3150 a5e4c8172ace filectx: lazy linkrev usage Matt Mackall <mpm@selenic.com> parents: 3149 diff changeset	356 def rev(self):
3336 e44eadc92ec4 context: check self.__dict__ instead of using hasattr Brendan Cully <brendan@kublai.com> parents: 3313 diff changeset	357 if '_changectx' in self.__dict__:
3150 a5e4c8172ace filectx: lazy linkrev usage Matt Mackall <mpm@selenic.com> parents: 3149 diff changeset	358 return self._changectx.rev()
5810 124577de40a7 context: preserve changeset in filectx if we have one Maxim Dounin <mdounin@mdounin.ru> parents: 5760 diff changeset	359 if '_changeid' in self.__dict__:
6210 942287cb1f57 Removed trailing spaces from everything except test output Thomas Arendsen Hein <thomas@intevation.de> parents: 5813 diff changeset	360 return self._changectx.rev()
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7077 diff changeset	361 return self._filelog.linkrev(self._filerev)
3150 a5e4c8172ace filectx: lazy linkrev usage Matt Mackall <mpm@selenic.com> parents: 3149 diff changeset	362
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	363 def linkrev(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	364 return self._filelog.linkrev(self._filerev)
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	365 def node(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	366 return self._changectx.node()
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	367 def hex(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	368 return hex(self.node())
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	369 def user(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	370 return self._changectx.user()
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	371 def date(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	372 return self._changectx.date()
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	373 def files(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	374 return self._changectx.files()
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	375 def description(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	376 return self._changectx.description()
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	377 def branch(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	378 return self._changectx.branch()
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	379 def extra(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	380 return self._changectx.extra()
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	381 def manifest(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	382 return self._changectx.manifest()
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	383 def changectx(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	384 return self._changectx
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	385
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	386 def data(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	387 return self._filelog.read(self._filenode)
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	388 def path(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	389 return self._path
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	390 def size(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	391 return self._filelog.size(self._filerev)
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	392
15738 e86dd8dfdea0 context: add isbinary function Laurens Holst <laurens.hg@grauw.nl> parents: 15707 diff changeset	393 def isbinary(self):
e86dd8dfdea0 context: add isbinary function Laurens Holst <laurens.hg@grauw.nl> parents: 15707 diff changeset	394 try:
e86dd8dfdea0 context: add isbinary function Laurens Holst <laurens.hg@grauw.nl> parents: 15707 diff changeset	395 return util.binary(self.data())
e86dd8dfdea0 context: add isbinary function Laurens Holst <laurens.hg@grauw.nl> parents: 15707 diff changeset	396 except IOError:
e86dd8dfdea0 context: add isbinary function Laurens Holst <laurens.hg@grauw.nl> parents: 15707 diff changeset	397 return False
e86dd8dfdea0 context: add isbinary function Laurens Holst <laurens.hg@grauw.nl> parents: 15707 diff changeset	398
11702 eb07fbc21e9c filectx: use cmp(self, fctx) instead of cmp(self, text) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11605 diff changeset	399 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	400 """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	401
11702 eb07fbc21e9c filectx: use cmp(self, fctx) instead of cmp(self, text) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11605 diff changeset	402 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	403 """
15848 012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 15337 diff changeset	404 if (fctx._filerev is None
012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 15337 diff changeset	405 and (self._repo._encodefilterpats
012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 15337 diff changeset	406 # if file data starts with '\1\n', empty metadata block is
15872 a3e2b9a1f063 filectx: typo in comment Christian Ebert <blacktrash@gmx.net> parents: 15848 diff changeset	407 # prepended, which adds 4 bytes to filelog.size().
15848 012b285cf643 filectx: fix cmp() of file starting with '\1\n' Yuya Nishihara <yuya@tcha.org> parents: 15337 diff changeset	408 or self.size() - 4 == fctx.size())
12731 95514b58709d context: narrow down filter special case in filectx.cmp() Christian Ebert <blacktrash@gmx.net> parents: 12709 diff changeset	409 or self.size() == fctx.size()):
95514b58709d context: narrow down filter special case in filectx.cmp() Christian Ebert <blacktrash@gmx.net> parents: 12709 diff changeset	410 return self._filelog.cmp(self._filenode, fctx.data())
12709 4147a292c508 filectx: use ctx.size comparisons to speed up ctx.cmp Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12361 diff changeset	411
12731 95514b58709d context: narrow down filter special case in filectx.cmp() Christian Ebert <blacktrash@gmx.net> parents: 12709 diff changeset	412 return True
3310 0e370798eebf context: add cmp for filectxs Matt Mackall <mpm@selenic.com> parents: 3302 diff changeset	413
5811 180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	414 def renamed(self):
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	415 """check if file was actually renamed in this changeset revision
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	416
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	417 If rename logged in file revision, we report copy for changeset only
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	418 if file revisions linkrev points back to the changeset in question
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	419 or both changeset parents contain different file revisions.
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	420 """
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	421
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	422 renamed = self._filelog.renamed(self._filenode)
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	423 if not renamed:
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	424 return renamed
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	425
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	426 if self.rev() == self.linkrev():
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	427 return renamed
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	428
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	429 name = self.path()
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	430 fnode = self._filenode
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	431 for p in self._changectx.parents():
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	432 try:
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	433 if fnode == p.filenode(name):
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	434 return None
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7516 diff changeset	435 except error.LookupError:
5811 180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	436 pass
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	437 return renamed
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	438
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	439 def parents(self):
3124 4d021b91cb26 filectx: allow passing filelog in init to avoid opening new filelogs Matt Mackall <mpm@selenic.com> parents: 3123 diff changeset	440 p = self._path
4d021b91cb26 filectx: allow passing filelog in init to avoid opening new filelogs Matt Mackall <mpm@selenic.com> parents: 3123 diff changeset	441 fl = self._filelog
3673 eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3578 diff changeset	442 pl = [(p, n, fl) for n in self._filelog.parents(self._filenode)]
3123 4ea58eb3f0c9 filelog: make metadata method private Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	443
5813 3ef279074c77 context: fix filectx.parents() bug introduced when editing 180a3eee4b75 Patrick Mezard <pmezard@gmail.com> parents: 5811 diff changeset	444 r = self._filelog.renamed(self._filenode)
3122 da85145d4571 filectx: add rename traversal for parents() Matt Mackall <mpm@selenic.com> parents: 2859 diff changeset	445 if r:
3124 4d021b91cb26 filectx: allow passing filelog in init to avoid opening new filelogs Matt Mackall <mpm@selenic.com> parents: 3123 diff changeset	446 pl[0] = (r[0], r[1], None)
4d021b91cb26 filectx: allow passing filelog in init to avoid opening new filelogs Matt Mackall <mpm@selenic.com> parents: 3123 diff changeset	447
3673 eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3578 diff changeset	448 return [filectx(self._repo, p, fileid=n, filelog=l)
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	449 for p, n, l in pl if n != nullid]
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	450
13877 653121e6941f filectx: introduce p1/p2 convenience methods Matt Mackall <mpm@selenic.com> parents: 13552 diff changeset	451 def p1(self):
653121e6941f filectx: introduce p1/p2 convenience methods Matt Mackall <mpm@selenic.com> parents: 13552 diff changeset	452 return self.parents()[0]
653121e6941f filectx: introduce p1/p2 convenience methods Matt Mackall <mpm@selenic.com> parents: 13552 diff changeset	453
653121e6941f filectx: introduce p1/p2 convenience methods Matt Mackall <mpm@selenic.com> parents: 13552 diff changeset	454 def p2(self):
653121e6941f filectx: introduce p1/p2 convenience methods Matt Mackall <mpm@selenic.com> parents: 13552 diff changeset	455 p = self.parents()
653121e6941f filectx: introduce p1/p2 convenience methods Matt Mackall <mpm@selenic.com> parents: 13552 diff changeset	456 if len(p) == 2:
653121e6941f filectx: introduce p1/p2 convenience methods Matt Mackall <mpm@selenic.com> parents: 13552 diff changeset	457 return p[1]
653121e6941f filectx: introduce p1/p2 convenience methods Matt Mackall <mpm@selenic.com> parents: 13552 diff changeset	458 return filectx(self._repo, self._path, fileid=-1, filelog=self._filelog)
653121e6941f filectx: introduce p1/p2 convenience methods Matt Mackall <mpm@selenic.com> parents: 13552 diff changeset	459
2563 482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	460 def children(self):
482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	461 # hard for renames
482c524dd9ab Add context.py: changeset and file revision contexts Matt Mackall <mpm@selenic.com> parents: diff changeset	462 c = self._filelog.children(self._filenode)
3673 eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3578 diff changeset	463 return [filectx(self._repo, self._path, fileid=x,
eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3578 diff changeset	464 filelog=self._filelog) for x in c]
2566 d8560b458f76 Convert hg annotate to context api Matt Mackall <mpm@selenic.com> parents: 2563 diff changeset	465
15528 a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15453 diff changeset	466 def annotate(self, follow=False, linenumber=None, diffopts=None):
3172 5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	467 '''returns a list of tuples of (ctx, line) for each line
5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	468 in the file, where ctx is the filectx of the node where
4856 e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	469 that line was last changed.
e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	470 This returns tuples of ((ctx, linenumber), line) for each line,
e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	471 if "linenumber" parameter is NOT "None".
e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	472 In such tuples, linenumber means one at the first appearance
e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	473 in the managed file.
e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	474 To reduce annotation cost,
e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	475 this returns fixed value(False is used) as linenumber,
e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	476 if "linenumber" parameter is "False".'''
3172 5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	477
4856 e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	478 def decorate_compat(text, rev):
3172 5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	479 return ([rev] * len(text.splitlines()), text)
5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	480
4856 e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	481 def without_linenumber(text, rev):
e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	482 return ([(rev, False)] * len(text.splitlines()), text)
e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	483
e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	484 def with_linenumber(text, rev):
e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	485 size = len(text.splitlines())
e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	486 return ([(rev, i) for i in xrange(1, size + 1)], text)
e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	487
e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	488 decorate = (((linenumber is None) and decorate_compat) or
e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	489 (linenumber and with_linenumber) or
e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	490 without_linenumber)
e45c5120ca27 Allow filectx.annotate to return the line number of first appearance. FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 4748 diff changeset	491
3172 5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	492 def pair(parent, child):
15528 a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15453 diff changeset	493 blocks = mdiff.allblocks(parent[1], child[1], opts=diffopts,
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15453 diff changeset	494 refine=True)
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15453 diff changeset	495 for (a1, a2, b1, b2), t in blocks:
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15453 diff changeset	496 # Changed blocks ('!') or blocks made only of blank lines ('~')
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15453 diff changeset	497 # belong to the child.
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15453 diff changeset	498 if t == '=':
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15453 diff changeset	499 child[0][b1:b2] = parent[0][a1:a2]
3172 5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	500 return child
5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	501
9097 431462bd8478 fix memory usage of revlog caches by limiting cache size [issue1639] Matt Mackall <mpm@selenic.com> parents: 8813 diff changeset	502 getlog = util.lrucachefunc(lambda x: self._repo.file(x))
3172 5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	503 def getctx(path, fileid):
5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	504 log = path == self._path and self._filelog or getlog(path)
5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	505 return filectx(self._repo, path, fileid=fileid, filelog=log)
9097 431462bd8478 fix memory usage of revlog caches by limiting cache size [issue1639] Matt Mackall <mpm@selenic.com> parents: 8813 diff changeset	506 getctx = util.lrucachefunc(getctx)
3172 5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	507
5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	508 def parents(f):
5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	509 # we want to reuse filectx objects as much as possible
5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	510 p = f._path
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	511 if f._filerev is None: # working dir
3673 eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3578 diff changeset	512 pl = [(n.path(), n.filerev()) for n in f.parents()]
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	513 else:
3673 eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3578 diff changeset	514 pl = [(p, n) for n in f._filelog.parentrevs(f._filerev)]
3172 5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	515
5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	516 if follow:
5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	517 r = f.renamed()
5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	518 if r:
5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	519 pl[0] = (r[0], getlog(r[0]).rev(r[1]))
3146 e69a0cbe268e filectx.annotate: return filectx for each line instead of rev Brendan Cully <brendan@kublai.com> parents: 3144 diff changeset	520
3578 3b4e00cba57a Define and use nullrev (revision of nullid) instead of -1. Thomas Arendsen Hein <thomas@intevation.de> parents: 3454 diff changeset	521 return [getctx(p, n) for p, n in pl if n != nullrev]
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	522
3404 1a437b0f4902 Fix annotate where linkrev != rev without exporting linkrev Brendan Cully <brendan@kublai.com> parents: 3403 diff changeset	523 # use linkrev to find the first changeset where self appeared
5811 180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 5810 diff changeset	524 if self.rev() != self.linkrev():
3404 1a437b0f4902 Fix annotate where linkrev != rev without exporting linkrev Brendan Cully <brendan@kublai.com> parents: 3403 diff changeset	525 base = self.filectx(self.filerev())
1a437b0f4902 Fix annotate where linkrev != rev without exporting linkrev Brendan Cully <brendan@kublai.com> parents: 3403 diff changeset	526 else:
1a437b0f4902 Fix annotate where linkrev != rev without exporting linkrev Brendan Cully <brendan@kublai.com> parents: 3403 diff changeset	527 base = self
1a437b0f4902 Fix annotate where linkrev != rev without exporting linkrev Brendan Cully <brendan@kublai.com> parents: 3403 diff changeset	528
13552 7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	529 # This algorithm would prefer to be recursive, but Python is a
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	530 # bit recursion-hostile. Instead we do an iterative
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	531 # depth-first search.
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	532
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	533 visit = [base]
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	534 hist = {}
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	535 pcache = {}
3404 1a437b0f4902 Fix annotate where linkrev != rev without exporting linkrev Brendan Cully <brendan@kublai.com> parents: 3403 diff changeset	536 needed = {base: 1}
3172 5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	537 while visit:
13552 7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	538 f = visit[-1]
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	539 if f not in pcache:
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	540 pcache[f] = parents(f)
3172 5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	541
13552 7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	542 ready = True
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	543 pl = pcache[f]
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	544 for p in pl:
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	545 if p not in hist:
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	546 ready = False
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	547 visit.append(p)
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	548 needed[p] = needed.get(p, 0) + 1
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	549 if ready:
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	550 visit.pop()
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	551 curr = decorate(f.data(), f)
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	552 for p in pl:
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	553 curr = pair(hist[p], curr)
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	554 if needed[p] == 1:
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	555 del hist[p]
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	556 else:
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	557 needed[p] -= 1
6762 f67d1468ac50 util: add sort helper Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	558
13552 7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	559 hist[f] = curr
7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	560 pcache[f] = []
3172 5c93dd0ae413 Refactor annotate copy support. Brendan Cully <brendan@kublai.com> parents: 3152 diff changeset	561
13552 7ab85fec60c3 ancestor: rewrite to deal with crossed linkrevs (issue2682) Matt Mackall <mpm@selenic.com> parents: 13481 diff changeset	562 return zip(hist[base][0], hist[base][1].splitlines(True))
3124 4d021b91cb26 filectx: allow passing filelog in init to avoid opening new filelogs Matt Mackall <mpm@selenic.com> parents: 3123 diff changeset	563
11453 2ee26044d846 context: allow passing the common cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11303 diff changeset	564 def ancestor(self, fc2, actx=None):
3126 4bf2e895cf86 filectx: add rename-aware ancestor algorithm Matt Mackall <mpm@selenic.com> parents: 3125 diff changeset	565 """
4bf2e895cf86 filectx: add rename-aware ancestor algorithm Matt Mackall <mpm@selenic.com> parents: 3125 diff changeset	566 find the common ancestor file context, if any, of self, and fc2
11453 2ee26044d846 context: allow passing the common cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11303 diff changeset	567
2ee26044d846 context: allow passing the common cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11303 diff changeset	568 If actx is given, it must be the changectx of the common ancestor
2ee26044d846 context: allow passing the common cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11303 diff changeset	569 of self's and fc2's respective changesets.
3126 4bf2e895cf86 filectx: add rename-aware ancestor algorithm Matt Mackall <mpm@selenic.com> parents: 3125 diff changeset	570 """
4bf2e895cf86 filectx: add rename-aware ancestor algorithm Matt Mackall <mpm@selenic.com> parents: 3125 diff changeset	571
11453 2ee26044d846 context: allow passing the common cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11303 diff changeset	572 if actx is None:
2ee26044d846 context: allow passing the common cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11303 diff changeset	573 actx = self.changectx().ancestor(fc2.changectx())
9751 f8ca4035a949 filectx: shortcut unrelated files in ancestor() (issue1327) Matt Mackall <mpm@selenic.com> parents: 9750 diff changeset	574
f8ca4035a949 filectx: shortcut unrelated files in ancestor() (issue1327) Matt Mackall <mpm@selenic.com> parents: 9750 diff changeset	575 # the trivial case: changesets are unrelated, files must be too
f8ca4035a949 filectx: shortcut unrelated files in ancestor() (issue1327) Matt Mackall <mpm@selenic.com> parents: 9750 diff changeset	576 if not actx:
f8ca4035a949 filectx: shortcut unrelated files in ancestor() (issue1327) Matt Mackall <mpm@selenic.com> parents: 9750 diff changeset	577 return None
f8ca4035a949 filectx: shortcut unrelated files in ancestor() (issue1327) Matt Mackall <mpm@selenic.com> parents: 9750 diff changeset	578
f8ca4035a949 filectx: shortcut unrelated files in ancestor() (issue1327) Matt Mackall <mpm@selenic.com> parents: 9750 diff changeset	579 # the easy case: no (relevant) renames
f8ca4035a949 filectx: shortcut unrelated files in ancestor() (issue1327) Matt Mackall <mpm@selenic.com> parents: 9750 diff changeset	580 if fc2.path() == self.path() and self.path() in actx:
9750 f153af9580fe merge: first part of fix for issue1327 Matt Mackall <mpm@selenic.com> parents: 9547 diff changeset	581 return actx[self.path()]
3135 b1db258e875c Abstract ancestor algorithm into generic function Matt Mackall <mpm@selenic.com> parents: 3134 diff changeset	582 acache = {}
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	583
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	584 # prime the ancestor cache for the working directory
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	585 for c in (self, fc2):
8527 f9a80054dd3c use 'x is None' instead of 'x == None' Martin Geisler <mg@lazybytes.net> parents: 8413 diff changeset	586 if c._filerev is None:
3673 eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3578 diff changeset	587 pl = [(n.path(), n.filenode()) for n in c.parents()]
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	588 acache[(c._path, None)] = pl
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	589
6286 90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6228 diff changeset	590 flcache = {self._repopath:self._filelog, fc2._repopath:fc2._filelog}
3135 b1db258e875c Abstract ancestor algorithm into generic function Matt Mackall <mpm@selenic.com> parents: 3134 diff changeset	591 def parents(vertex):
b1db258e875c Abstract ancestor algorithm into generic function Matt Mackall <mpm@selenic.com> parents: 3134 diff changeset	592 if vertex in acache:
b1db258e875c Abstract ancestor algorithm into generic function Matt Mackall <mpm@selenic.com> parents: 3134 diff changeset	593 return acache[vertex]
b1db258e875c Abstract ancestor algorithm into generic function Matt Mackall <mpm@selenic.com> parents: 3134 diff changeset	594 f, n = vertex
b1db258e875c Abstract ancestor algorithm into generic function Matt Mackall <mpm@selenic.com> parents: 3134 diff changeset	595 if f not in flcache:
3126 4bf2e895cf86 filectx: add rename-aware ancestor algorithm Matt Mackall <mpm@selenic.com> parents: 3125 diff changeset	596 flcache[f] = self._repo.file(f)
3135 b1db258e875c Abstract ancestor algorithm into generic function Matt Mackall <mpm@selenic.com> parents: 3134 diff changeset	597 fl = flcache[f]
3673 eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3578 diff changeset	598 pl = [(f, p) for p in fl.parents(n) if p != nullid]
3135 b1db258e875c Abstract ancestor algorithm into generic function Matt Mackall <mpm@selenic.com> parents: 3134 diff changeset	599 re = fl.renamed(n)
b1db258e875c Abstract ancestor algorithm into generic function Matt Mackall <mpm@selenic.com> parents: 3134 diff changeset	600 if re:
b1db258e875c Abstract ancestor algorithm into generic function Matt Mackall <mpm@selenic.com> parents: 3134 diff changeset	601 pl.append(re)
3673 eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3578 diff changeset	602 acache[vertex] = pl
3135 b1db258e875c Abstract ancestor algorithm into generic function Matt Mackall <mpm@selenic.com> parents: 3134 diff changeset	603 return pl
3126 4bf2e895cf86 filectx: add rename-aware ancestor algorithm Matt Mackall <mpm@selenic.com> parents: 3125 diff changeset	604
3135 b1db258e875c Abstract ancestor algorithm into generic function Matt Mackall <mpm@selenic.com> parents: 3134 diff changeset	605 a, b = (self._path, self._filenode), (fc2._path, fc2._filenode)
b1db258e875c Abstract ancestor algorithm into generic function Matt Mackall <mpm@selenic.com> parents: 3134 diff changeset	606 v = ancestor.ancestor(a, b, parents)
b1db258e875c Abstract ancestor algorithm into generic function Matt Mackall <mpm@selenic.com> parents: 3134 diff changeset	607 if v:
3673 eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3578 diff changeset	608 f, n = v
3135 b1db258e875c Abstract ancestor algorithm into generic function Matt Mackall <mpm@selenic.com> parents: 3134 diff changeset	609 return filectx(self._repo, f, fileid=n, filelog=flcache[f])
3126 4bf2e895cf86 filectx: add rename-aware ancestor algorithm Matt Mackall <mpm@selenic.com> parents: 3125 diff changeset	610
3135 b1db258e875c Abstract ancestor algorithm into generic function Matt Mackall <mpm@selenic.com> parents: 3134 diff changeset	611 return None
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	612
10262 eb243551cbd8 copies: speed up copy detection Matt Mackall <mpm@selenic.com> parents: 9843 diff changeset	613 def ancestors(self):
13481 4eb1e9d6a7c9 context: be even more careful about result order in ancestors() (issue2642) Matt Mackall <mpm@selenic.com> parents: 13476 diff changeset	614 visit = {}
4eb1e9d6a7c9 context: be even more careful about result order in ancestors() (issue2642) Matt Mackall <mpm@selenic.com> parents: 13476 diff changeset	615 c = self
4eb1e9d6a7c9 context: be even more careful about result order in ancestors() (issue2642) Matt Mackall <mpm@selenic.com> parents: 13476 diff changeset	616 while True:
4eb1e9d6a7c9 context: be even more careful about result order in ancestors() (issue2642) Matt Mackall <mpm@selenic.com> parents: 13476 diff changeset	617 for parent in c.parents():
4eb1e9d6a7c9 context: be even more careful about result order in ancestors() (issue2642) Matt Mackall <mpm@selenic.com> parents: 13476 diff changeset	618 visit[(parent.rev(), parent.node())] = parent
4eb1e9d6a7c9 context: be even more careful about result order in ancestors() (issue2642) Matt Mackall <mpm@selenic.com> parents: 13476 diff changeset	619 if not visit:
4eb1e9d6a7c9 context: be even more careful about result order in ancestors() (issue2642) Matt Mackall <mpm@selenic.com> parents: 13476 diff changeset	620 break
4eb1e9d6a7c9 context: be even more careful about result order in ancestors() (issue2642) Matt Mackall <mpm@selenic.com> parents: 13476 diff changeset	621 c = visit.pop(max(visit))
4eb1e9d6a7c9 context: be even more careful about result order in ancestors() (issue2642) Matt Mackall <mpm@selenic.com> parents: 13476 diff changeset	622 yield c
10262 eb243551cbd8 copies: speed up copy detection Matt Mackall <mpm@selenic.com> parents: 9843 diff changeset	623
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	624 class workingctx(changectx):
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	625 """A workingctx object makes access to data related to
6705 fec6bc978843 context: let workingctx parents be overriden Patrick Mezard <pmezard@gmail.com> parents: 6685 diff changeset	626 the current working directory convenient.
6709 f84f507c53d3 context: let workingctx.date(), .user() and description() be overriden Patrick Mezard <pmezard@gmail.com> parents: 6708 diff changeset	627 date - any valid date string or (unixtime, offset), or None.
f84f507c53d3 context: let workingctx.date(), .user() and description() be overriden Patrick Mezard <pmezard@gmail.com> parents: 6708 diff changeset	628 user - username string, or None.
6708 7566f00a3979 localrepo: let commit() get extra data from workingctx Patrick Mezard <pmezard@gmail.com> parents: 6707 diff changeset	629 extra - a dictionary of extra values, or None.
6707 02bad34230a2 localrepo: hide commit() file selection behind workingctx Patrick Mezard <pmezard@gmail.com> parents: 6705 diff changeset	630 changes - a list of file lists as returned by localrepo.status()
02bad34230a2 localrepo: hide commit() file selection behind workingctx Patrick Mezard <pmezard@gmail.com> parents: 6705 diff changeset	631 or None to use the repository status.
6705 fec6bc978843 context: let workingctx parents be overriden Patrick Mezard <pmezard@gmail.com> parents: 6685 diff changeset	632 """
10969 ca052b484e56 context: remove parents parameter to workingctx Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10942 diff changeset	633 def __init__(self, repo, text="", user=None, date=None, extra=None,
ca052b484e56 context: remove parents parameter to workingctx Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10942 diff changeset	634 changes=None):
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	635 self._repo = repo
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	636 self._rev = None
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	637 self._node = None
6709 f84f507c53d3 context: let workingctx.date(), .user() and description() be overriden Patrick Mezard <pmezard@gmail.com> parents: 6708 diff changeset	638 self._text = text
6718 4386a7706828 Fix commit date (issue1193) Christian Ebert <blacktrash@gmx.net> parents: 6715 diff changeset	639 if date:
6709 f84f507c53d3 context: let workingctx.date(), .user() and description() be overriden Patrick Mezard <pmezard@gmail.com> parents: 6708 diff changeset	640 self._date = util.parsedate(date)
6817 cf319797d61c minor status fixups Matt Mackall <mpm@selenic.com> parents: 6809 diff changeset	641 if user:
cf319797d61c minor status fixups Matt Mackall <mpm@selenic.com> parents: 6809 diff changeset	642 self._user = user
6707 02bad34230a2 localrepo: hide commit() file selection behind workingctx Patrick Mezard <pmezard@gmail.com> parents: 6705 diff changeset	643 if changes:
11101 502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	644 self._status = list(changes[:4])
502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	645 self._unknown = changes[4]
11099 a68bd3b7c040 workingctx: use member variables to store ignored and clean Steve Borho <steve@borho.org> parents: 11098 diff changeset	646 self._ignored = changes[5]
a68bd3b7c040 workingctx: use member variables to store ignored and clean Steve Borho <steve@borho.org> parents: 11098 diff changeset	647 self._clean = changes[6]
a68bd3b7c040 workingctx: use member variables to store ignored and clean Steve Borho <steve@borho.org> parents: 11098 diff changeset	648 else:
11101 502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	649 self._unknown = None
11099 a68bd3b7c040 workingctx: use member variables to store ignored and clean Steve Borho <steve@borho.org> parents: 11098 diff changeset	650 self._ignored = None
a68bd3b7c040 workingctx: use member variables to store ignored and clean Steve Borho <steve@borho.org> parents: 11098 diff changeset	651 self._clean = None
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	652
6708 7566f00a3979 localrepo: let commit() get extra data from workingctx Patrick Mezard <pmezard@gmail.com> parents: 6707 diff changeset	653 self._extra = {}
7566f00a3979 localrepo: let commit() get extra data from workingctx Patrick Mezard <pmezard@gmail.com> parents: 6707 diff changeset	654 if extra:
7566f00a3979 localrepo: let commit() get extra data from workingctx Patrick Mezard <pmezard@gmail.com> parents: 6707 diff changeset	655 self._extra = extra.copy()
7566f00a3979 localrepo: let commit() get extra data from workingctx Patrick Mezard <pmezard@gmail.com> parents: 6707 diff changeset	656 if 'branch' not in self._extra:
7566f00a3979 localrepo: let commit() get extra data from workingctx Patrick Mezard <pmezard@gmail.com> parents: 6707 diff changeset	657 try:
13047 6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	658 branch = encoding.fromlocal(self._repo.dirstate.branch())
6708 7566f00a3979 localrepo: let commit() get extra data from workingctx Patrick Mezard <pmezard@gmail.com> parents: 6707 diff changeset	659 except UnicodeDecodeError:
7566f00a3979 localrepo: let commit() get extra data from workingctx Patrick Mezard <pmezard@gmail.com> parents: 6707 diff changeset	660 raise util.Abort(_('branch name not in UTF-8!'))
7566f00a3979 localrepo: let commit() get extra data from workingctx Patrick Mezard <pmezard@gmail.com> parents: 6707 diff changeset	661 self._extra['branch'] = branch
7566f00a3979 localrepo: let commit() get extra data from workingctx Patrick Mezard <pmezard@gmail.com> parents: 6707 diff changeset	662 if self._extra['branch'] == '':
7566f00a3979 localrepo: let commit() get extra data from workingctx Patrick Mezard <pmezard@gmail.com> parents: 6707 diff changeset	663 self._extra['branch'] = 'default'
7566f00a3979 localrepo: let commit() get extra data from workingctx Patrick Mezard <pmezard@gmail.com> parents: 6707 diff changeset	664
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	665 def __str__(self):
3313 6c68bc1e7873 context: change workingctx str() from . to <node>+ Matt Mackall <mpm@selenic.com> parents: 3310 diff changeset	666 return str(self._parents[0]) + "+"
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	667
12947 4832717aed98 context: add __repr__ methods to workingfilectx and workingctx Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12731 diff changeset	668 def __repr__(self):
4832717aed98 context: add __repr__ methods to workingfilectx and workingctx Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12731 diff changeset	669 return "<workingctx %s>" % str(self)
4832717aed98 context: add __repr__ methods to workingfilectx and workingctx Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12731 diff changeset	670
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	671 def __nonzero__(self):
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	672 return True
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	673
6771 f5d7cfcbb4d3 workingctx: add __contains__ method Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	674 def __contains__(self, key):
8061 26316dda374f context: fix workingctx.__contains__ Patrick Mezard <pmezard@gmail.com> parents: 7633 diff changeset	675 return self._repo.dirstate[key] not in "?r"
6771 f5d7cfcbb4d3 workingctx: add __contains__ method Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	676
15337 cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	677 def _buildflagfunc(self):
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	678 # Create a fallback function for getting file flags when the
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	679 # filesystem doesn't support them
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	680
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	681 copiesget = self._repo.dirstate.copies().get
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	682
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	683 if len(self._parents) < 2:
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	684 # when we have one parent, it's easy: copy from parent
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	685 man = self._parents[0].manifest()
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	686 def func(f):
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	687 f = copiesget(f, f)
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	688 return man.flags(f)
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	689 else:
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	690 # merges are tricky: we try to reconstruct the unstored
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	691 # result from the merge (issue1802)
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	692 p1, p2 = self._parents
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	693 pa = p1.ancestor(p2)
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	694 m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest()
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	695
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	696 def func(f):
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	697 f = copiesget(f, f) # may be wrong for merges with copies
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	698 fl1, fl2, fla = m1.flags(f), m2.flags(f), ma.flags(f)
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	699 if fl1 == fl2:
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	700 return fl1
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	701 if fl1 == fla:
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	702 return fl2
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	703 if fl2 == fla:
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	704 return fl1
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	705 return '' # punt for conflicts
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	706
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	707 return func
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	708
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	709 @propertycache
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	710 def _flagfunc(self):
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	711 return self._repo.dirstate.flagfunc(self._buildflagfunc)
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	712
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	713 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	714 def _manifest(self):
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	715 """generate a manifest corresponding to the working directory"""
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	716
11101 502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	717 if self._unknown is None:
502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	718 self.status(unknown=True)
502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	719
3218 8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3217 diff changeset	720 man = self._parents[0].manifest().copy()
10921 fb89cd21a7a0 workingctx: correctly compute the flag for noexec filesystems+merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	721 if len(self._parents) > 1:
fb89cd21a7a0 workingctx: correctly compute the flag for noexec filesystems+merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	722 man2 = self.p2().manifest()
fb89cd21a7a0 workingctx: correctly compute the flag for noexec filesystems+merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	723 def getman(f):
fb89cd21a7a0 workingctx: correctly compute the flag for noexec filesystems+merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	724 if f in man:
fb89cd21a7a0 workingctx: correctly compute the flag for noexec filesystems+merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	725 return man
fb89cd21a7a0 workingctx: correctly compute the flag for noexec filesystems+merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	726 return man2
fb89cd21a7a0 workingctx: correctly compute the flag for noexec filesystems+merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	727 else:
fb89cd21a7a0 workingctx: correctly compute the flag for noexec filesystems+merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	728 getman = lambda f: man
15337 cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	729
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	730 copied = self._repo.dirstate.copies()
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	731 ff = self._flagfunc
11101 502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	732 modified, added, removed, deleted = self._status
502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	733 unknown = self._unknown
3673 eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3578 diff changeset	734 for i, l in (("a", added), ("m", modified), ("u", unknown)):
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	735 for f in l:
10921 fb89cd21a7a0 workingctx: correctly compute the flag for noexec filesystems+merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	736 orig = copied.get(f, f)
fb89cd21a7a0 workingctx: correctly compute the flag for noexec filesystems+merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	737 man[f] = getman(orig).get(orig, nullid) + i
3823 676b75547d13 context: don't spuriously raise abort when a file goes missing. Matt Mackall <mpm@selenic.com> parents: 3715 diff changeset	738 try:
6743 86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6742 diff changeset	739 man.set(f, ff(f))
3823 676b75547d13 context: don't spuriously raise abort when a file goes missing. Matt Mackall <mpm@selenic.com> parents: 3715 diff changeset	740 except OSError:
676b75547d13 context: don't spuriously raise abort when a file goes missing. Matt Mackall <mpm@selenic.com> parents: 3715 diff changeset	741 pass
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	742
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	743 for f in deleted + removed:
3325 50a18815e3f0 Revert changeset c67920d78248. Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 3313 diff changeset	744 if f in man:
50a18815e3f0 Revert changeset c67920d78248. Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 3313 diff changeset	745 del man[f]
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	746
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	747 return man
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	748
14129 81e6d42b3228 context: provide an efficient iterator for workingctx Matt Mackall <mpm@selenic.com> parents: 14004 diff changeset	749 def __iter__(self):
81e6d42b3228 context: provide an efficient iterator for workingctx Matt Mackall <mpm@selenic.com> parents: 14004 diff changeset	750 d = self._repo.dirstate
81e6d42b3228 context: provide an efficient iterator for workingctx Matt Mackall <mpm@selenic.com> parents: 14004 diff changeset	751 for f in d:
81e6d42b3228 context: provide an efficient iterator for workingctx Matt Mackall <mpm@selenic.com> parents: 14004 diff changeset	752 if d[f] != 'r':
81e6d42b3228 context: provide an efficient iterator for workingctx Matt Mackall <mpm@selenic.com> parents: 14004 diff changeset	753 yield f
81e6d42b3228 context: provide an efficient iterator for workingctx Matt Mackall <mpm@selenic.com> parents: 14004 diff changeset	754
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	755 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	756 def _status(self):
11101 502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	757 return self._repo.status()[:4]
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	758
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	759 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	760 def _user(self):
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	761 return self._repo.ui.username()
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	762
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	763 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	764 def _date(self):
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	765 return util.makedate()
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	766
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	767 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	768 def _parents(self):
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	769 p = self._repo.dirstate.parents()
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	770 if p[1] == nullid:
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	771 p = p[:-1]
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	772 self._parents = [changectx(self._repo, x) for x in p]
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	773 return self._parents
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	774
11098 380ab78dbd69 workingctx: add explicit status method, add ignored and fix clean Steve Borho <steve@borho.org> parents: 11097 diff changeset	775 def status(self, ignored=False, clean=False, unknown=False):
380ab78dbd69 workingctx: add explicit status method, add ignored and fix clean Steve Borho <steve@borho.org> parents: 11097 diff changeset	776 """Explicit status query
380ab78dbd69 workingctx: add explicit status method, add ignored and fix clean Steve Borho <steve@borho.org> parents: 11097 diff changeset	777 Unless this method is used to query the working copy status, the
380ab78dbd69 workingctx: add explicit status method, add ignored and fix clean Steve Borho <steve@borho.org> parents: 11097 diff changeset	778 _status property will implicitly read the status using its default
380ab78dbd69 workingctx: add explicit status method, add ignored and fix clean Steve Borho <steve@borho.org> parents: 11097 diff changeset	779 arguments."""
11099 a68bd3b7c040 workingctx: use member variables to store ignored and clean Steve Borho <steve@borho.org> parents: 11098 diff changeset	780 stat = self._repo.status(ignored=ignored, clean=clean, unknown=unknown)
11101 502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	781 self._unknown = self._ignored = self._clean = None
502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	782 if unknown:
502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	783 self._unknown = stat[4]
502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	784 if ignored:
502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	785 self._ignored = stat[5]
502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	786 if clean:
502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	787 self._clean = stat[6]
502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	788 self._status = stat[:4]
502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	789 return stat
11098 380ab78dbd69 workingctx: add explicit status method, add ignored and fix clean Steve Borho <steve@borho.org> parents: 11097 diff changeset	790
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	791 def manifest(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	792 return self._manifest
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	793 def user(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	794 return self._user or self._repo.ui.username()
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	795 def date(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	796 return self._date
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	797 def description(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	798 return self._text
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	799 def files(self):
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8207 diff changeset	800 return sorted(self._status[0] + self._status[1] + self._status[2])
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	801
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	802 def modified(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	803 return self._status[0]
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	804 def added(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	805 return self._status[1]
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	806 def removed(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	807 return self._status[2]
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	808 def deleted(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	809 return self._status[3]
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	810 def unknown(self):
11101 502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	811 assert self._unknown is not None # must call status first
502474839293 context: only scan unknowns when needed Matt Mackall <mpm@selenic.com> parents: 11100 diff changeset	812 return self._unknown
11098 380ab78dbd69 workingctx: add explicit status method, add ignored and fix clean Steve Borho <steve@borho.org> parents: 11097 diff changeset	813 def ignored(self):
11100 83968ae4aaf2 context: use asserts for ignored and clean exceptions Matt Mackall <mpm@selenic.com> parents: 11099 diff changeset	814 assert self._ignored is not None # must call status first
11099 a68bd3b7c040 workingctx: use member variables to store ignored and clean Steve Borho <steve@borho.org> parents: 11098 diff changeset	815 return self._ignored
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	816 def clean(self):
11100 83968ae4aaf2 context: use asserts for ignored and clean exceptions Matt Mackall <mpm@selenic.com> parents: 11099 diff changeset	817 assert self._clean is not None # must call status first
11099 a68bd3b7c040 workingctx: use member variables to store ignored and clean Steve Borho <steve@borho.org> parents: 11098 diff changeset	818 return self._clean
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	819 def branch(self):
13047 6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	820 return encoding.tolocal(self._extra['branch'])
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	821 def extra(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	822 return self._extra
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	823
4663 6b2e8cb39583 context: add tags() method Matt Mackall <mpm@selenic.com> parents: 4640 diff changeset	824 def tags(self):
6b2e8cb39583 context: add tags() method Matt Mackall <mpm@selenic.com> parents: 4640 diff changeset	825 t = []
13412 58c497d0e44d remove unnecessary list comprehensions Martin Geisler <mg@aragost.com> parents: 13384 diff changeset	826 for p in self.parents():
58c497d0e44d remove unnecessary list comprehensions Martin Geisler <mg@aragost.com> parents: 13384 diff changeset	827 t.extend(p.tags())
4663 6b2e8cb39583 context: add tags() method Matt Mackall <mpm@selenic.com> parents: 4640 diff changeset	828 return t
6b2e8cb39583 context: add tags() method Matt Mackall <mpm@selenic.com> parents: 4640 diff changeset	829
13476 b85a09f368bd workingctx: overload bookmarks() to return parents' bookmarks Kevin Bullock <kbullock@ringworld.org> parents: 13468 diff changeset	830 def bookmarks(self):
b85a09f368bd workingctx: overload bookmarks() to return parents' bookmarks Kevin Bullock <kbullock@ringworld.org> parents: 13468 diff changeset	831 b = []
b85a09f368bd workingctx: overload bookmarks() to return parents' bookmarks Kevin Bullock <kbullock@ringworld.org> parents: 13468 diff changeset	832 for p in self.parents():
b85a09f368bd workingctx: overload bookmarks() to return parents' bookmarks Kevin Bullock <kbullock@ringworld.org> parents: 13468 diff changeset	833 b.extend(p.bookmarks())
b85a09f368bd workingctx: overload bookmarks() to return parents' bookmarks Kevin Bullock <kbullock@ringworld.org> parents: 13468 diff changeset	834 return b
b85a09f368bd workingctx: overload bookmarks() to return parents' bookmarks Kevin Bullock <kbullock@ringworld.org> parents: 13468 diff changeset	835
15707 dc3eefe0c80e phases: implement ``phase()`` and ``hidden()`` method for workingctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15703 diff changeset	836 def phase(self):
15818 57241845a4bb phases: store phase values in constant instead of using raw integer Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15738 diff changeset	837 phase = phases.draft # default phase to draft
15707 dc3eefe0c80e phases: implement ``phase()`` and ``hidden()`` method for workingctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15703 diff changeset	838 for p in self.parents():
dc3eefe0c80e phases: implement ``phase()`` and ``hidden()`` method for workingctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15703 diff changeset	839 phase = max(phase, p.phase())
dc3eefe0c80e phases: implement ``phase()`` and ``hidden()`` method for workingctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15703 diff changeset	840 return phase
dc3eefe0c80e phases: implement ``phase()`` and ``hidden()`` method for workingctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15703 diff changeset	841
dc3eefe0c80e phases: implement ``phase()`` and ``hidden()`` method for workingctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15703 diff changeset	842 def hidden(self):
dc3eefe0c80e phases: implement ``phase()`` and ``hidden()`` method for workingctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15703 diff changeset	843 return False
dc3eefe0c80e phases: implement ``phase()`` and ``hidden()`` method for workingctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15703 diff changeset	844
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	845 def children(self):
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	846 return []
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	847
6743 86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6742 diff changeset	848 def flags(self, path):
5389 26c060922085 context: add fileflags() to avoid rebuilding manifests Patrick Mezard <pmezard@gmail.com> parents: 4909 diff changeset	849 if '_manifest' in self.__dict__:
26c060922085 context: add fileflags() to avoid rebuilding manifests Patrick Mezard <pmezard@gmail.com> parents: 4909 diff changeset	850 try:
26c060922085 context: add fileflags() to avoid rebuilding manifests Patrick Mezard <pmezard@gmail.com> parents: 4909 diff changeset	851 return self._manifest.flags(path)
26c060922085 context: add fileflags() to avoid rebuilding manifests Patrick Mezard <pmezard@gmail.com> parents: 4909 diff changeset	852 except KeyError:
26c060922085 context: add fileflags() to avoid rebuilding manifests Patrick Mezard <pmezard@gmail.com> parents: 4909 diff changeset	853 return ''
5760 0145f9afb0e7 Removed tabs and trailing whitespace in python files Thomas Arendsen Hein <thomas@intevation.de> parents: 5558 diff changeset	854
15337 cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	855 try:
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	856 return self._flagfunc(path)
cf5f9df6406b windows: recompute flags when committing a merge (issue1802) Matt Mackall <mpm@selenic.com> parents: 14674 diff changeset	857 except OSError:
5389 26c060922085 context: add fileflags() to avoid rebuilding manifests Patrick Mezard <pmezard@gmail.com> parents: 4909 diff changeset	858 return ''
26c060922085 context: add fileflags() to avoid rebuilding manifests Patrick Mezard <pmezard@gmail.com> parents: 4909 diff changeset	859
3966 b4eaa68dea1b context: create a filectxt with filelog reuse Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3965 diff changeset	860 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	861 """get a file context from the working directory"""
3966 b4eaa68dea1b context: create a filectxt with filelog reuse Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3965 diff changeset	862 return workingfilectx(self._repo, path, workingctx=self,
b4eaa68dea1b context: create a filectxt with filelog reuse Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3965 diff changeset	863 filelog=filelog)
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	864
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	865 def ancestor(self, c2):
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	866 """return the ancestor context of self and c2"""
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	867 return self._parents[0].ancestor(c2) # punt on two parents for now
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	868
6764 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6763 diff changeset	869 def walk(self, match):
10176 24ce8f0c0a39 dirstate: don't check state of subrepo directories Augie Fackler <durin42@gmail.com> parents: 9974 diff changeset	870 return sorted(self._repo.dirstate.walk(match, self.substate.keys(),
24ce8f0c0a39 dirstate: don't check state of subrepo directories Augie Fackler <durin42@gmail.com> parents: 9974 diff changeset	871 True, False))
6764 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6763 diff changeset	872
8717 e8de59577257 context: add a dirty method to detect modified contexts Matt Mackall <mpm@selenic.com> parents: 8528 diff changeset	873 def dirty(self, missing=False):
e8de59577257 context: add a dirty method to detect modified contexts Matt Mackall <mpm@selenic.com> parents: 8528 diff changeset	874 "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	875 # check subrepos first
22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: 11106 diff changeset	876 for s in self.substate:
22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: 11106 diff changeset	877 if self.sub(s).dirty():
22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: 11106 diff changeset	878 return True
22f5ad0b5857 subrepo: dirtiness checks should iterate over subrepos Edouard Gomez <ed.gomez@free.fr> parents: 11106 diff changeset	879 # check current working dir
8717 e8de59577257 context: add a dirty method to detect modified contexts Matt Mackall <mpm@selenic.com> parents: 8528 diff changeset	880 return (self.p2() or self.branch() != self.p1().branch() or
e8de59577257 context: add a dirty method to detect modified contexts Matt Mackall <mpm@selenic.com> parents: 8528 diff changeset	881 self.modified() or self.added() or self.removed() or
e8de59577257 context: add a dirty method to detect modified contexts Matt Mackall <mpm@selenic.com> parents: 8528 diff changeset	882 (missing and self.deleted()))
e8de59577257 context: add a dirty method to detect modified contexts Matt Mackall <mpm@selenic.com> parents: 8528 diff changeset	883
12270 166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12070 diff changeset	884 def add(self, list, prefix=""):
166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12070 diff changeset	885 join = lambda f: 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	886 wlock = self._repo.wlock()
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	887 ui, ds = self._repo.ui, self._repo.dirstate
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	888 try:
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	889 rejected = []
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	890 for f in list:
13962 8b252e826c68 add: introduce a warning message for non-portable filenames (issue2756) (BC) Adrian Buehlmann <adrian@cadifra.com> parents: 13877 diff changeset	891 scmutil.checkportable(ui, join(f))
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	892 p = self._repo.wjoin(f)
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	893 try:
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	894 st = os.lstat(p)
14004 97ed99d1f419 eliminate various naked except clauses Idan Kamara <idankk86@gmail.com> parents: 13962 diff changeset	895 except OSError:
12270 166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12070 diff changeset	896 ui.warn(_("%s does not exist!\n") % join(f))
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	897 rejected.append(f)
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	898 continue
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	899 if st.st_size > 10000000:
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	900 ui.warn(_("%s: up to %d MB of RAM may be required "
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	901 "to manage this file\n"
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	902 "(use 'hg revert %s' to cancel the "
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	903 "pending addition)\n")
12270 166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12070 diff changeset	904 % (f, 3 * st.st_size // 1000000, join(f)))
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	905 if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)):
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	906 ui.warn(_("%s not added: only files and symlinks "
12270 166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12070 diff changeset	907 "supported currently\n") % join(f))
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	908 rejected.append(p)
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	909 elif ds[f] in 'amn':
12270 166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12070 diff changeset	910 ui.warn(_("%s already tracked!\n") % join(f))
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	911 elif ds[f] == 'r':
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	912 ds.normallookup(f)
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	913 else:
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	914 ds.add(f)
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	915 return rejected
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	916 finally:
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	917 wlock.release()
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	918
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15895 diff changeset	919 def forget(self, files, prefix=""):
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15895 diff changeset	920 join = lambda f: 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	921 wlock = self._repo.wlock()
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	922 try:
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15895 diff changeset	923 rejected = []
14435 5f6090e559fa context: make forget work like commands.forget Matt Mackall <mpm@selenic.com> parents: 14434 diff changeset	924 for f in files:
16111 131d1a09108a context: make workingctx.forget() really warn about untracked files Patrick Mezard <patrick@mezard.eu> parents: 15912 diff changeset	925 if f not in self._repo.dirstate:
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15895 diff changeset	926 self._repo.ui.warn(_("%s not tracked!\n") % join(f))
2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15895 diff changeset	927 rejected.append(f)
16111 131d1a09108a context: make workingctx.forget() really warn about untracked files Patrick Mezard <patrick@mezard.eu> parents: 15912 diff changeset	928 elif self._repo.dirstate[f] != 'a':
131d1a09108a context: make workingctx.forget() really warn about untracked files Patrick Mezard <patrick@mezard.eu> parents: 15912 diff changeset	929 self._repo.dirstate.remove(f)
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	930 else:
14434 cc8c09855d19 dirstate: rename forget to drop Matt Mackall <mpm@selenic.com> parents: 14429 diff changeset	931 self._repo.dirstate.drop(f)
15912 2bd54ffaa27e forget: fix subrepo recursion for explicit path handling David M. Carr <david@carrclan.us> parents: 15895 diff changeset	932 return rejected
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	933 finally:
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	934 wlock.release()
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	935
12999 acd69df118ab context: walk both parents for workingctx.ancestors() Matt Mackall <mpm@selenic.com> parents: 12731 diff changeset	936 def ancestors(self):
acd69df118ab context: walk both parents for workingctx.ancestors() Matt Mackall <mpm@selenic.com> parents: 12731 diff changeset	937 for a in self._repo.changelog.ancestors(
acd69df118ab context: walk both parents for workingctx.ancestors() Matt Mackall <mpm@selenic.com> parents: 12731 diff changeset	938 *[p.rev() for p in self._parents]):
acd69df118ab context: walk both parents for workingctx.ancestors() Matt Mackall <mpm@selenic.com> parents: 12731 diff changeset	939 yield changectx(self._repo, a)
acd69df118ab context: walk both parents for workingctx.ancestors() Matt Mackall <mpm@selenic.com> parents: 12731 diff changeset	940
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	941 def undelete(self, list):
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	942 pctxs = self.parents()
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	943 wlock = self._repo.wlock()
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	944 try:
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	945 for f in list:
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	946 if self._repo.dirstate[f] != 'r':
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	947 self._repo.ui.warn(_("%s not removed!\n") % f)
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	948 else:
12360 4ae3e5dffa60 context: fix filectx.undelete() (issue2388) Patrick Mezard <pmezard@gmail.com> parents: 12344 diff changeset	949 fctx = f in pctxs[0] and pctxs[0][f] or pctxs[1][f]
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	950 t = fctx.data()
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	951 self._repo.wwrite(f, t, fctx.flags())
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	952 self._repo.dirstate.normal(f)
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	953 finally:
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	954 wlock.release()
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	955
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	956 def copy(self, source, dest):
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	957 p = self._repo.wjoin(dest)
12344 b6173aee4a47 Use lexists() instead of exists() where appropriate Patrick Mezard <pmezard@gmail.com> parents: 12067 diff changeset	958 if not os.path.lexists(p):
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	959 self._repo.ui.warn(_("%s does not exist!\n") % dest)
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	960 elif not (os.path.isfile(p) or os.path.islink(p)):
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	961 self._repo.ui.warn(_("copy failed: %s is not a file or a "
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	962 "symbolic link\n") % dest)
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	963 else:
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	964 wlock = self._repo.wlock()
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	965 try:
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	966 if self._repo.dirstate[dest] in '?r':
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	967 self._repo.dirstate.add(dest)
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	968 self._repo.dirstate.copy(source, dest)
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	969 finally:
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	970 wlock.release()
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11151 diff changeset	971
16143 fceb2964fa6c context: add 'dirs()' to changectx/workingctx for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16111 diff changeset	972 def dirs(self):
fceb2964fa6c context: add 'dirs()' to changectx/workingctx for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16111 diff changeset	973 return self._repo.dirstate.dirs()
fceb2964fa6c context: add 'dirs()' to changectx/workingctx for directory patterns FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16111 diff changeset	974
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	975 class workingfilectx(filectx):
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	976 """A workingfilectx object makes access to data related to a particular
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	977 file in the working directory convenient."""
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	978 def __init__(self, repo, path, filelog=None, workingctx=None):
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	979 """changeid can be a changeset revision, node, or tag.
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	980 fileid can be a file revision or node."""
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	981 self._repo = repo
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	982 self._path = path
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	983 self._changeid = None
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	984 self._filerev = self._filenode = None
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	985
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	986 if filelog:
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	987 self._filelog = filelog
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	988 if workingctx:
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	989 self._changectx = workingctx
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	990
8157 77c5877a668c context: use Python 2.4 decorator syntax Martin Geisler <mg@lazybytes.net> parents: 8151 diff changeset	991 @propertycache
7368 595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	992 def _changectx(self):
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	993 return workingctx(self._repo)
595ba2537d4f context: use descriptors to speed up lazy attributes Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7367 diff changeset	994
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	995 def __nonzero__(self):
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	996 return True
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	997
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	998 def __str__(self):
3313 6c68bc1e7873 context: change workingctx str() from . to <node>+ Matt Mackall <mpm@selenic.com> parents: 3310 diff changeset	999 return "%s@%s" % (self.path(), self._changectx)
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	1000
12947 4832717aed98 context: add __repr__ methods to workingfilectx and workingctx Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12731 diff changeset	1001 def __repr__(self):
4832717aed98 context: add __repr__ methods to workingfilectx and workingctx Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12731 diff changeset	1002 return "<workingfilectx %s>" % str(self)
4832717aed98 context: add __repr__ methods to workingfilectx and workingctx Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12731 diff changeset	1003
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1004 def data(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1005 return self._repo.wread(self._path)
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	1006 def renamed(self):
8528 4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	1007 rp = self._repo.dirstate.copied(self._path)
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	1008 if not rp:
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	1009 return None
3965 2e5161335e65 context: fix a bug in workingfilectx.renamed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3964 diff changeset	1010 return rp, self._changectx._parents[0]._manifest.get(rp, nullid)
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	1011
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	1012 def parents(self):
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	1013 '''return parent filectxs, following copies if necessary'''
8528 4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	1014 def filenode(ctx, path):
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	1015 return ctx._manifest.get(path, nullid)
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	1016
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	1017 path = self._path
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	1018 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	1019 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	1020 renamed = self.renamed()
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	1021
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	1022 if renamed:
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	1023 pl = [renamed + (None,)]
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	1024 else:
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	1025 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	1026
4ddffb793d18 workingfilectx: always use the same filelog, even for renames Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8527 diff changeset	1027 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	1028 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	1029
3673 eb0b4a2d70a9 white space and line break cleanups Thomas Arendsen Hein <thomas@intevation.de> parents: 3578 diff changeset	1030 return [filectx(self._repo, p, fileid=n, filelog=l)
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1031 for p, n, l in pl if n != nullid]
3217 6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	1032
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	1033 def children(self):
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	1034 return []
6d98149d70fe contexts: add working dir and working file contexts Matt Mackall <mpm@selenic.com> parents: 3216 diff changeset	1035
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1036 def size(self):
11605 ce95d8b87d22 context: use os.lstat instead of os.stat to fetch file size Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11539 diff changeset	1037 return os.lstat(self._repo.wjoin(self._path)).st_size
3962 2b8825c94c5a add date attribute to workingfilectx Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3961 diff changeset	1038 def date(self):
2b8825c94c5a add date attribute to workingfilectx Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3961 diff changeset	1039 t, tz = self._changectx.date()
2b8825c94c5a add date attribute to workingfilectx Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3961 diff changeset	1040 try:
4117 eb0967c6e77b Use only integer part of mtime in workingfilectx.date(), fixes test-context.py Thomas Arendsen Hein <thomas@intevation.de> parents: 4110 diff changeset	1041 return (int(os.lstat(self._repo.wjoin(self._path)).st_mtime), tz)
3962 2b8825c94c5a add date attribute to workingfilectx Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3961 diff changeset	1042 except OSError, err:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1043 if err.errno != errno.ENOENT:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1044 raise
3962 2b8825c94c5a add date attribute to workingfilectx Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3961 diff changeset	1045 return (t, tz)
3310 0e370798eebf context: add cmp for filectxs Matt Mackall <mpm@selenic.com> parents: 3302 diff changeset	1046
11702 eb07fbc21e9c filectx: use cmp(self, fctx) instead of cmp(self, text) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11605 diff changeset	1047 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	1048 """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	1049
11702 eb07fbc21e9c filectx: use cmp(self, fctx) instead of cmp(self, text) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11605 diff changeset	1050 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	1051 """
11703 55a2af02e45c context: reuse filecontext.cmp in workingfilecontext.cmp Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11702 diff changeset	1052 # fctx should be a filectx (not a wfctx)
55a2af02e45c context: reuse filecontext.cmp in workingfilecontext.cmp Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11702 diff changeset	1053 # 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	1054 return fctx.cmp(self)
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1055
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1056 class memctx(object):
7077 ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1057 """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	1058
7077 ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1059 Revision information is supplied at initialization time while
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1060 related files data and is made available through a callback
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1061 mechanism. 'repo' is the current localrepo, 'parents' is a
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1062 sequence of two parent revisions identifiers (pass None for every
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1063 missing parent), 'text' is the commit message and 'files' lists
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1064 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	1065 repository root).
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1066
7077 ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1067 filectxfn(repo, memctx, path) is a callable receiving the
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1068 repository, the current memctx object and the normalized path of
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1069 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	1070 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	1071 undefined. If the file is available in the revision being
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1072 committed (updated or added), filectxfn returns a memfilectx
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1073 object. If the file was removed, filectxfn raises an
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1074 IOError. Moved files are represented by marking the source file
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1075 removed and the new file added with copy information (see
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1076 memfilectx).
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1077
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1078 user receives the committer name and defaults to current
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1079 repository username, date is the commit date in any format
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1080 supported by util.parsedate() and defaults to current date, extra
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1081 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	1082 """
6721 521c6c6f3b9b kill some trailing spaces Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6718 diff changeset	1083 def __init__(self, repo, parents, text, files, filectxfn, user=None,
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1084 date=None, extra=None):
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1085 self._repo = repo
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1086 self._rev = None
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1087 self._node = None
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1088 self._text = text
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1089 self._date = date and util.parsedate(date) or util.makedate()
6809 89ec85aa6cc3 context: trigger missing username warning only when necessary Patrick Mezard <pmezard@gmail.com> parents: 6772 diff changeset	1090 self._user = user
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1091 parents = [(p or nullid) for p in parents]
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1092 p1, p2 = parents
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6744 diff changeset	1093 self._parents = [changectx(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	1094 files = sorted(set(files))
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1095 self._status = [files, [], [], [], []]
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1096 self._filectxfn = filectxfn
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1097
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1098 self._extra = extra and extra.copy() or {}
14528 0bd69e37fd20 memctx: simplify constructor Patrick Mezard <pmezard@gmail.com> parents: 14518 diff changeset	1099 if self._extra.get('branch', '') == '':
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1100 self._extra['branch'] = 'default'
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1101
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1102 def __str__(self):
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1103 return str(self._parents[0]) + "+"
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1104
6763 403682f1c678 context: add __int__ and hex methods Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	1105 def __int__(self):
403682f1c678 context: add __int__ and hex methods Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	1106 return self._rev
403682f1c678 context: add __int__ and hex methods Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	1107
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1108 def __nonzero__(self):
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1109 return True
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1110
8401 ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8380 diff changeset	1111 def __getitem__(self, key):
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8380 diff changeset	1112 return self.filectx(key)
ca7dc47eecc6 filecommit: swallow some bits from _commitctx, add _ Matt Mackall <mpm@selenic.com> parents: 8380 diff changeset	1113
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1114 def p1(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1115 return self._parents[0]
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1116 def p2(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1117 return self._parents[1]
8406 6ad1f72bdf34 context: add p1 and p2 methods Matt Mackall <mpm@selenic.com> parents: 8401 diff changeset	1118
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1119 def user(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1120 return self._user or self._repo.ui.username()
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1121 def date(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1122 return self._date
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1123 def description(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1124 return self._text
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1125 def files(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1126 return self.modified()
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1127 def modified(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1128 return self._status[0]
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1129 def added(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1130 return self._status[1]
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1131 def removed(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1132 return self._status[2]
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1133 def deleted(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1134 return self._status[3]
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1135 def unknown(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1136 return self._status[4]
11098 380ab78dbd69 workingctx: add explicit status method, add ignored and fix clean Steve Borho <steve@borho.org> parents: 11097 diff changeset	1137 def ignored(self):
380ab78dbd69 workingctx: add explicit status method, add ignored and fix clean Steve Borho <steve@borho.org> parents: 11097 diff changeset	1138 return self._status[5]
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1139 def clean(self):
11098 380ab78dbd69 workingctx: add explicit status method, add ignored and fix clean Steve Borho <steve@borho.org> parents: 11097 diff changeset	1140 return self._status[6]
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1141 def branch(self):
13047 6c375e07d673 branch: operate on branch names in local string space where possible Matt Mackall <mpm@selenic.com> parents: 13031 diff changeset	1142 return encoding.tolocal(self._extra['branch'])
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1143 def extra(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1144 return self._extra
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1145 def flags(self, f):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1146 return self[f].flags()
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1147
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1148 def parents(self):
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1149 """return contexts for each parent changeset"""
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1150 return self._parents
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1151
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1152 def filectx(self, path, filelog=None):
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1153 """get a file context from the working directory"""
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1154 return self._filectxfn(self._repo, self, path)
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1155
11151 c5c190822501 slightly improve memctx api Alexander Solovyov <piranha@piranha.org.ua> parents: 11144 diff changeset	1156 def commit(self):
c5c190822501 slightly improve memctx api Alexander Solovyov <piranha@piranha.org.ua> parents: 11144 diff changeset	1157 """commit context to the repo"""
c5c190822501 slightly improve memctx api Alexander Solovyov <piranha@piranha.org.ua> parents: 11144 diff changeset	1158 return self._repo.commitctx(self)
c5c190822501 slightly improve memctx api Alexander Solovyov <piranha@piranha.org.ua> parents: 11144 diff changeset	1159
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1160 class memfilectx(object):
7077 ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1161 """memfilectx represents an in-memory file to commit.
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1162
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1163 See memctx for more details.
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1164 """
11151 c5c190822501 slightly improve memctx api Alexander Solovyov <piranha@piranha.org.ua> parents: 11144 diff changeset	1165 def __init__(self, path, data, islink=False, isexec=False, copied=None):
7077 ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1166 """
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1167 path is the normalized file path relative to repository root.
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1168 data is the file content as a string.
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1169 islink is True if the file is a symbolic link.
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1170 isexec is True if the file is executable.
ccbd39cad3c3 context: improve memctx documentation Patrick Mezard <pmezard@gmail.com> parents: 7008 diff changeset	1171 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	1172 revision being committed, or None."""
6715 a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1173 self._path = path
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1174 self._data = data
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1175 self._flags = (islink and 'l' or '') + (isexec and 'x' or '')
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1176 self._copied = None
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1177 if copied:
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1178 self._copied = (copied, nullid)
a3c41abfa828 context: add memctx for memory commits Patrick Mezard <pmezard@gmail.com> parents: 6709 diff changeset	1179
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1180 def __nonzero__(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1181 return True
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1182 def __str__(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1183 return "%s@%s" % (self.path(), self._changectx)
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1184 def path(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1185 return self._path
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1186 def data(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1187 return self._data
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1188 def flags(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1189 return self._flags
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1190 def isexec(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1191 return 'x' in self._flags
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1192 def islink(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1193 return 'l' in self._flags
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1194 def renamed(self):
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	1195 return self._copied

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/context.py @ 16143:fceb2964fa6c stable