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

annotate mercurial/dirstate.py @ 5909:f45f7390c1c5

strip: calculate list of extra nodes to save and pass it to changegroupsubset When we remove revision N from the repository, all revisions >= N are affected: either it's a descendant from N and will also be removed, or it's not a descendant of N and will be renumbered. As a consequence, we have to (at least temporarily) remove all filelog and manifest revisions that have a linkrev >= N, readding some of them later. Unfortunately, it's possible to have a revlog with two revisions r1 and r2 such that r1 < r2, but linkrev(r1) > linkrev(r2). If we try to strip revision linkrev(r1) from the repository, we'll also lose revision r2 when we truncate this revlog. We already use changegroupsubset to create a temporary changegroup containing the revisions that have to be restored, but that function is unable to detect that we also wanted to save the r2 in the case above. So we manually calculate these extra nodes and pass it to changegroupsubset. This should fix issue764.

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
date	Sat, 19 Jan 2008 18:01:16 -0200
parents	83c354c4d529
children	d0576d065993

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
1094 221b5252864c Adjust some imports mpm@selenic.com parents: 1093 1089 diff changeset	10 from node import *
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	11 from i18n import _
4609 b43f17691ae6 dirstate: move ignore to its own file Matt Mackall <mpm@selenic.com> parents: 4608 diff changeset	12 import struct, os, time, bisect, stat, strutil, util, re, errno, ignore
5396 5105b119edd2 Add osutil module, containing a listdir function. Bryan O'Sullivan <bos@serpentine.com> parents: 5327 diff changeset	13 import cStringIO, osutil
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
4603 0f6853c15606 dirstate: use getattr rather than lazyread Matt Mackall <mpm@selenic.com> parents: 4527 diff changeset	66 else:
0f6853c15606 dirstate: use getattr rather than lazyread Matt Mackall <mpm@selenic.com> parents: 4527 diff changeset	67 raise AttributeError, name
0f6853c15606 dirstate: use getattr rather than lazyread Matt Mackall <mpm@selenic.com> parents: 4527 diff changeset	68
4905 fc61495ea9cf dirstate: make wjoin function private Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	69 def _join(self, f):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	70 return os.path.join(self._root, f)
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	71
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	72 def getcwd(self):
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	73 cwd = os.getcwd()
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	74 if cwd == self._root: return ''
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	75 # 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	76 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	77 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	78 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	79 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	80 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	81 else:
c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	82 # 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	83 return cwd
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	84
4525 78b6add1f966 Add dirstate.pathto and localrepo.pathto. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4507 diff changeset	85 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	86 if cwd is None:
78b6add1f966 Add dirstate.pathto and localrepo.pathto. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4507 diff changeset	87 cwd = self.getcwd()
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	88 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	89 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	90 return util.normpath(path)
4527 b422b558015b Add ui.slash hgrc setting Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4525 diff changeset	91 return path
4525 78b6add1f966 Add dirstate.pathto and localrepo.pathto. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4507 diff changeset	92
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	93 def __getitem__(self, key):
4906 30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	94 ''' current states:
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	95 n normal
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	96 m needs merging
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	97 r marked for removal
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	98 a marked for addition
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	99 ? not tracked'''
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	100 return self._map.get(key, ("?",))[0]
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	101
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	102 def __contains__(self, key):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	103 return key in self._map
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	104
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	105 def __iter__(self):
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	106 a = self._map.keys()
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	107 a.sort()
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	108 for x in a:
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	109 yield x
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	110
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	111 def parents(self):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	112 return self._pl
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	113
4179 7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	114 def branch(self):
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	115 return self._branch
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	116
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1040 diff changeset	117 def setparents(self, p1, p2=nullid):
4965 4106dde15aed Merge with crew Matt Mackall <mpm@selenic.com> parents: 4911 4953 diff changeset	118 self._dirty = self._dirtypl = True
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	119 self._pl = p1, p2
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	120
4179 7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	121 def setbranch(self, branch):
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	122 self._branch = branch
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	123 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	124
4615 9b00b73a5286 dirstate: hide some more internals Matt Mackall <mpm@selenic.com> parents: 4614 diff changeset	125 def _read(self):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	126 self._map = {}
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	127 self._copymap = {}
4952 a11921d24ec4 add dirstate._dirtypl variable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4677 diff changeset	128 if not self._dirtypl:
a11921d24ec4 add dirstate._dirtypl variable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4677 diff changeset	129 self._pl = [nullid, nullid]
4607 49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	130 try:
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	131 st = self._opener("dirstate").read()
4607 49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	132 except IOError, err:
49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	133 if err.errno != errno.ENOENT: raise
49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	134 return
49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	135 if not st:
49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	136 return
49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	137
4952 a11921d24ec4 add dirstate._dirtypl variable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4677 diff changeset	138 if not self._dirtypl:
a11921d24ec4 add dirstate._dirtypl variable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4677 diff changeset	139 self._pl = [st[:20], st[20: 40]]
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	140
2427 150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	141 # deref fields so they will be local in loop
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	142 dmap = self._map
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	143 copymap = self._copymap
2427 150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	144 unpack = struct.unpack
4610 274c99fc629f dirstate: simplify state() Matt Mackall <mpm@selenic.com> parents: 4609 diff changeset	145 e_size = struct.calcsize(_format)
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	146 pos1 = 40
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	147 l = len(st)
2427 150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	148
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	149 # the inner loop
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	150 while pos1 < l:
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	151 pos2 = pos1 + e_size
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	152 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	153 pos1 = pos2 + e[4]
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	154 f = st[pos2:pos1]
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	155 if '\0' in f:
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	156 f, c = f.split('\0')
3154 b1f10d3223c1 dirstate: add copies function Matt Mackall <mpm@selenic.com> parents: 2962 diff changeset	157 copymap[f] = c
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	158 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	159
4613 3a645af7fb76 localrepo and dirstate: rename reload to invalidate Matt Mackall <mpm@selenic.com> parents: 4612 diff changeset	160 def invalidate(self):
4656 4eeb91870d3b dirstate: fix typo Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4635 diff changeset	161 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	162 if a in self.__dict__:
6b3ed43f77ba dirstate.invalidate: avoid rebuilding _map Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4952 diff changeset	163 delattr(self, a)
4903 81078e177266 dirstate: use True and false for _dirty Matt Mackall <mpm@selenic.com> parents: 4677 diff changeset	164 self._dirty = False
4375 109077e7048d When reloading the dirstate, recompute ignore information if needed. Bryan O'Sullivan <bos@serpentine.com> parents: 4374 diff changeset	165
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	166 def copy(self, source, dest):
4903 81078e177266 dirstate: use True and false for _dirty Matt Mackall <mpm@selenic.com> parents: 4677 diff changeset	167 self._dirty = True
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	168 self._copymap[dest] = source
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	169
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	170 def copied(self, file):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	171 return self._copymap.get(file, None)
3154 b1f10d3223c1 dirstate: add copies function Matt Mackall <mpm@selenic.com> parents: 2962 diff changeset	172
b1f10d3223c1 dirstate: add copies function Matt Mackall <mpm@selenic.com> parents: 2962 diff changeset	173 def copies(self):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	174 return self._copymap
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	175
4615 9b00b73a5286 dirstate: hide some more internals Matt Mackall <mpm@selenic.com> parents: 4614 diff changeset	176 def _incpath(self, path):
5326 319c09685f30 dirstate: make dir collision logic faster Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	177 c = path.rfind('/')
319c09685f30 dirstate: make dir collision logic faster Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	178 if c >= 0:
319c09685f30 dirstate: make dir collision logic faster Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	179 dirs = self._dirs
319c09685f30 dirstate: make dir collision logic faster Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	180 base = path[:c]
319c09685f30 dirstate: make dir collision logic faster Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	181 if base not in dirs:
319c09685f30 dirstate: make dir collision logic faster Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	182 self._incpath(base)
319c09685f30 dirstate: make dir collision logic faster Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	183 dirs[base] = 1
319c09685f30 dirstate: make dir collision logic faster Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	184 else:
319c09685f30 dirstate: make dir collision logic faster Matt Mackall <mpm@selenic.com> parents: 5210 diff changeset	185 dirs[base] += 1
4615 9b00b73a5286 dirstate: hide some more internals Matt Mackall <mpm@selenic.com> parents: 4614 diff changeset	186
9b00b73a5286 dirstate: hide some more internals Matt Mackall <mpm@selenic.com> parents: 4614 diff changeset	187 def _decpath(self, path):
5516 f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	188 c = path.rfind('/')
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	189 if c >= 0:
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	190 base = path[:c]
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	191 dirs = self._dirs
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	192 if dirs[base] == 1:
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	193 del dirs[base]
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	194 self._decpath(base)
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	195 else:
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	196 dirs[base] -= 1
2953 3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	197
4616 70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	198 def _incpathcheck(self, f):
70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	199 if '\r' in f or '\n' in f:
70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	200 raise util.Abort(_("'\\n' and '\\r' disallowed in filenames"))
70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	201 # shadows
70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	202 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	203 raise util.Abort(_('directory %r already in dirstate') % f)
4616 70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	204 for c in strutil.rfindall(f, '/'):
70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	205 d = f[:c]
70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	206 if d in self._dirs:
70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	207 break
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	208 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	209 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	210 (d, f))
4616 70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	211 self._incpath(f)
2953 3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	212
5516 f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	213 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	214 # 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	215 oldstate = self[f]
7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	216 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	217 if "_dirs" in self.__dict__:
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	218 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	219 return
7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	220 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	221 if relaxed and oldstate == '?':
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	222 # XXX
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	223 # 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	224 # 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	225 # dir-to-file revisions
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	226 if "_dirs" in self.__dict__:
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	227 self._incpath(f)
f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	228 return
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	229 self._incpathcheck(f)
7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	230 return
7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	231
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	232 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	233 'mark a file normal and clean'
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	234 self._dirty = True
5516 f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	235 self._changepath(f, 'n', True)
4905 fc61495ea9cf dirstate: make wjoin function private Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	236 s = os.lstat(self._join(f))
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	237 self._map[f] = ('n', 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	238 if self._copymap.has_key(f):
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	239 del self._copymap[f]
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	240
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	241 def normallookup(self, f):
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	242 'mark a file normal, but possibly dirty'
4903 81078e177266 dirstate: use True and false for _dirty Matt Mackall <mpm@selenic.com> parents: 4677 diff changeset	243 self._dirty = True
5516 f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	244 self._changepath(f, 'n', True)
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	245 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	246 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	247 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	248
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	249 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	250 '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	251 self._dirty = True
5516 f252ba975925 Fix dir-changed-to-file updates on clean workdir. Maxim Dounin <mdounin@mdounin.ru> parents: 5487 diff changeset	252 self._changepath(f, 'n', True)
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	253 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	254 if f in self._copymap:
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	255 del self._copymap[f]
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	256
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	257 def add(self, f):
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	258 'mark a file added'
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	259 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	260 self._changepath(f, 'a')
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	261 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	262 if f in self._copymap:
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	263 del self._copymap[f]
4616 70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	264
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	265 def remove(self, f):
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	266 'mark a file removed'
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	267 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	268 self._changepath(f, 'r')
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	269 self._map[f] = ('r', 0, 0, 0, 0)
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	270 if f in self._copymap:
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	271 del self._copymap[f]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	272
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	273 def merge(self, f):
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	274 'mark a file merged'
4903 81078e177266 dirstate: use True and false for _dirty Matt Mackall <mpm@selenic.com> parents: 4677 diff changeset	275 self._dirty = True
4905 fc61495ea9cf dirstate: make wjoin function private Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	276 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	277 self._changepath(f, 'm', True)
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	278 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	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 forget(self, f):
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	283 'forget a file'
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	284 self._dirty = True
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	285 try:
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	286 self._changepath(f, '?')
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	287 del self._map[f]
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	288 except KeyError:
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	289 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	290
5065 b304c2496f52 dirstate: fix rebuild; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4953 diff changeset	291 def clear(self):
b304c2496f52 dirstate: fix rebuild; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4953 diff changeset	292 self._map = {}
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	293 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	294 delattr(self, "_dirs");
5065 b304c2496f52 dirstate: fix rebuild; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4953 diff changeset	295 self._copymap = {}
b304c2496f52 dirstate: fix rebuild; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4953 diff changeset	296 self._pl = [nullid, nullid]
5123 79373ec3f27d merge with crew-stable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5045 5065 diff changeset	297 self._dirty = True
5065 b304c2496f52 dirstate: fix rebuild; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4953 diff changeset	298
1755 a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	299 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	300 self.clear()
2832 e196aa1df169 Start using manifestflags methods Matt Mackall <mpm@selenic.com> parents: 2486 diff changeset	301 for f in files:
e196aa1df169 Start using manifestflags methods Matt Mackall <mpm@selenic.com> parents: 2486 diff changeset	302 if files.execf(f):
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	303 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	304 else:
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	305 self._map[f] = ('n', 0666, -1, 0, 0)
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	306 self._pl = (parent, nullid)
4903 81078e177266 dirstate: use True and false for _dirty Matt Mackall <mpm@selenic.com> parents: 4677 diff changeset	307 self._dirty = True
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	308
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	309 def write(self):
4612 17ee7407097f dirstate: simplify dirty handling Matt Mackall <mpm@selenic.com> parents: 4611 diff changeset	310 if not self._dirty:
1794 98b6c1cad58b only write the dirstate when something changed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1755 diff changeset	311 return
4374 9edc2d6f7c10 dirstate: speed up write by 50%. Bryan O'Sullivan <bos@serpentine.com> parents: 4373 diff changeset	312 cs = cStringIO.StringIO()
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	313 copymap = self._copymap
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	314 pack = struct.pack
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	315 write = cs.write
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	316 write("".join(self._pl))
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	317 for f, e in self._map.iteritems():
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	318 if f in copymap:
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	319 f = "%s\0%s" % (f, copymap[f])
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	320 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	321 write(e)
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	322 write(f)
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	323 st = self._opener("dirstate", "w", atomictemp=True)
4374 9edc2d6f7c10 dirstate: speed up write by 50%. Bryan O'Sullivan <bos@serpentine.com> parents: 4373 diff changeset	324 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	325 st.rename()
4965 4106dde15aed Merge with crew Matt Mackall <mpm@selenic.com> parents: 4911 4953 diff changeset	326 self._dirty = self._dirtypl = False
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	327
4907 6a7659a0c07c dirstate: make filterfiles private Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	328 def _filter(self, files):
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	329 ret = {}
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	330 unknown = []
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	331
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	332 for x in files:
1541 bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1529 diff changeset	333 if x == '.':
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	334 return self._map.copy()
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	335 if x not in self._map:
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	336 unknown.append(x)
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	337 else:
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	338 ret[x] = self._map[x]
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	339
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	340 if not unknown:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	341 return ret
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	342
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	343 b = self._map.keys()
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	344 b.sort()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	345 blen = len(b)
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	346
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	347 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	348 bs = bisect.bisect(b, "%s%s" % (x, '/'))
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	349 while bs < blen:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	350 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	351 if len(s) > len(x) and s.startswith(x):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	352 ret[s] = self._map[s]
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	353 else:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	354 break
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	355 bs += 1
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	356 return ret
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	357
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	358 def _supported(self, f, mode, verbose=False):
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	359 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	360 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	361 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	362 kind = 'unknown'
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	363 if stat.S_ISCHR(mode): kind = _('character device')
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	364 elif stat.S_ISBLK(mode): kind = _('block device')
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	365 elif stat.S_ISFIFO(mode): kind = _('fifo')
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	366 elif stat.S_ISSOCK(mode): kind = _('socket')
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	367 elif stat.S_ISDIR(mode): kind = _('directory')
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	368 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	369 % (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	370 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	371
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	372 def walk(self, files=None, match=util.always, badmatch=None):
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	373 # filter out the stat
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	374 for src, f, st in self.statwalk(files, match, badmatch=badmatch):
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	375 yield src, f
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	376
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	377 def statwalk(self, files=None, match=util.always, ignored=False,
4146 e287d61dd268 Yield directories in dirstate.statwalk() Emanuele Aina <faina.mail@tiscali.it> parents: 4081 diff changeset	378 badmatch=None, directories=False):
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	379 '''
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	380 walk recursively through the directory tree, finding all files
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	381 matched by the match function
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	382
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	383 results are yielded in a tuple (src, filename, st), where src
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	384 is one of:
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	385 '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	386 'd' the file is a directory of the tree
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	387 '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	388 'b' file was not found and matched badmatch
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3529 diff changeset	389
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	390 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	391 '''
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	392
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	393 # walk all files by default
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	394 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	395 files = ['.']
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	396 dc = self._map.copy()
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	397 else:
3536 ece5c53577eb small refactoring of path normalization in dirstate.statwalk Matt Mackall <mpm@selenic.com> parents: 3534 diff changeset	398 files = util.unique(files)
4907 6a7659a0c07c dirstate: make filterfiles private Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	399 dc = self._filter(files)
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	400
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	401 def imatch(file_):
4609 b43f17691ae6 dirstate: move ignore to its own file Matt Mackall <mpm@selenic.com> parents: 4608 diff changeset	402 if file_ not in dc and self._ignore(file_):
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	403 return False
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	404 return match(file_)
1224 cc61d366bc3b Fix Windows status problem from new dirstate walk code mpm@selenic.com parents: 1183 diff changeset	405
4609 b43f17691ae6 dirstate: move ignore to its own file Matt Mackall <mpm@selenic.com> parents: 4608 diff changeset	406 ignore = self._ignore
4193 dd0d9bd91e0a dirstate.statwalk: explicitly test for ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4172 diff changeset	407 if ignored:
dd0d9bd91e0a dirstate.statwalk: explicitly test for ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4172 diff changeset	408 imatch = match
dd0d9bd91e0a dirstate.statwalk: explicitly test for ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4172 diff changeset	409 ignore = util.never
3534 549cb7b640fb Simplify ignore logic in dirstate.walk Matt Mackall <mpm@selenic.com> parents: 3532 diff changeset	410
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	411 # 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	412 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	413 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	414 common_prefix_len += 1
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	415
46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	416 normpath = util.normpath
5396 5105b119edd2 Add osutil module, containing a listdir function. Bryan O'Sullivan <bos@serpentine.com> parents: 5327 diff changeset	417 listdir = osutil.listdir
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	418 lstat = os.lstat
46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	419 bisect_left = bisect.bisect_left
46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	420 isdir = os.path.isdir
46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	421 pconvert = util.pconvert
46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	422 join = os.path.join
46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	423 s_isdir = stat.S_ISDIR
46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	424 supported = self._supported
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	425 _join = self._join
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	426 known = {'.hg': 1}
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	427
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	428 # recursion free walker, faster than os.walk.
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	429 def findfiles(s):
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	430 work = [s]
5002 4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	431 wadd = work.append
4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	432 found = []
4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	433 add = found.append
4146 e287d61dd268 Yield directories in dirstate.statwalk() Emanuele Aina <faina.mail@tiscali.it> parents: 4081 diff changeset	434 if directories:
5002 4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	435 add((normpath(s[common_prefix_len:]), 'd', lstat(s)))
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	436 while work:
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	437 top = work.pop()
5396 5105b119edd2 Add osutil module, containing a listdir function. Bryan O'Sullivan <bos@serpentine.com> parents: 5327 diff changeset	438 entries = listdir(top, stat=True)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	439 # 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	440 nd = normpath(top[common_prefix_len:])
2061 5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	441 if nd == '.':
5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	442 nd = ''
5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	443 else:
2063 f1fda71e134e benoit asked for comment to make avoid of recursive repo clearer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2062 diff changeset	444 # 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	445 # 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	446 # is good on big directory.
5396 5105b119edd2 Add osutil module, containing a listdir function. Bryan O'Sullivan <bos@serpentine.com> parents: 5327 diff changeset	447 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	448 hg = bisect_left(names, '.hg')
2061 5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	449 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	450 if isdir(join(top, '.hg')):
2061 5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	451 continue
5396 5105b119edd2 Add osutil module, containing a listdir function. Bryan O'Sullivan <bos@serpentine.com> parents: 5327 diff changeset	452 for f, kind, st in entries:
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	453 np = pconvert(join(nd, f))
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	454 if np in known:
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	455 continue
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	456 known[np] = 1
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	457 p = join(top, f)
1228 db950da49539 Fix dangling symlink bug in dirstate walk code mpm@selenic.com parents: 1224 diff changeset	458 # don't trip over symlinks
5396 5105b119edd2 Add osutil module, containing a listdir function. Bryan O'Sullivan <bos@serpentine.com> parents: 5327 diff changeset	459 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	460 if not ignore(np):
5002 4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	461 wadd(p)
4146 e287d61dd268 Yield directories in dirstate.statwalk() Emanuele Aina <faina.mail@tiscali.it> parents: 4081 diff changeset	462 if directories:
5002 4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	463 add((np, 'd', st))
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	464 if np in dc and match(np):
5002 4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	465 add((np, 'm', st))
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	466 elif imatch(np):
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	467 if supported(np, st.st_mode):
5002 4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	468 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	469 elif np in dc:
5002 4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	470 add((np, 'm', st))
4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	471 found.sort()
4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	472 return found
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	473
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	474 # step one, find all files that match our criteria
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	475 files.sort()
3536 ece5c53577eb small refactoring of path normalization in dirstate.statwalk Matt Mackall <mpm@selenic.com> parents: 3534 diff changeset	476 for ff in files:
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	477 nf = normpath(ff)
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	478 f = _join(ff)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	479 try:
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	480 st = lstat(f)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	481 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	482 found = False
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	483 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	484 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	485 found = True
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	486 break
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	487 if not found:
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	488 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	489 self._ui.warn('%s: %s\n' %
ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4620 diff changeset	490 (self.pathto(ff), inst.strerror))
3534 549cb7b640fb Simplify ignore logic in dirstate.walk Matt Mackall <mpm@selenic.com> parents: 3532 diff changeset	491 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	492 yield 'b', ff, None
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	493 continue
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	494 if s_isdir(st.st_mode):
5002 4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	495 for f, src, st in findfiles(f):
4d079df2871a dirstate: speed up sorting in findfiles Matt Mackall <mpm@selenic.com> parents: 5001 diff changeset	496 yield src, f, st
1392 32d8068b3e36 add a check for filetype when walking Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1276 diff changeset	497 else:
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	498 if nf in known:
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	499 continue
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	500 known[nf] = 1
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	501 if match(nf):
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	502 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	503 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	504 elif ff in dc:
3536 ece5c53577eb small refactoring of path normalization in dirstate.statwalk Matt Mackall <mpm@selenic.com> parents: 3534 diff changeset	505 yield 'm', nf, st
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	506
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	507 # step two run through anything left in the dc hash and yield
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	508 # if we haven't already seen it
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	509 ks = dc.keys()
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	510 ks.sort()
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	511 for k in ks:
5001 62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	512 if k in known:
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	513 continue
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	514 known[k] = 1
62e3fd2baca4 revlog: pass mode to _supported directly Matt Mackall <mpm@selenic.com> parents: 5000 diff changeset	515 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	516 yield 'm', k, None
669 8aa2a282eda4 .hgignore speedups patch incorporating Matt's feedback. mwilli2@localhost.localdomain parents: 667 diff changeset	517
4908 8c294ee7047e dirstate: get rid of default args for status Matt Mackall <mpm@selenic.com> parents: 4907 diff changeset	518 def status(self, files, match, list_ignored, list_clean):
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2008 diff changeset	519 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	520 removed, deleted, clean = [], [], []
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	521
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	522 _join = self._join
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	523 lstat = os.lstat
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	524 cmap = self._copymap
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	525 dmap = self._map
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	526 ladd = lookup.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	527 madd = modified.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	528 aadd = added.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	529 uadd = unknown.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	530 iadd = ignored.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	531 radd = removed.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	532 dadd = deleted.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	533 cadd = clean.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	534
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2486 diff changeset	535 for src, fn, st in self.statwalk(files, match, ignored=list_ignored):
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	536 if fn in dmap:
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	537 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	538 else:
4609 b43f17691ae6 dirstate: move ignore to its own file Matt Mackall <mpm@selenic.com> parents: 4608 diff changeset	539 if list_ignored and self._ignore(fn):
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	540 iadd(fn)
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2008 diff changeset	541 else:
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	542 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	543 continue
1476 17e8c70fb670 fix dirstate.change: it should walk ignored files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1471 diff changeset	544 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	545 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	546 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	547 try:
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	548 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	549 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	550 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	551 raise
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	552 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	553 # 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	554 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	555 nonexistent = False
1476 17e8c70fb670 fix dirstate.change: it should walk ignored files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1471 diff changeset	556 # 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	557 # who are not removed in the dirstate ?
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	558 if nonexistent and type_ in "nm":
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	559 dadd(fn)
1476 17e8c70fb670 fix dirstate.change: it should walk ignored files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1471 diff changeset	560 continue
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	561 # 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	562 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	563 if not st:
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	564 st = lstat(_join(fn))
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	565 if (size >= 0 and (size != st.st_size
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	566 or (mode ^ st.st_mode) & 0100)
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	567 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	568 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	569 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	570 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	571 ladd(fn)
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2486 diff changeset	572 elif list_clean:
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	573 cadd(fn)
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	574 elif type_ == 'm':
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	575 madd(fn)
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	576 elif type_ == 'a':
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	577 aadd(fn)
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	578 elif type_ == 'r':
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	579 radd(fn)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	580
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2486 diff changeset	581 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	582 clean)

Mercurial > public > mercurial-scm > hg

annotate mercurial/dirstate.py @ 5909:f45f7390c1c5