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

annotate mercurial/dirstate.py @ 6326:af3f26b6bba4

dirstate: ignore stat data for files that were updated too recently This should fix the race where hg commit foo <change foo without changing its size> happens in the same second and status is fooled into thinking foo is clean. A configuration item is used to determine the timeout, since different filesystems may have different requirements (I think VFAT needs 3s, while most Unix filesystems are fine with 1s).

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
date	Wed, 19 Mar 2008 17:55:21 -0300
parents	53cbb33e1269
children	6d952dc2abc9

rev	line source
1089 142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	1 """
142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	2 dirstate.py - working directory tracking for mercurial
142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	3
4635 63b9d2deed48 Updated copyright notices and add "and others" to "hg version" Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	4 Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
1089 142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	5
142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	6 This software may be used and distributed according to the terms
142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	7 of the GNU General Public License, incorporated herein by reference.
142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	8 """
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	9
6211 f89fd07fc51d Expand import * to allow Pyflakes to find problems Joel Rosdahl <joel@rosdahl.net> parents: 6201 diff changeset	10 from node import nullid
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	11 from i18n import _
6212 e75aab656f46 Remove unused imports Joel Rosdahl <joel@rosdahl.net> parents: 6211 diff changeset	12 import struct, os, bisect, stat, strutil, util, errno, ignore
6326 af3f26b6bba4 dirstate: ignore stat data for files that were updated too recently Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6298 diff changeset	13 import cStringIO, osutil, sys
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	14
4610 274c99fc629f dirstate: simplify state() Matt Mackall <mpm@selenic.com> parents: 4609 diff changeset	15 _unknown = ('?', 0, 0, 0)
274c99fc629f dirstate: simplify state() Matt Mackall <mpm@selenic.com> parents: 4609 diff changeset	16 _format = ">cllll"
274c99fc629f dirstate: simplify state() Matt Mackall <mpm@selenic.com> parents: 4609 diff changeset	17
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1541 diff changeset	18 class dirstate(object):
2393 5083cba2a777 dirstate: refactor the dirstate binary format, remove magic numbers Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2063 diff changeset	19
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	20 def __init__(self, opener, ui, root):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	21 self._opener = opener
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	22 self._root = root
4903 81078e177266 dirstate: use True and false for _dirty Matt Mackall <mpm@selenic.com> parents: 4677 diff changeset	23 self._dirty = False
4965 4106dde15aed Merge with crew Matt Mackall <mpm@selenic.com> parents: 4911 4953 diff changeset	24 self._dirtypl = False
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	25 self._ui = ui
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	26
4603 0f6853c15606 dirstate: use getattr rather than lazyread Matt Mackall <mpm@selenic.com> parents: 4527 diff changeset	27 def __getattr__(self, name):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	28 if name == '_map':
4615 9b00b73a5286 dirstate: hide some more internals Matt Mackall <mpm@selenic.com> parents: 4614 diff changeset	29 self._read()
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	30 return self._map
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	31 elif name == '_copymap':
4615 9b00b73a5286 dirstate: hide some more internals Matt Mackall <mpm@selenic.com> parents: 4614 diff changeset	32 self._read()
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	33 return self._copymap
4604 c867c11426ad dirstate: lazify copymap, _branch, and _pl Matt Mackall <mpm@selenic.com> parents: 4603 diff changeset	34 elif name == '_branch':
c867c11426ad dirstate: lazify copymap, _branch, and _pl Matt Mackall <mpm@selenic.com> parents: 4603 diff changeset	35 try:
4633 ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4620 diff changeset	36 self._branch = (self._opener("branch").read().strip()
ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4620 diff changeset	37 or "default")
4604 c867c11426ad dirstate: lazify copymap, _branch, and _pl Matt Mackall <mpm@selenic.com> parents: 4603 diff changeset	38 except IOError:
c867c11426ad dirstate: lazify copymap, _branch, and _pl Matt Mackall <mpm@selenic.com> parents: 4603 diff changeset	39 self._branch = "default"
c867c11426ad dirstate: lazify copymap, _branch, and _pl Matt Mackall <mpm@selenic.com> parents: 4603 diff changeset	40 return self._branch
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	41 elif name == '_pl':
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	42 self._pl = [nullid, nullid]
4604 c867c11426ad dirstate: lazify copymap, _branch, and _pl Matt Mackall <mpm@selenic.com> parents: 4603 diff changeset	43 try:
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	44 st = self._opener("dirstate").read(40)
4604 c867c11426ad dirstate: lazify copymap, _branch, and _pl Matt Mackall <mpm@selenic.com> parents: 4603 diff changeset	45 if len(st) == 40:
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	46 self._pl = st[:20], st[20:40]
4604 c867c11426ad dirstate: lazify copymap, _branch, and _pl Matt Mackall <mpm@selenic.com> parents: 4603 diff changeset	47 except IOError, err:
c867c11426ad dirstate: lazify copymap, _branch, and _pl Matt Mackall <mpm@selenic.com> parents: 4603 diff changeset	48 if err.errno != errno.ENOENT: raise
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	49 return self._pl
4615 9b00b73a5286 dirstate: hide some more internals Matt Mackall <mpm@selenic.com> parents: 4614 diff changeset	50 elif name == '_dirs':
9b00b73a5286 dirstate: hide some more internals Matt Mackall <mpm@selenic.com> parents: 4614 diff changeset	51 self._dirs = {}
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	52 for f in self._map:
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	53 if self[f] != 'r':
7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	54 self._incpath(f)
4615 9b00b73a5286 dirstate: hide some more internals Matt Mackall <mpm@selenic.com> parents: 4614 diff changeset	55 return self._dirs
4609 b43f17691ae6 dirstate: move ignore to its own file Matt Mackall <mpm@selenic.com> parents: 4608 diff changeset	56 elif name == '_ignore':
4905 fc61495ea9cf dirstate: make wjoin function private Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	57 files = [self._join('.hgignore')]
4620 d97fd22a0ea9 dirstate: pull ignore smarts out of ui Matt Mackall <mpm@selenic.com> parents: 4616 diff changeset	58 for name, path in self._ui.configitems("ui"):
d97fd22a0ea9 dirstate: pull ignore smarts out of ui Matt Mackall <mpm@selenic.com> parents: 4616 diff changeset	59 if name == 'ignore' or name.startswith('ignore.'):
d97fd22a0ea9 dirstate: pull ignore smarts out of ui Matt Mackall <mpm@selenic.com> parents: 4616 diff changeset	60 files.append(os.path.expanduser(path))
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	61 self._ignore = ignore.ignore(self._root, files, self._ui.warn)
4609 b43f17691ae6 dirstate: move ignore to its own file Matt Mackall <mpm@selenic.com> parents: 4608 diff changeset	62 return self._ignore
4611 86e5500a517e dirstate: lazify and lambdafy _slash Matt Mackall <mpm@selenic.com> parents: 4610 diff changeset	63 elif name == '_slash':
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	64 self._slash = self._ui.configbool('ui', 'slash') and os.sep != '/'
4611 86e5500a517e dirstate: lazify and lambdafy _slash Matt Mackall <mpm@selenic.com> parents: 4610 diff changeset	65 return self._slash
6257 bfd49ce0db64 dirstate: ignore mode changes if the fs does not supports the exec bit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6212 diff changeset	66 elif name == '_checkexec':
bfd49ce0db64 dirstate: ignore mode changes if the fs does not supports the exec bit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6212 diff changeset	67 self._checkexec = util.checkexec(self._root)
bfd49ce0db64 dirstate: ignore mode changes if the fs does not supports the exec bit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6212 diff changeset	68 return self._checkexec
6326 af3f26b6bba4 dirstate: ignore stat data for files that were updated too recently Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6298 diff changeset	69 elif name == '_limit':
af3f26b6bba4 dirstate: ignore stat data for files that were updated too recently Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6298 diff changeset	70 try:
af3f26b6bba4 dirstate: ignore stat data for files that were updated too recently Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6298 diff changeset	71 self._limit = int(self._ui.config('ui', 'limit', 1))
af3f26b6bba4 dirstate: ignore stat data for files that were updated too recently Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6298 diff changeset	72 except ValueError:
af3f26b6bba4 dirstate: ignore stat data for files that were updated too recently Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6298 diff changeset	73 self._limit = 1
af3f26b6bba4 dirstate: ignore stat data for files that were updated too recently Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6298 diff changeset	74 return self._limit
4603 0f6853c15606 dirstate: use getattr rather than lazyread Matt Mackall <mpm@selenic.com> parents: 4527 diff changeset	75 else:
0f6853c15606 dirstate: use getattr rather than lazyread Matt Mackall <mpm@selenic.com> parents: 4527 diff changeset	76 raise AttributeError, name
0f6853c15606 dirstate: use getattr rather than lazyread Matt Mackall <mpm@selenic.com> parents: 4527 diff changeset	77
4905 fc61495ea9cf dirstate: make wjoin function private Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	78 def _join(self, f):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	79 return os.path.join(self._root, f)
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	80
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	81 def getcwd(self):
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	82 cwd = os.getcwd()
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	83 if cwd == self._root: return ''
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	84 # self._root ends with a path separator if self._root is '/' or 'C:\'
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	85 rootsep = self._root
5843 83c354c4d529 Add endswithsep() and use it instead of using os.sep and os.altsep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5842 diff changeset	86 if not util.endswithsep(rootsep):
4230 c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	87 rootsep += os.sep
c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	88 if cwd.startswith(rootsep):
c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	89 return cwd[len(rootsep):]
c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	90 else:
c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	91 # we're outside the repo. return an absolute path.
c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	92 return cwd
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	93
4525 78b6add1f966 Add dirstate.pathto and localrepo.pathto. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4507 diff changeset	94 def pathto(self, f, cwd=None):
78b6add1f966 Add dirstate.pathto and localrepo.pathto. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4507 diff changeset	95 if cwd is None:
78b6add1f966 Add dirstate.pathto and localrepo.pathto. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4507 diff changeset	96 cwd = self.getcwd()
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	97 path = util.pathto(self._root, cwd, f)
4527 b422b558015b Add ui.slash hgrc setting Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4525 diff changeset	98 if self._slash:
5842 111ed8c871bf Use util.normpath() instead of direct path string operation. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5516 diff changeset	99 return util.normpath(path)
4527 b422b558015b Add ui.slash hgrc setting Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4525 diff changeset	100 return path
4525 78b6add1f966 Add dirstate.pathto and localrepo.pathto. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4507 diff changeset	101
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	102 def __getitem__(self, key):
4906 30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	103 ''' current states:
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	104 n normal
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	105 m needs merging
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	106 r marked for removal
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	107 a marked for addition
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	108 ? not tracked'''
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	109 return self._map.get(key, ("?",))[0]
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	110
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	111 def __contains__(self, key):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	112 return key in self._map
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	113
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	114 def __iter__(self):
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	115 a = self._map.keys()
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	116 a.sort()
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	117 for x in a:
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	118 yield x
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	119
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	120 def parents(self):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	121 return self._pl
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	122
4179 7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	123 def branch(self):
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	124 return self._branch
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	125
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1040 diff changeset	126 def setparents(self, p1, p2=nullid):
4965 4106dde15aed Merge with crew Matt Mackall <mpm@selenic.com> parents: 4911 4953 diff changeset	127 self._dirty = self._dirtypl = True
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	128 self._pl = p1, p2
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	129
4179 7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	130 def setbranch(self, branch):
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	131 self._branch = branch
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	132 self._opener("branch", "w").write(branch + '\n')
4179 7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	133
4615 9b00b73a5286 dirstate: hide some more internals Matt Mackall <mpm@selenic.com> parents: 4614 diff changeset	134 def _read(self):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	135 self._map = {}
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	136 self._copymap = {}
4952 a11921d24ec4 add dirstate._dirtypl variable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4677 diff changeset	137 if not self._dirtypl:
a11921d24ec4 add dirstate._dirtypl variable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4677 diff changeset	138 self._pl = [nullid, nullid]
4607 49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	139 try:
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	140 st = self._opener("dirstate").read()
4607 49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	141 except IOError, err:
49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	142 if err.errno != errno.ENOENT: raise
49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	143 return
49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	144 if not st:
49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	145 return
49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	146
4952 a11921d24ec4 add dirstate._dirtypl variable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4677 diff changeset	147 if not self._dirtypl:
a11921d24ec4 add dirstate._dirtypl variable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4677 diff changeset	148 self._pl = [st[:20], st[20: 40]]
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	149
2427 150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	150 # deref fields so they will be local in loop
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	151 dmap = self._map
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	152 copymap = self._copymap
2427 150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	153 unpack = struct.unpack
4610 274c99fc629f dirstate: simplify state() Matt Mackall <mpm@selenic.com> parents: 4609 diff changeset	154 e_size = struct.calcsize(_format)
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	155 pos1 = 40
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	156 l = len(st)
2427 150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	157
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	158 # the inner loop
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	159 while pos1 < l:
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	160 pos2 = pos1 + e_size
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	161 e = unpack(">cllll", st[pos1:pos2]) # a literal here is faster
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	162 pos1 = pos2 + e[4]
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	163 f = st[pos2:pos1]
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	164 if '\0' in f:
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	165 f, c = f.split('\0')
3154 b1f10d3223c1 dirstate: add copies function Matt Mackall <mpm@selenic.com> parents: 2962 diff changeset	166 copymap[f] = c
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	167 dmap[f] = e # we hold onto e[4] because making a subtuple is slow
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	168
4613 3a645af7fb76 localrepo and dirstate: rename reload to invalidate Matt Mackall <mpm@selenic.com> parents: 4612 diff changeset	169 def invalidate(self):
4656 4eeb91870d3b dirstate: fix typo Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4635 diff changeset	170 for a in "_map _copymap _branch _pl _dirs _ignore".split():
4953 6b3ed43f77ba dirstate.invalidate: avoid rebuilding _map Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4952 diff changeset	171 if a in self.__dict__:
6b3ed43f77ba dirstate.invalidate: avoid rebuilding _map Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4952 diff changeset	172 delattr(self, a)
4903 81078e177266 dirstate: use True and false for _dirty Matt Mackall <mpm@selenic.com> parents: 4677 diff changeset	173 self._dirty = False
4375 109077e7048d When reloading the dirstate, recompute ignore information if needed. Bryan O'Sullivan <bos@serpentine.com> parents: 4374 diff changeset	174
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	175 def copy(self, source, dest):
4903 81078e177266 dirstate: use True and false for _dirty Matt Mackall <mpm@selenic.com> parents: 4677 diff changeset	176 self._dirty = True
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	177 self._copymap[dest] = source
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	178
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	179 def copied(self, file):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	180 return self._copymap.get(file, None)
3154 b1f10d3223c1 dirstate: add copies function Matt Mackall <mpm@selenic.com> parents: 2962 diff changeset	181
b1f10d3223c1 dirstate: add copies function Matt Mackall <mpm@selenic.com> parents: 2962 diff changeset	182 def copies(self):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	183 return self._copymap
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	184
4615 9b00b73a5286 dirstate: hide some more internals Matt Mackall <mpm@selenic.com> parents: 4614 diff changeset	185 def _incpath(self, path):
5326 319c09685f30 dirstate: make dir collision logic faster Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	186 c = path.rfind('/')
319c09685f30 dirstate: make dir collision logic faster Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	187 if c >= 0:
319c09685f30 dirstate: make dir collision logic faster Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	188 dirs = self._dirs
319c09685f30 dirstate: make dir collision logic faster Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	189 base = path[:c]
319c09685f30 dirstate: make dir collision logic faster Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	190 if base not in dirs:
319c09685f30 dirstate: make dir collision logic faster Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	191 self._incpath(base)
319c09685f30 dirstate: make dir collision logic faster Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	192 dirs[base] = 1
319c09685f30 dirstate: make dir collision logic faster Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	193 else:
319c09685f30 dirstate: make dir collision logic faster Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	194 dirs[base] += 1
4615 9b00b73a5286 dirstate: hide some more internals Matt Mackall <mpm@selenic.com> parents: 4614 diff changeset	195
9b00b73a5286 dirstate: hide some more internals Matt Mackall <mpm@selenic.com> parents: 4614 diff changeset	196 def _decpath(self, path):
5516 f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	197 c = path.rfind('/')
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	198 if c >= 0:
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	199 base = path[:c]
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	200 dirs = self._dirs
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	201 if dirs[base] == 1:
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	202 del dirs[base]
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	203 self._decpath(base)
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	204 else:
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	205 dirs[base] -= 1
2953 3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	206
4616 70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	207 def _incpathcheck(self, f):
70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	208 if '\r' in f or '\n' in f:
6138 09847b90beae Report filenames with disallowed characters as suggested by Mika Eloranta Thomas Arendsen Hein <thomas@intevation.de> parents: 6110 diff changeset	209 raise util.Abort(_("'\\n' and '\\r' disallowed in filenames: %r")
09847b90beae Report filenames with disallowed characters as suggested by Mika Eloranta Thomas Arendsen Hein <thomas@intevation.de> parents: 6110 diff changeset	210 % f)
4616 70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	211 # shadows
70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	212 if f in self._dirs:
5045 8b1ee1f59b3c dirstate: improve error message on file/directory clash Bryan O'Sullivan <bos@serpentine.com> parents: 5003 diff changeset	213 raise util.Abort(_('directory %r already in dirstate') % f)
4616 70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	214 for c in strutil.rfindall(f, '/'):
70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	215 d = f[:c]
70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	216 if d in self._dirs:
70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	217 break
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	218 if d in self._map and self[d] != 'r':
5045 8b1ee1f59b3c dirstate: improve error message on file/directory clash Bryan O'Sullivan <bos@serpentine.com> parents: 5003 diff changeset	219 raise util.Abort(_('file %r in dirstate clashes with %r') %
8b1ee1f59b3c dirstate: improve error message on file/directory clash Bryan O'Sullivan <bos@serpentine.com> parents: 5003 diff changeset	220 (d, f))
4616 70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	221 self._incpath(f)
2953 3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	222
5516 f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	223 def _changepath(self, f, newstate, relaxed=False):
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	224 # handle upcoming path changes
7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	225 oldstate = self[f]
7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	226 if oldstate not in "?r" and newstate in "?r":
5516 f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	227 if "_dirs" in self.__dict__:
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	228 self._decpath(f)
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	229 return
7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	230 if oldstate in "?r" and newstate not in "?r":
5516 f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	231 if relaxed and oldstate == '?':
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	232 # XXX
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	233 # in relaxed mode we assume the caller knows
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	234 # what it is doing, workaround for updating
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	235 # dir-to-file revisions
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	236 if "_dirs" in self.__dict__:
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	237 self._incpath(f)
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	238 return
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	239 self._incpathcheck(f)
7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	240 return
7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	241
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	242 def normal(self, f):
5210 90d9ec0dc69d merge: forcefully mark files that we get from the second parent as dirty Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5123 diff changeset	243 'mark a file normal and clean'
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	244 self._dirty = True
5516 f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	245 self._changepath(f, 'n', True)
4905 fc61495ea9cf dirstate: make wjoin function private Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	246 s = os.lstat(self._join(f))
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	247 self._map[f] = ('n', s.st_mode, s.st_size, s.st_mtime, 0)
5915 d0576d065993 Prefer i in d over d.has_key(i) Christian Ebert <blacktrash@gmx.net> parents: 5843 diff changeset	248 if f in self._copymap:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	249 del self._copymap[f]
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	250
5210 90d9ec0dc69d merge: forcefully mark files that we get from the second parent as dirty Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5123 diff changeset	251 def normallookup(self, f):
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	252 'mark a file normal, but possibly dirty'
6298 53cbb33e1269 normallookup: during merges, restore the state saved by remove Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6297 diff changeset	253 if self._pl[1] != nullid and f in self._map:
53cbb33e1269 normallookup: during merges, restore the state saved by remove Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6297 diff changeset	254 # if there is a merge going on and the file was either
53cbb33e1269 normallookup: during merges, restore the state saved by remove Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6297 diff changeset	255 # in state 'm' or dirty before being removed, restore that state.
53cbb33e1269 normallookup: during merges, restore the state saved by remove Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6297 diff changeset	256 entry = self._map[f]
53cbb33e1269 normallookup: during merges, restore the state saved by remove Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6297 diff changeset	257 if entry[0] == 'r' and entry[2] in (-1, -2):
53cbb33e1269 normallookup: during merges, restore the state saved by remove Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6297 diff changeset	258 source = self._copymap.get(f)
53cbb33e1269 normallookup: during merges, restore the state saved by remove Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6297 diff changeset	259 if entry[2] == -1:
53cbb33e1269 normallookup: during merges, restore the state saved by remove Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6297 diff changeset	260 self.merge(f)
53cbb33e1269 normallookup: during merges, restore the state saved by remove Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6297 diff changeset	261 elif entry[2] == -2:
53cbb33e1269 normallookup: during merges, restore the state saved by remove Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6297 diff changeset	262 self.normaldirty(f)
53cbb33e1269 normallookup: during merges, restore the state saved by remove Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6297 diff changeset	263 if source:
53cbb33e1269 normallookup: during merges, restore the state saved by remove Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6297 diff changeset	264 self.copy(source, f)
53cbb33e1269 normallookup: during merges, restore the state saved by remove Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6297 diff changeset	265 return
53cbb33e1269 normallookup: during merges, restore the state saved by remove Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6297 diff changeset	266 if entry[0] == 'm' or entry[0] == 'n' and entry[2] == -2:
53cbb33e1269 normallookup: during merges, restore the state saved by remove Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6297 diff changeset	267 return
4903 81078e177266 dirstate: use True and false for _dirty Matt Mackall <mpm@selenic.com> parents: 4677 diff changeset	268 self._dirty = True
5516 f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	269 self._changepath(f, 'n', True)
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	270 self._map[f] = ('n', 0, -1, -1, 0)
5210 90d9ec0dc69d merge: forcefully mark files that we get from the second parent as dirty Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5123 diff changeset	271 if f in self._copymap:
90d9ec0dc69d merge: forcefully mark files that we get from the second parent as dirty Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5123 diff changeset	272 del self._copymap[f]
90d9ec0dc69d merge: forcefully mark files that we get from the second parent as dirty Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5123 diff changeset	273
90d9ec0dc69d merge: forcefully mark files that we get from the second parent as dirty Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5123 diff changeset	274 def normaldirty(self, f):
90d9ec0dc69d merge: forcefully mark files that we get from the second parent as dirty Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5123 diff changeset	275 'mark a file normal, but dirty'
90d9ec0dc69d merge: forcefully mark files that we get from the second parent as dirty Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5123 diff changeset	276 self._dirty = True
5516 f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	277 self._changepath(f, 'n', True)
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	278 self._map[f] = ('n', 0, -2, -1, 0)
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	279 if f in self._copymap:
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	280 del self._copymap[f]
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	281
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	282 def add(self, f):
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	283 'mark a file added'
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	284 self._dirty = True
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	285 self._changepath(f, 'a')
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	286 self._map[f] = ('a', 0, -1, -1, 0)
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	287 if f in self._copymap:
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	288 del self._copymap[f]
4616 70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	289
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	290 def remove(self, f):
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	291 'mark a file removed'
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	292 self._dirty = True
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	293 self._changepath(f, 'r')
6297 fed1a9c22076 dirstate.remove: during merges, remember the previous file state Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6257 diff changeset	294 size = 0
fed1a9c22076 dirstate.remove: during merges, remember the previous file state Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6257 diff changeset	295 if self._pl[1] != nullid and f in self._map:
fed1a9c22076 dirstate.remove: during merges, remember the previous file state Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6257 diff changeset	296 entry = self._map[f]
fed1a9c22076 dirstate.remove: during merges, remember the previous file state Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6257 diff changeset	297 if entry[0] == 'm':
fed1a9c22076 dirstate.remove: during merges, remember the previous file state Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6257 diff changeset	298 size = -1
fed1a9c22076 dirstate.remove: during merges, remember the previous file state Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6257 diff changeset	299 elif entry[0] == 'n' and entry[2] == -2:
fed1a9c22076 dirstate.remove: during merges, remember the previous file state Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6257 diff changeset	300 size = -2
fed1a9c22076 dirstate.remove: during merges, remember the previous file state Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6257 diff changeset	301 self._map[f] = ('r', 0, size, 0, 0)
fed1a9c22076 dirstate.remove: during merges, remember the previous file state Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6257 diff changeset	302 if size == 0 and f in self._copymap:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	303 del self._copymap[f]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	304
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	305 def merge(self, f):
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	306 'mark a file merged'
4903 81078e177266 dirstate: use True and false for _dirty Matt Mackall <mpm@selenic.com> parents: 4677 diff changeset	307 self._dirty = True
4905 fc61495ea9cf dirstate: make wjoin function private Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	308 s = os.lstat(self._join(f))
5516 f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	309 self._changepath(f, 'm', True)
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	310 self._map[f] = ('m', s.st_mode, s.st_size, s.st_mtime, 0)
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	311 if f in self._copymap:
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	312 del self._copymap[f]
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	313
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	314 def forget(self, f):
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	315 'forget a file'
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	316 self._dirty = True
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	317 try:
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	318 self._changepath(f, '?')
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	319 del self._map[f]
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	320 except KeyError:
6057 218d5b9aa466 Remove trailing ! from two error messages as this was confusing. Thomas Arendsen Hein <thomas@intevation.de> parents: 6048 diff changeset	321 self._ui.warn(_("not in dirstate: %s\n") % f)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	322
5065 b304c2496f52 dirstate: fix rebuild; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4953 diff changeset	323 def clear(self):
b304c2496f52 dirstate: fix rebuild; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4953 diff changeset	324 self._map = {}
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	325 if "_dirs" in self.__dict__:
7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	326 delattr(self, "_dirs");
5065 b304c2496f52 dirstate: fix rebuild; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4953 diff changeset	327 self._copymap = {}
b304c2496f52 dirstate: fix rebuild; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4953 diff changeset	328 self._pl = [nullid, nullid]
5123 79373ec3f27d merge with crew-stable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5045 5065 diff changeset	329 self._dirty = True
5065 b304c2496f52 dirstate: fix rebuild; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4953 diff changeset	330
1755 a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	331 def rebuild(self, parent, files):
5065 b304c2496f52 dirstate: fix rebuild; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4953 diff changeset	332 self.clear()
2832 e196aa1df169 Start using manifestflags methods Matt Mackall <mpm@selenic.com> parents: 2486 diff changeset	333 for f in files:
e196aa1df169 Start using manifestflags methods Matt Mackall <mpm@selenic.com> parents: 2486 diff changeset	334 if files.execf(f):
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	335 self._map[f] = ('n', 0777, -1, 0, 0)
1755 a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	336 else:
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	337 self._map[f] = ('n', 0666, -1, 0, 0)
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	338 self._pl = (parent, nullid)
4903 81078e177266 dirstate: use True and false for _dirty Matt Mackall <mpm@selenic.com> parents: 4677 diff changeset	339 self._dirty = True
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	340
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	341 def write(self):
4612 17ee7407097f dirstate: simplify dirty handling Matt Mackall <mpm@selenic.com> parents: 4611 diff changeset	342 if not self._dirty:
1794 98b6c1cad58b only write the dirstate when something changed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1755 diff changeset	343 return
6326 af3f26b6bba4 dirstate: ignore stat data for files that were updated too recently Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6298 diff changeset	344 st = self._opener("dirstate", "w", atomictemp=True)
af3f26b6bba4 dirstate: ignore stat data for files that were updated too recently Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6298 diff changeset	345 if self._limit > 0:
af3f26b6bba4 dirstate: ignore stat data for files that were updated too recently Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6298 diff changeset	346 limit = util.fstat(st).st_mtime - self._limit
af3f26b6bba4 dirstate: ignore stat data for files that were updated too recently Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6298 diff changeset	347 else:
af3f26b6bba4 dirstate: ignore stat data for files that were updated too recently Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6298 diff changeset	348 limit = sys.maxint
4374 9edc2d6f7c10 dirstate: speed up write by 50%. Bryan O'Sullivan <bos@serpentine.com> parents: 4373 diff changeset	349 cs = cStringIO.StringIO()
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	350 copymap = self._copymap
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	351 pack = struct.pack
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	352 write = cs.write
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	353 write("".join(self._pl))
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	354 for f, e in self._map.iteritems():
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	355 if f in copymap:
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	356 f = "%s\0%s" % (f, copymap[f])
6326 af3f26b6bba4 dirstate: ignore stat data for files that were updated too recently Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6298 diff changeset	357 if e[3] > limit and e[0] == 'n':
af3f26b6bba4 dirstate: ignore stat data for files that were updated too recently Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6298 diff changeset	358 e = (e[0], 0, -1, -1, 0)
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	359 e = pack(_format, e[0], e[1], e[2], e[3], len(f))
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	360 write(e)
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	361 write(f)
4374 9edc2d6f7c10 dirstate: speed up write by 50%. Bryan O'Sullivan <bos@serpentine.com> parents: 4373 diff changeset	362 st.write(cs.getvalue())
4507 289ec1f36b11 Use atomictemp files to write the dirstate. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4446 diff changeset	363 st.rename()
4965 4106dde15aed Merge with crew Matt Mackall <mpm@selenic.com> parents: 4911 4953 diff changeset	364 self._dirty = self._dirtypl = False
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	365
4907 6a7659a0c07c dirstate: make filterfiles private Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	366 def _filter(self, files):
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	367 ret = {}
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	368 unknown = []
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	369
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	370 for x in files:
1541 bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1529 diff changeset	371 if x == '.':
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	372 return self._map.copy()
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	373 if x not in self._map:
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	374 unknown.append(x)
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	375 else:
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	376 ret[x] = self._map[x]
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	377
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	378 if not unknown:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	379 return ret
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	380
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	381 b = self._map.keys()
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	382 b.sort()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	383 blen = len(b)
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	384
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	385 for x in unknown:
2486 3ea8111ead90 simplify filterfiles when filtering based on a directory Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2485 diff changeset	386 bs = bisect.bisect(b, "%s%s" % (x, '/'))
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	387 while bs < blen:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	388 s = b[bs]
2485 885de96eb542 filterfiles: Search as long as the target is a prefix of current. Brendan Cully <brendan@kublai.com> parents: 2470 diff changeset	389 if len(s) > len(x) and s.startswith(x):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	390 ret[s] = self._map[s]
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	391 else:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	392 break
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	393 bs += 1
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	394 return ret
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	395
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	396 def _supported(self, f, mode, verbose=False):
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	397 if stat.S_ISREG(mode) or stat.S_ISLNK(mode):
1487 2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	398 return True
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	399 if verbose:
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	400 kind = 'unknown'
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	401 if stat.S_ISCHR(mode): kind = _('character device')
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	402 elif stat.S_ISBLK(mode): kind = _('block device')
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	403 elif stat.S_ISFIFO(mode): kind = _('fifo')
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	404 elif stat.S_ISSOCK(mode): kind = _('socket')
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	405 elif stat.S_ISDIR(mode): kind = _('directory')
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	406 self._ui.warn(_('%s: unsupported file type (type is %s)\n')
4633 ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4620 diff changeset	407 % (self.pathto(f), kind))
1487 2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	408 return False
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	409
6032 b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	410 def _dirignore(self, f):
b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	411 if self._ignore(f):
b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	412 return True
b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	413 for c in strutil.findall(f, '/'):
b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	414 if self._ignore(f[:c]):
b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	415 return True
b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	416 return False
b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	417
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	418 def walk(self, files=None, match=util.always, badmatch=None):
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	419 # filter out the stat
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	420 for src, f, st in self.statwalk(files, match, badmatch=badmatch):
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	421 yield src, f
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	422
6201 305d4450036a Extend/correct acc40572da5b regarding -qA and ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 6138 diff changeset	423 def statwalk(self, files=None, match=util.always, unknown=True,
305d4450036a Extend/correct acc40572da5b regarding -qA and ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 6138 diff changeset	424 ignored=False, badmatch=None, directories=False):
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	425 '''
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	426 walk recursively through the directory tree, finding all files
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	427 matched by the match function
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	428
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	429 results are yielded in a tuple (src, filename, st), where src
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	430 is one of:
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	431 'f' the file was found in the directory tree
4146 e287d61dd268 Yield directories in dirstate.statwalk() Emanuele Aina <faina.mail@tiscali.it> parents: 4081 diff changeset	432 'd' the file is a directory of the tree
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	433 'm' the file was only in the dirstate and not in the tree
3532 26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3529 diff changeset	434 'b' file was not found and matched badmatch
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3529 diff changeset	435
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	436 and st is the stat result if the file was found in the directory.
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	437 '''
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	438
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	439 # walk all files by default
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	440 if not files:
4172 b36bd7534c08 statwalk: don't put self.root in the files list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4075 diff changeset	441 files = ['.']
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	442 dc = self._map.copy()
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	443 else:
3536 ece5c53577eb small refactoring of path normalization in dirstate.statwalk Matt Mackall <mpm@selenic.com> parents: 3534 diff changeset	444 files = util.unique(files)
4907 6a7659a0c07c dirstate: make filterfiles private Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	445 dc = self._filter(files)
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	446
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	447 def imatch(file_):
4609 b43f17691ae6 dirstate: move ignore to its own file Matt Mackall <mpm@selenic.com> parents: 4608 diff changeset	448 if file_ not in dc and self._ignore(file_):
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	449 return False
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	450 return match(file_)
1224 cc61d366bc3b Fix Windows status problem from new dirstate walk code mpm@selenic.com parents: 1183 diff changeset	451
6201 305d4450036a Extend/correct acc40572da5b regarding -qA and ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 6138 diff changeset	452 # TODO: don't walk unknown directories if unknown and ignored are False
4609 b43f17691ae6 dirstate: move ignore to its own file Matt Mackall <mpm@selenic.com> parents: 4608 diff changeset	453 ignore = self._ignore
6032 b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	454 dirignore = self._dirignore
4193 dd0d9bd91e0a dirstate.statwalk: explicitly test for ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4172 diff changeset	455 if ignored:
dd0d9bd91e0a dirstate.statwalk: explicitly test for ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4172 diff changeset	456 imatch = match
dd0d9bd91e0a dirstate.statwalk: explicitly test for ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4172 diff changeset	457 ignore = util.never
6032 b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	458 dirignore = util.never
3534 549cb7b640fb Simplify ignore logic in dirstate.walk Matt Mackall <mpm@selenic.com> parents: 3532 diff changeset	459
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	460 # self._root may end with a path separator when self._root == '/'
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	461 common_prefix_len = len(self._root)
5843 83c354c4d529 Add endswithsep() and use it instead of using os.sep and os.altsep directly. Shun-ichi GOTO <shunichi.goto@gmail.com> parents: 5842 diff changeset	462 if not util.endswithsep(self._root):
2671 82864a2eb709 self.root == '/': prefix length computation out of the loop Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2670 diff changeset	463 common_prefix_len += 1
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	464
46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	465 normpath = util.normpath
5396 5105b119edd2 Add osutil module, containing a listdir function. Bryan O'Sullivan <bos@serpentine.com> parents: 5327 diff changeset	466 listdir = osutil.listdir
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	467 lstat = os.lstat
46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	468 bisect_left = bisect.bisect_left
46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	469 isdir = os.path.isdir
46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	470 pconvert = util.pconvert
46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	471 join = os.path.join
46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	472 s_isdir = stat.S_ISDIR
46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	473 supported = self._supported
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	474 _join = self._join
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	475 known = {'.hg': 1}
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	476
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	477 # recursion free walker, faster than os.walk.
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	478 def findfiles(s):
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	479 work = [s]
5002 4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	480 wadd = work.append
4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	481 found = []
4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	482 add = found.append
4146 e287d61dd268 Yield directories in dirstate.statwalk() Emanuele Aina <faina.mail@tiscali.it> parents: 4081 diff changeset	483 if directories:
5002 4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	484 add((normpath(s[common_prefix_len:]), 'd', lstat(s)))
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	485 while work:
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	486 top = work.pop()
5396 5105b119edd2 Add osutil module, containing a listdir function. Bryan O'Sullivan <bos@serpentine.com> parents: 5327 diff changeset	487 entries = listdir(top, stat=True)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	488 # nd is the top of the repository dir tree
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	489 nd = normpath(top[common_prefix_len:])
2061 5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	490 if nd == '.':
5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	491 nd = ''
5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	492 else:
2063 f1fda71e134e benoit asked for comment to make avoid of recursive repo clearer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2062 diff changeset	493 # do not recurse into a repo contained in this
f1fda71e134e benoit asked for comment to make avoid of recursive repo clearer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2062 diff changeset	494 # one. use bisect to find .hg directory so speed
f1fda71e134e benoit asked for comment to make avoid of recursive repo clearer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2062 diff changeset	495 # is good on big directory.
5396 5105b119edd2 Add osutil module, containing a listdir function. Bryan O'Sullivan <bos@serpentine.com> parents: 5327 diff changeset	496 names = [e[0] for e in entries]
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	497 hg = bisect_left(names, '.hg')
2061 5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	498 if hg < len(names) and names[hg] == '.hg':
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	499 if isdir(join(top, '.hg')):
2061 5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	500 continue
5396 5105b119edd2 Add osutil module, containing a listdir function. Bryan O'Sullivan <bos@serpentine.com> parents: 5327 diff changeset	501 for f, kind, st in entries:
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	502 np = pconvert(join(nd, f))
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	503 if np in known:
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	504 continue
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	505 known[np] = 1
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	506 p = join(top, f)
1228 db950da49539 Fix dangling symlink bug in dirstate walk code mpm@selenic.com parents: 1224 diff changeset	507 # don't trip over symlinks
5396 5105b119edd2 Add osutil module, containing a listdir function. Bryan O'Sullivan <bos@serpentine.com> parents: 5327 diff changeset	508 if kind == stat.S_IFDIR:
4254 a7cae4e22749 Pass normalized directory names to the ignore function Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4193 diff changeset	509 if not ignore(np):
5002 4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	510 wadd(p)
4146 e287d61dd268 Yield directories in dirstate.statwalk() Emanuele Aina <faina.mail@tiscali.it> parents: 4081 diff changeset	511 if directories:
5002 4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	512 add((np, 'd', st))
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	513 if np in dc and match(np):
5002 4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	514 add((np, 'm', st))
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	515 elif imatch(np):
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	516 if supported(np, st.st_mode):
5002 4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	517 add((np, 'f', st))
1487 2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	518 elif np in dc:
5002 4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	519 add((np, 'm', st))
4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	520 found.sort()
4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	521 return found
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	522
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	523 # step one, find all files that match our criteria
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	524 files.sort()
3536 ece5c53577eb small refactoring of path normalization in dirstate.statwalk Matt Mackall <mpm@selenic.com> parents: 3534 diff changeset	525 for ff in files:
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	526 nf = normpath(ff)
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	527 f = _join(ff)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	528 try:
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	529 st = lstat(f)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	530 except OSError, inst:
1564 34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	531 found = False
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	532 for fn in dc:
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	533 if nf == fn or (fn.startswith(nf) and fn[len(nf)] == '/'):
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	534 found = True
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	535 break
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	536 if not found:
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	537 if inst.errno != errno.ENOENT or not badmatch:
4633 ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4620 diff changeset	538 self._ui.warn('%s: %s\n' %
ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4620 diff changeset	539 (self.pathto(ff), inst.strerror))
3534 549cb7b640fb Simplify ignore logic in dirstate.walk Matt Mackall <mpm@selenic.com> parents: 3532 diff changeset	540 elif badmatch and badmatch(ff) and imatch(nf):
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	541 yield 'b', ff, None
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	542 continue
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	543 if s_isdir(st.st_mode):
6032 b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	544 if not dirignore(nf):
b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	545 for f, src, st in findfiles(f):
b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	546 yield src, f, st
1392 32d8068b3e36 add a check for filetype when walking Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1276 diff changeset	547 else:
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	548 if nf in known:
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	549 continue
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	550 known[nf] = 1
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	551 if match(nf):
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	552 if supported(ff, st.st_mode, verbose=True):
3536 ece5c53577eb small refactoring of path normalization in dirstate.statwalk Matt Mackall <mpm@selenic.com> parents: 3534 diff changeset	553 yield 'f', nf, st
1487 2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	554 elif ff in dc:
3536 ece5c53577eb small refactoring of path normalization in dirstate.statwalk Matt Mackall <mpm@selenic.com> parents: 3534 diff changeset	555 yield 'm', nf, st
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	556
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	557 # step two run through anything left in the dc hash and yield
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	558 # if we haven't already seen it
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	559 ks = dc.keys()
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	560 ks.sort()
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	561 for k in ks:
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	562 if k in known:
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	563 continue
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	564 known[k] = 1
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	565 if imatch(k):
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	566 yield 'm', k, None
669 8aa2a282eda4 .hgignore speedups patch incorporating Matt's feedback. mwilli2@localhost.localdomain parents: 667 diff changeset	567
6201 305d4450036a Extend/correct acc40572da5b regarding -qA and ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 6138 diff changeset	568 def status(self, files, match, list_ignored, list_clean, list_unknown=True):
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2008 diff changeset	569 lookup, modified, added, unknown, ignored = [], [], [], [], []
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2486 diff changeset	570 removed, deleted, clean = [], [], []
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	571
6033 a1ebd5cd7e55 dirstate.status: avoid putting ignored files in the unknown list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6032 diff changeset	572 files = files or []
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	573 _join = self._join
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	574 lstat = os.lstat
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	575 cmap = self._copymap
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	576 dmap = self._map
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	577 ladd = lookup.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	578 madd = modified.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	579 aadd = added.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	580 uadd = unknown.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	581 iadd = ignored.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	582 radd = removed.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	583 dadd = deleted.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	584 cadd = clean.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	585
6201 305d4450036a Extend/correct acc40572da5b regarding -qA and ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 6138 diff changeset	586 for src, fn, st in self.statwalk(files, match, unknown=list_unknown,
305d4450036a Extend/correct acc40572da5b regarding -qA and ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 6138 diff changeset	587 ignored=list_ignored):
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	588 if fn in dmap:
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	589 type_, mode, size, time, foo = dmap[fn]
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	590 else:
6033 a1ebd5cd7e55 dirstate.status: avoid putting ignored files in the unknown list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6032 diff changeset	591 if (list_ignored or fn in files) and self._dirignore(fn):
a1ebd5cd7e55 dirstate.status: avoid putting ignored files in the unknown list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6032 diff changeset	592 if list_ignored:
a1ebd5cd7e55 dirstate.status: avoid putting ignored files in the unknown list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6032 diff changeset	593 iadd(fn)
6201 305d4450036a Extend/correct acc40572da5b regarding -qA and ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 6138 diff changeset	594 elif list_unknown:
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	595 uadd(fn)
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	596 continue
1476 17e8c70fb670 fix dirstate.change: it should walk ignored files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1471 diff changeset	597 if src == 'm':
1487 2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	598 nonexistent = True
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	599 if not st:
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	600 try:
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	601 st = lstat(_join(fn))
1487 2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	602 except OSError, inst:
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	603 if inst.errno not in (errno.ENOENT, errno.ENOTDIR):
1487 2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	604 raise
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	605 st = None
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	606 # We need to re-check that it is a valid file
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	607 if st and self._supported(fn, st.st_mode):
1487 2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	608 nonexistent = False
1476 17e8c70fb670 fix dirstate.change: it should walk ignored files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1471 diff changeset	609 # XXX: what to do with file no longer present in the fs
17e8c70fb670 fix dirstate.change: it should walk ignored files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1471 diff changeset	610 # who are not removed in the dirstate ?
6110 81e20e01d465 status: put added files that have disappeared in the deleted list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6057 diff changeset	611 if nonexistent and type_ in "nma":
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	612 dadd(fn)
1476 17e8c70fb670 fix dirstate.change: it should walk ignored files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1471 diff changeset	613 continue
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	614 # check the common case first
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	615 if type_ == 'n':
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	616 if not st:
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	617 st = lstat(_join(fn))
6257 bfd49ce0db64 dirstate: ignore mode changes if the fs does not supports the exec bit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6212 diff changeset	618 if (size >= 0 and
bfd49ce0db64 dirstate: ignore mode changes if the fs does not supports the exec bit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6212 diff changeset	619 (size != st.st_size
bfd49ce0db64 dirstate: ignore mode changes if the fs does not supports the exec bit Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6212 diff changeset	620 or ((mode ^ st.st_mode) & 0100 and self._checkexec))
5210 90d9ec0dc69d merge: forcefully mark files that we get from the second parent as dirty Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5123 diff changeset	621 or size == -2
4677 de8ec7e1753a dirstate.status: if a file is marked as copied, consider it modified Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4657 diff changeset	622 or fn in self._copymap):
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	623 madd(fn)
2962 882e703eaa94 dirstate.py: when comparing mtimes, use only the integer part. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2953 diff changeset	624 elif time != int(st.st_mtime):
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	625 ladd(fn)
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2486 diff changeset	626 elif list_clean:
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	627 cadd(fn)
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	628 elif type_ == 'm':
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	629 madd(fn)
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	630 elif type_ == 'a':
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	631 aadd(fn)
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	632 elif type_ == 'r':
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	633 radd(fn)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	634
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2486 diff changeset	635 return (lookup, modified, added, removed, deleted, unknown, ignored,
5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2486 diff changeset	636 clean)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/dirstate.py @ 6326:af3f26b6bba4