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

annotate mercurial/dirstate.py @ 8312:b87a50b7125c

separate import lines from mercurial and general python modules

author	Simon Heimberg <simohe@besonet.ch>
date	Tue, 28 Apr 2009 17:40:46 +0200
parents	8417d82d3969
children	9fe16b1a1786

rev	line source
8226 8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	1 # dirstate.py - working directory tracking for mercurial
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	2 #
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	4 #
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	5 # This software may be used and distributed according to the terms of the
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	6 # GNU General Public License version 2, incorporated herein by reference.
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	7
6211 f89fd07fc51d Expand import * to allow Pyflakes to find problems Joel Rosdahl <joel@rosdahl.net> parents: 6201 diff changeset	8 from node import nullid
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	9 from i18n import _
8312 b87a50b7125c separate import lines from mercurial and general python modules Simon Heimberg <simohe@besonet.ch> parents: 8310 diff changeset	10 import util, ignore, osutil, parsers
b87a50b7125c separate import lines from mercurial and general python modules Simon Heimberg <simohe@besonet.ch> parents: 8310 diff changeset	11 import struct, os, stat, errno
b87a50b7125c separate import lines from mercurial and general python modules Simon Heimberg <simohe@besonet.ch> parents: 8310 diff changeset	12 import cStringIO, sys
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	13
4610 274c99fc629f dirstate: simplify state() Matt Mackall <mpm@selenic.com> parents: 4609 diff changeset	14 _unknown = ('?', 0, 0, 0)
274c99fc629f dirstate: simplify state() Matt Mackall <mpm@selenic.com> parents: 4609 diff changeset	15 _format = ">cllll"
8261 0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	16 propertycache = util.propertycache
4610 274c99fc629f dirstate: simplify state() Matt Mackall <mpm@selenic.com> parents: 4609 diff changeset	17
6767 80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	18 def _finddirs(path):
7032 7dfac37cfabf dirstate: improve performance for building _dirs Matt Mackall <mpm@selenic.com> parents: 7023 diff changeset	19 pos = path.rfind('/')
7dfac37cfabf dirstate: improve performance for building _dirs Matt Mackall <mpm@selenic.com> parents: 7023 diff changeset	20 while pos != -1:
7dfac37cfabf dirstate: improve performance for building _dirs Matt Mackall <mpm@selenic.com> parents: 7023 diff changeset	21 yield path[:pos]
6767 80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	22 pos = path.rfind('/', 0, pos)
80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	23
7096 6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7093 diff changeset	24 def _incdirs(dirs, path):
6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7093 diff changeset	25 for base in _finddirs(path):
6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7093 diff changeset	26 if base in dirs:
6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7093 diff changeset	27 dirs[base] += 1
6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7093 diff changeset	28 return
6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7093 diff changeset	29 dirs[base] = 1
6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7093 diff changeset	30
6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7093 diff changeset	31 def _decdirs(dirs, path):
6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7093 diff changeset	32 for base in _finddirs(path):
6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7093 diff changeset	33 if dirs[base] > 1:
6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7093 diff changeset	34 dirs[base] -= 1
6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7093 diff changeset	35 return
6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7093 diff changeset	36 del dirs[base]
6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7093 diff changeset	37
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1541 diff changeset	38 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	39
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	40 def __init__(self, opener, ui, root):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	41 self._opener = opener
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	42 self._root = root
6972 63d1d3e489f8 performance: normalize self._root, avoid calling os.path.join() in dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6971 diff changeset	43 self._rootdir = os.path.join(root, '')
4903 81078e177266 dirstate: use True and false for _dirty Matt Mackall <mpm@selenic.com> parents: 4677 diff changeset	44 self._dirty = False
4965 4106dde15aed Merge with crew Matt Mackall <mpm@selenic.com> parents: 4911 4953 diff changeset	45 self._dirtypl = False
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	46 self._ui = ui
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	47
8261 0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	48 @propertycache
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	49 def _map(self):
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	50 self._read()
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	51 return self._map
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	52
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	53 @propertycache
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	54 def _copymap(self):
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	55 self._read()
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	56 return self._copymap
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	57
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	58 @propertycache
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	59 def _foldmap(self):
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	60 f = {}
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	61 for name in self._map:
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	62 f[os.path.normcase(name)] = name
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	63 return f
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	64
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	65 @propertycache
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	66 def _branch(self):
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	67 try:
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	68 return self._opener("branch").read().strip() or "default"
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	69 except IOError:
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	70 return "default"
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	71
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	72 @propertycache
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	73 def _pl(self):
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	74 try:
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	75 st = self._opener("dirstate").read(40)
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	76 if len(st) == 40:
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	77 return st[:20], st[20:40]
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	78 except IOError, err:
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	79 if err.errno != errno.ENOENT: raise
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	80 return [nullid, nullid]
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	81
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	82 @propertycache
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	83 def _dirs(self):
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	84 dirs = {}
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	85 for f,s in self._map.iteritems():
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	86 if s[0] != 'r':
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	87 _incdirs(dirs, f)
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	88 return dirs
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	89
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	90 @propertycache
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	91 def _ignore(self):
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	92 files = [self._join('.hgignore')]
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	93 for name, path in self._ui.configitems("ui"):
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	94 if name == 'ignore' or name.startswith('ignore.'):
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	95 files.append(os.path.expanduser(path))
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	96 return ignore.ignore(self._root, files, self._ui.warn)
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	97
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	98 @propertycache
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	99 def _slash(self):
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	100 return self._ui.configbool('ui', 'slash') and os.sep != '/'
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	101
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	102 @propertycache
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	103 def _checklink(self):
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	104 return util.checklink(self._root)
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	105
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	106 @propertycache
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	107 def _checkexec(self):
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	108 return util.checkexec(self._root)
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	109
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	110 @propertycache
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	111 def _checkcase(self):
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	112 return not util.checkcase(self._join('.hg'))
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	113
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	114 @propertycache
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	115 def normalize(self):
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	116 if self._checkcase:
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	117 return self._normalize
0fe1f57ac2bd dirstate: use propertycache Matt Mackall <mpm@selenic.com> parents: 8226 diff changeset	118 return lambda x, y=False: x
4603 0f6853c15606 dirstate: use getattr rather than lazyread Matt Mackall <mpm@selenic.com> parents: 4527 diff changeset	119
4905 fc61495ea9cf dirstate: make wjoin function private Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	120 def _join(self, f):
6972 63d1d3e489f8 performance: normalize self._root, avoid calling os.path.join() in dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6971 diff changeset	121 # much faster than os.path.join()
6973 8c136043867b dirstate: explain why appending instead of os.path.join() is safe Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6972 diff changeset	122 # it's safe because f is always a relative path
6972 63d1d3e489f8 performance: normalize self._root, avoid calling os.path.join() in dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6971 diff changeset	123 return self._rootdir + f
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	124
6743 86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	125 def flagfunc(self, fallback):
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	126 if self._checklink:
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	127 if self._checkexec:
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	128 def f(x):
6972 63d1d3e489f8 performance: normalize self._root, avoid calling os.path.join() in dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6971 diff changeset	129 p = self._join(x)
6743 86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	130 if os.path.islink(p):
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	131 return 'l'
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	132 if util.is_exec(p):
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	133 return 'x'
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	134 return ''
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	135 return f
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	136 def f(x):
6972 63d1d3e489f8 performance: normalize self._root, avoid calling os.path.join() in dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6971 diff changeset	137 if os.path.islink(self._join(x)):
6743 86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	138 return 'l'
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	139 if 'x' in fallback(x):
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	140 return 'x'
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	141 return ''
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	142 return f
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	143 if self._checkexec:
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	144 def f(x):
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	145 if 'l' in fallback(x):
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	146 return 'l'
6972 63d1d3e489f8 performance: normalize self._root, avoid calling os.path.join() in dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6971 diff changeset	147 if util.is_exec(self._join(x)):
6743 86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	148 return 'x'
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	149 return ''
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	150 return f
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	151 return fallback
86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6685 diff changeset	152
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	153 def getcwd(self):
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	154 cwd = os.getcwd()
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	155 if cwd == self._root: return ''
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	156 # 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	157 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	158 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	159 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	160 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	161 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	162 else:
c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	163 # 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	164 return cwd
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	165
4525 78b6add1f966 Add dirstate.pathto and localrepo.pathto. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4507 diff changeset	166 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	167 if cwd is None:
78b6add1f966 Add dirstate.pathto and localrepo.pathto. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4507 diff changeset	168 cwd = self.getcwd()
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	169 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	170 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	171 return util.normpath(path)
4527 b422b558015b Add ui.slash hgrc setting Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4525 diff changeset	172 return path
4525 78b6add1f966 Add dirstate.pathto and localrepo.pathto. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4507 diff changeset	173
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	174 def __getitem__(self, key):
4906 30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	175 ''' current states:
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	176 n normal
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	177 m needs merging
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	178 r marked for removal
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	179 a marked for addition
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	180 ? not tracked'''
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4905 diff changeset	181 return self._map.get(key, ("?",))[0]
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	182
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	183 def __contains__(self, key):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	184 return key in self._map
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	185
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	186 def __iter__(self):
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8151 diff changeset	187 for x in sorted(self._map):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	188 yield x
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	189
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	190 def parents(self):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	191 return self._pl
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	192
4179 7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	193 def branch(self):
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	194 return self._branch
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	195
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1040 diff changeset	196 def setparents(self, p1, p2=nullid):
4965 4106dde15aed Merge with crew Matt Mackall <mpm@selenic.com> parents: 4911 4953 diff changeset	197 self._dirty = self._dirtypl = True
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	198 self._pl = p1, p2
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	199
4179 7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	200 def setbranch(self, branch):
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	201 self._branch = branch
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	202 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	203
4615 9b00b73a5286 dirstate: hide some more internals Matt Mackall <mpm@selenic.com> parents: 4614 diff changeset	204 def _read(self):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	205 self._map = {}
a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	206 self._copymap = {}
4607 49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	207 try:
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	208 st = self._opener("dirstate").read()
4607 49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	209 except IOError, err:
49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	210 if err.errno != errno.ENOENT: raise
49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	211 return
49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	212 if not st:
49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	213 return
49dcac6ede26 dirstate: fold parse into read Matt Mackall <mpm@selenic.com> parents: 4606 diff changeset	214
7128 2b8a2248312a get rid of semi-colon introduced in 16bafcebd3d1 Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7119 diff changeset	215 p = parsers.parse_dirstate(self._map, self._copymap, st)
4952 a11921d24ec4 add dirstate._dirtypl variable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4677 diff changeset	216 if not self._dirtypl:
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7069 diff changeset	217 self._pl = p
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	218
4613 3a645af7fb76 localrepo and dirstate: rename reload to invalidate Matt Mackall <mpm@selenic.com> parents: 4612 diff changeset	219 def invalidate(self):
6677 9865e15febd0 Add a normalize() method to dirstate Paul Moore <p.f.moore@gmail.com> parents: 6675 diff changeset	220 for a in "_map _copymap _foldmap _branch _pl _dirs _ignore".split():
4953 6b3ed43f77ba dirstate.invalidate: avoid rebuilding _map Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4952 diff changeset	221 if a in self.__dict__:
6b3ed43f77ba dirstate.invalidate: avoid rebuilding _map Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4952 diff changeset	222 delattr(self, a)
4903 81078e177266 dirstate: use True and false for _dirty Matt Mackall <mpm@selenic.com> parents: 4677 diff changeset	223 self._dirty = False
4375 109077e7048d When reloading the dirstate, recompute ignore information if needed. Bryan O'Sullivan <bos@serpentine.com> parents: 4374 diff changeset	224
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	225 def copy(self, source, dest):
7566 5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7280 diff changeset	226 """Mark dest as a copy of source. Unmark dest if source is None.
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7280 diff changeset	227 """
6680 deda205a00e1 Ignore dummy copies in dirstate and localrepo.filecommit() Patrick Mezard <pmezard@gmail.com> parents: 6479 diff changeset	228 if source == dest:
deda205a00e1 Ignore dummy copies in dirstate and localrepo.filecommit() Patrick Mezard <pmezard@gmail.com> parents: 6479 diff changeset	229 return
4903 81078e177266 dirstate: use True and false for _dirty Matt Mackall <mpm@selenic.com> parents: 4677 diff changeset	230 self._dirty = True
7566 5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7280 diff changeset	231 if source is not None:
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7280 diff changeset	232 self._copymap[dest] = source
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7280 diff changeset	233 elif dest in self._copymap:
5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7280 diff changeset	234 del self._copymap[dest]
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	235
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	236 def copied(self, file):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	237 return self._copymap.get(file, None)
3154 b1f10d3223c1 dirstate: add copies function Matt Mackall <mpm@selenic.com> parents: 2962 diff changeset	238
b1f10d3223c1 dirstate: add copies function Matt Mackall <mpm@selenic.com> parents: 2962 diff changeset	239 def copies(self):
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	240 return self._copymap
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	241
6767 80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	242 def _droppath(self, f):
80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	243 if self[f] not in "?r" and "_dirs" in self.__dict__:
7096 6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7093 diff changeset	244 _decdirs(self._dirs, f)
2953 3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	245
6767 80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	246 def _addpath(self, f, check=False):
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	247 oldstate = self[f]
6767 80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	248 if check or oldstate == "r":
80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	249 if '\r' in f or '\n' in f:
80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	250 raise util.Abort(
80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	251 _("'\\n' and '\\r' disallowed in filenames: %r") % f)
80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	252 if f in self._dirs:
80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	253 raise util.Abort(_('directory %r already in dirstate') % f)
80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	254 # shadows
80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	255 for d in _finddirs(f):
80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	256 if d in self._dirs:
80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	257 break
80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	258 if d in self._map and self[d] != 'r':
80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	259 raise util.Abort(
80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	260 _('file %r in dirstate clashes with %r') % (d, f))
80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	261 if oldstate in "?r" and "_dirs" in self.__dict__:
7096 6dab29f6df37 dirstate._dirs: fix refcounting broken by 7dfac37cfabf Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7093 diff changeset	262 _incdirs(self._dirs, f)
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	263
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	264 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	265 'mark a file normal and clean'
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	266 self._dirty = True
6767 80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	267 self._addpath(f)
4905 fc61495ea9cf dirstate: make wjoin function private Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	268 s = os.lstat(self._join(f))
7119 50f4e866d693 dirstate: always add times to map as integers Matt Mackall <mpm@selenic.com> parents: 7118 diff changeset	269 self._map[f] = ('n', s.st_mode, s.st_size, int(s.st_mtime))
5915 d0576d065993 Prefer i in d over d.has_key(i) Christian Ebert <blacktrash@gmx.net> parents: 5843 diff changeset	270 if f in self._copymap:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	271 del self._copymap[f]
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	272
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	273 def normallookup(self, f):
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	274 '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	275 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	276 # 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	277 # 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	278 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	279 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	280 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	281 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	282 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	283 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	284 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	285 if source:
53cbb33e1269 normallookup: during merges, restore the state saved by remove Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6297 diff changeset	286 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	287 return
53cbb33e1269 normallookup: during merges, restore the state saved by remove Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6297 diff changeset	288 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	289 return
4903 81078e177266 dirstate: use True and false for _dirty Matt Mackall <mpm@selenic.com> parents: 4677 diff changeset	290 self._dirty = True
6767 80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	291 self._addpath(f)
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7069 diff changeset	292 self._map[f] = ('n', 0, -1, -1)
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	293 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	294 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	295
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	296 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	297 '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	298 self._dirty = True
6767 80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	299 self._addpath(f)
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7069 diff changeset	300 self._map[f] = ('n', 0, -2, -1)
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	301 if f in self._copymap:
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	302 del self._copymap[f]
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	303
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	304 def add(self, f):
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	305 'mark a file added'
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	306 self._dirty = True
6767 80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	307 self._addpath(f, True)
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7069 diff changeset	308 self._map[f] = ('a', 0, -1, -1)
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	309 if f in self._copymap:
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	310 del self._copymap[f]
4616 70352337934e dirstate: refactor checkinterfering Matt Mackall <mpm@selenic.com> parents: 4615 diff changeset	311
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	312 def remove(self, f):
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	313 'mark a file removed'
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	314 self._dirty = True
6767 80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	315 self._droppath(f)
6297 fed1a9c22076 dirstate.remove: during merges, remember the previous file state Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6257 diff changeset	316 size = 0
fed1a9c22076 dirstate.remove: during merges, remember the previous file state Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6257 diff changeset	317 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	318 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	319 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	320 size = -1
fed1a9c22076 dirstate.remove: during merges, remember the previous file state Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6257 diff changeset	321 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	322 size = -2
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7069 diff changeset	323 self._map[f] = ('r', 0, size, 0)
6297 fed1a9c22076 dirstate.remove: during merges, remember the previous file state Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6257 diff changeset	324 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	325 del self._copymap[f]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	326
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	327 def merge(self, f):
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	328 'mark a file merged'
4903 81078e177266 dirstate: use True and false for _dirty Matt Mackall <mpm@selenic.com> parents: 4677 diff changeset	329 self._dirty = True
4905 fc61495ea9cf dirstate: make wjoin function private Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	330 s = os.lstat(self._join(f))
6767 80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	331 self._addpath(f)
7119 50f4e866d693 dirstate: always add times to map as integers Matt Mackall <mpm@selenic.com> parents: 7118 diff changeset	332 self._map[f] = ('m', s.st_mode, s.st_size, int(s.st_mtime))
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	333 if f in self._copymap:
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	334 del self._copymap[f]
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	335
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	336 def forget(self, f):
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	337 'forget a file'
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	338 self._dirty = True
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	339 try:
6807 6d68edc3217f dirstate: fix _droppath() typo from 80605a8127e0 Patrick Mezard <pmezard@gmail.com> parents: 6767 diff changeset	340 self._droppath(f)
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	341 del self._map[f]
6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4903 diff changeset	342 except KeyError:
6057 218d5b9aa466 Remove trailing ! from two error messages as this was confusing. Thomas Arendsen Hein <thomas@intevation.de> parents: 6048 diff changeset	343 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	344
7068 57377fa7eda2 issue 1286: dirstat regression on case folding systems Petr Kodl <petrkodl@gmail.com> parents: 7034 diff changeset	345 def _normalize(self, path, knownpath=False):
7069 852f39691a0a Eliminate normpath from foldmap calls. Petr Kodl <petrkodl@gmail.com> parents: 7068 diff changeset	346 norm_path = os.path.normcase(path)
7068 57377fa7eda2 issue 1286: dirstat regression on case folding systems Petr Kodl <petrkodl@gmail.com> parents: 7034 diff changeset	347 fold_path = self._foldmap.get(norm_path, None)
57377fa7eda2 issue 1286: dirstat regression on case folding systems Petr Kodl <petrkodl@gmail.com> parents: 7034 diff changeset	348 if fold_path is None:
57377fa7eda2 issue 1286: dirstat regression on case folding systems Petr Kodl <petrkodl@gmail.com> parents: 7034 diff changeset	349 if knownpath or not os.path.exists(os.path.join(self._root, path)):
57377fa7eda2 issue 1286: dirstat regression on case folding systems Petr Kodl <petrkodl@gmail.com> parents: 7034 diff changeset	350 fold_path = path
57377fa7eda2 issue 1286: dirstat regression on case folding systems Petr Kodl <petrkodl@gmail.com> parents: 7034 diff changeset	351 else:
57377fa7eda2 issue 1286: dirstat regression on case folding systems Petr Kodl <petrkodl@gmail.com> parents: 7034 diff changeset	352 fold_path = self._foldmap.setdefault(norm_path,
57377fa7eda2 issue 1286: dirstat regression on case folding systems Petr Kodl <petrkodl@gmail.com> parents: 7034 diff changeset	353 util.fspath(path, self._root))
57377fa7eda2 issue 1286: dirstat regression on case folding systems Petr Kodl <petrkodl@gmail.com> parents: 7034 diff changeset	354 return fold_path
6677 9865e15febd0 Add a normalize() method to dirstate Paul Moore <p.f.moore@gmail.com> parents: 6675 diff changeset	355
5065 b304c2496f52 dirstate: fix rebuild; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4953 diff changeset	356 def clear(self):
b304c2496f52 dirstate: fix rebuild; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4953 diff changeset	357 self._map = {}
5487 7a64931e2d76 Fix file-changed-to-dir and dir-to-file commits (issue660). Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	358 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	359 delattr(self, "_dirs");
5065 b304c2496f52 dirstate: fix rebuild; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4953 diff changeset	360 self._copymap = {}
b304c2496f52 dirstate: fix rebuild; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4953 diff changeset	361 self._pl = [nullid, nullid]
5123 79373ec3f27d merge with crew-stable Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5045 5065 diff changeset	362 self._dirty = True
5065 b304c2496f52 dirstate: fix rebuild; add a test Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4953 diff changeset	363
1755 a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	364 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	365 self.clear()
2832 e196aa1df169 Start using manifestflags methods Matt Mackall <mpm@selenic.com> parents: 2486 diff changeset	366 for f in files:
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	367 if 'x' in files.flags(f):
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7069 diff changeset	368 self._map[f] = ('n', 0777, -1, 0)
1755 a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	369 else:
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7069 diff changeset	370 self._map[f] = ('n', 0666, -1, 0)
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	371 self._pl = (parent, nullid)
4903 81078e177266 dirstate: use True and false for _dirty Matt Mackall <mpm@selenic.com> parents: 4677 diff changeset	372 self._dirty = True
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	373
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	374 def write(self):
4612 17ee7407097f dirstate: simplify dirty handling Matt Mackall <mpm@selenic.com> parents: 4611 diff changeset	375 if not self._dirty:
1794 98b6c1cad58b only write the dirstate when something changed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1755 diff changeset	376 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	377 st = self._opener("dirstate", "w", atomictemp=True)
6327 6d952dc2abc9 dirstate: refactor granularity code, add a test Matt Mackall <mpm@selenic.com> parents: 6326 diff changeset	378
6d952dc2abc9 dirstate: refactor granularity code, add a test Matt Mackall <mpm@selenic.com> parents: 6326 diff changeset	379 try:
6d952dc2abc9 dirstate: refactor granularity code, add a test Matt Mackall <mpm@selenic.com> parents: 6326 diff changeset	380 gran = int(self._ui.config('dirstate', 'granularity', 1))
6d952dc2abc9 dirstate: refactor granularity code, add a test Matt Mackall <mpm@selenic.com> parents: 6326 diff changeset	381 except ValueError:
6d952dc2abc9 dirstate: refactor granularity code, add a test Matt Mackall <mpm@selenic.com> parents: 6326 diff changeset	382 gran = 1
6d952dc2abc9 dirstate: refactor granularity code, add a test Matt Mackall <mpm@selenic.com> parents: 6326 diff changeset	383 limit = sys.maxint
6d952dc2abc9 dirstate: refactor granularity code, add a test Matt Mackall <mpm@selenic.com> parents: 6326 diff changeset	384 if gran > 0:
6d952dc2abc9 dirstate: refactor granularity code, add a test Matt Mackall <mpm@selenic.com> parents: 6326 diff changeset	385 limit = util.fstat(st).st_mtime - gran
6d952dc2abc9 dirstate: refactor granularity code, add a test Matt Mackall <mpm@selenic.com> parents: 6326 diff changeset	386
4374 9edc2d6f7c10 dirstate: speed up write by 50%. Bryan O'Sullivan <bos@serpentine.com> parents: 4373 diff changeset	387 cs = cStringIO.StringIO()
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	388 copymap = self._copymap
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	389 pack = struct.pack
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	390 write = cs.write
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	391 write("".join(self._pl))
4614 a8be3c875988 dirstate: hide internal vars Matt Mackall <mpm@selenic.com> parents: 4613 diff changeset	392 for f, e in self._map.iteritems():
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	393 if f in copymap:
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	394 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	395 if e[3] > limit and e[0] == 'n':
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7069 diff changeset	396 e = (e[0], 0, -1, -1)
5327 f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	397 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	398 write(e)
f46ab9cacd3c dirstate: speed up read and write Matt Mackall <mpm@selenic.com> parents: 5326 diff changeset	399 write(f)
4374 9edc2d6f7c10 dirstate: speed up write by 50%. Bryan O'Sullivan <bos@serpentine.com> parents: 4373 diff changeset	400 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	401 st.rename()
4965 4106dde15aed Merge with crew Matt Mackall <mpm@selenic.com> parents: 4911 4953 diff changeset	402 self._dirty = self._dirtypl = False
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	403
6032 b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	404 def _dirignore(self, f):
6479 31abcae33b4f dirstate: do not ignore current directory '.' (issue 1078) Patrick Mezard <pmezard@gmail.com> parents: 6327 diff changeset	405 if f == '.':
31abcae33b4f dirstate: do not ignore current directory '.' (issue 1078) Patrick Mezard <pmezard@gmail.com> parents: 6327 diff changeset	406 return False
6032 b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	407 if self._ignore(f):
b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	408 return True
6767 80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	409 for p in _finddirs(f):
80605a8127e0 dirstate: simplify/optimize path checking Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	410 if self._ignore(p):
6032 b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	411 return True
b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	412 return False
b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	413
6755 f8299c84b5b6 dirstate: fold statwalk and walk Matt Mackall <mpm@selenic.com> parents: 6753 diff changeset	414 def walk(self, match, unknown, ignored):
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	415 '''
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	416 walk recursively through the directory tree, finding all files
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	417 matched by the match function
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	418
6818 6e93fbd847ef dirstate.walk: eliminate src from yield Matt Mackall <mpm@selenic.com> parents: 6811 diff changeset	419 results are yielded in a tuple (filename, stat), where stat
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	420 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	421 '''
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	422
6578 f242d3684f83 walk: begin refactoring badmatch handling Matt Mackall <mpm@selenic.com> parents: 6577 diff changeset	423 def fwarn(f, msg):
7023 74be9d0c665c dirstate: use the right variable (f, not ff) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7008 diff changeset	424 self._ui.warn('%s: %s\n' % (self.pathto(f), msg))
6578 f242d3684f83 walk: begin refactoring badmatch handling Matt Mackall <mpm@selenic.com> parents: 6577 diff changeset	425 return False
6589 0f98cae7c77f walk: use match.bad in statwalk Matt Mackall <mpm@selenic.com> parents: 6588 diff changeset	426 badfn = fwarn
0f98cae7c77f walk: use match.bad in statwalk Matt Mackall <mpm@selenic.com> parents: 6588 diff changeset	427 if hasattr(match, 'bad'):
0f98cae7c77f walk: use match.bad in statwalk Matt Mackall <mpm@selenic.com> parents: 6588 diff changeset	428 badfn = match.bad
6578 f242d3684f83 walk: begin refactoring badmatch handling Matt Mackall <mpm@selenic.com> parents: 6577 diff changeset	429
6830 2cf4cda64727 dirstate.walk: fold in _supported Matt Mackall <mpm@selenic.com> parents: 6829 diff changeset	430 def badtype(f, mode):
8310 8417d82d3969 dirstate: translate forgotten string Simon Heimberg <simohe@besonet.ch> parents: 8261 diff changeset	431 kind = _('unknown')
6830 2cf4cda64727 dirstate.walk: fold in _supported Matt Mackall <mpm@selenic.com> parents: 6829 diff changeset	432 if stat.S_ISCHR(mode): kind = _('character device')
2cf4cda64727 dirstate.walk: fold in _supported Matt Mackall <mpm@selenic.com> parents: 6829 diff changeset	433 elif stat.S_ISBLK(mode): kind = _('block device')
2cf4cda64727 dirstate.walk: fold in _supported Matt Mackall <mpm@selenic.com> parents: 6829 diff changeset	434 elif stat.S_ISFIFO(mode): kind = _('fifo')
2cf4cda64727 dirstate.walk: fold in _supported Matt Mackall <mpm@selenic.com> parents: 6829 diff changeset	435 elif stat.S_ISSOCK(mode): kind = _('socket')
2cf4cda64727 dirstate.walk: fold in _supported Matt Mackall <mpm@selenic.com> parents: 6829 diff changeset	436 elif stat.S_ISDIR(mode): kind = _('directory')
2cf4cda64727 dirstate.walk: fold in _supported Matt Mackall <mpm@selenic.com> parents: 6829 diff changeset	437 self._ui.warn(_('%s: unsupported file type (type is %s)\n')
2cf4cda64727 dirstate.walk: fold in _supported Matt Mackall <mpm@selenic.com> parents: 6829 diff changeset	438 % (self.pathto(f), kind))
2cf4cda64727 dirstate.walk: fold in _supported Matt Mackall <mpm@selenic.com> parents: 6829 diff changeset	439
4609 b43f17691ae6 dirstate: move ignore to its own file Matt Mackall <mpm@selenic.com> parents: 4608 diff changeset	440 ignore = self._ignore
6032 b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	441 dirignore = self._dirignore
4193 dd0d9bd91e0a dirstate.statwalk: explicitly test for ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4172 diff changeset	442 if ignored:
dd0d9bd91e0a dirstate.statwalk: explicitly test for ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4172 diff changeset	443 ignore = util.never
6032 b41f0d6a74fc dirstate: don't walk ignored directories Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5516 diff changeset	444 dirignore = util.never
6971 b3bc518a73c3 performance: do not stat() things when not required Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6834 diff changeset	445 elif not unknown:
b3bc518a73c3 performance: do not stat() things when not required Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6834 diff changeset	446 # if unknown and ignored are False, skip step 2
b3bc518a73c3 performance: do not stat() things when not required Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6834 diff changeset	447 ignore = util.always
b3bc518a73c3 performance: do not stat() things when not required Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6834 diff changeset	448 dirignore = util.always
3534 549cb7b640fb Simplify ignore logic in dirstate.walk Matt Mackall <mpm@selenic.com> parents: 3532 diff changeset	449
6834 cbdfd08eabc9 dirstate.walk: speed up calling match function Matt Mackall <mpm@selenic.com> parents: 6833 diff changeset	450 matchfn = match.matchfn
6831 2b663f542bd3 dirstate.walk: more cleanups Matt Mackall <mpm@selenic.com> parents: 6830 diff changeset	451 dmap = self._map
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	452 normpath = util.normpath
6822 1e2850ed8171 dirstate: simplify normalize logic Matt Mackall <mpm@selenic.com> parents: 6821 diff changeset	453 normalize = self.normalize
5396 5105b119edd2 Add osutil module, containing a listdir function. Bryan O'Sullivan <bos@serpentine.com> parents: 5327 diff changeset	454 listdir = osutil.listdir
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	455 lstat = os.lstat
6830 2cf4cda64727 dirstate.walk: fold in _supported Matt Mackall <mpm@selenic.com> parents: 6829 diff changeset	456 getkind = stat.S_IFMT
6828 55d65a33da52 dirstate.walk: minor cleanups Matt Mackall <mpm@selenic.com> parents: 6827 diff changeset	457 dirkind = stat.S_IFDIR
6830 2cf4cda64727 dirstate.walk: fold in _supported Matt Mackall <mpm@selenic.com> parents: 6829 diff changeset	458 regkind = stat.S_IFREG
2cf4cda64727 dirstate.walk: fold in _supported Matt Mackall <mpm@selenic.com> parents: 6829 diff changeset	459 lnkkind = stat.S_IFLNK
6831 2b663f542bd3 dirstate.walk: more cleanups Matt Mackall <mpm@selenic.com> parents: 6830 diff changeset	460 join = self._join
6820 639d9cb95509 dirstate.walk: fold findfiles into main walk loop Matt Mackall <mpm@selenic.com> parents: 6819 diff changeset	461 work = []
639d9cb95509 dirstate.walk: fold findfiles into main walk loop Matt Mackall <mpm@selenic.com> parents: 6819 diff changeset	462 wadd = work.append
639d9cb95509 dirstate.walk: fold findfiles into main walk loop Matt Mackall <mpm@selenic.com> parents: 6819 diff changeset	463
8151 127281884959 util: use built-in set instead of util.unique Martin Geisler <mg@lazybytes.net> parents: 7566 diff changeset	464 files = set(match.files())
6831 2b663f542bd3 dirstate.walk: more cleanups Matt Mackall <mpm@selenic.com> parents: 6830 diff changeset	465 if not files or '.' in files:
2b663f542bd3 dirstate.walk: more cleanups Matt Mackall <mpm@selenic.com> parents: 6830 diff changeset	466 files = ['']
2b663f542bd3 dirstate.walk: more cleanups Matt Mackall <mpm@selenic.com> parents: 6830 diff changeset	467 results = {'.hg': None}
5000 46facb73ba8b dirstate: localize a bunch of methods for findfiles Matt Mackall <mpm@selenic.com> parents: 4965 diff changeset	468
6826 eca20fee0728 dirstate.walk: pull directory scanning into top-level loop Matt Mackall <mpm@selenic.com> parents: 6825 diff changeset	469 # step 1: find all explicit files
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8151 diff changeset	470 for ff in sorted(files):
6822 1e2850ed8171 dirstate: simplify normalize logic Matt Mackall <mpm@selenic.com> parents: 6821 diff changeset	471 nf = normalize(normpath(ff))
6829 fec1da46006e dirstate.walk: build a dict rather than yield Matt Mackall <mpm@selenic.com> parents: 6828 diff changeset	472 if nf in results:
6820 639d9cb95509 dirstate.walk: fold findfiles into main walk loop Matt Mackall <mpm@selenic.com> parents: 6819 diff changeset	473 continue
639d9cb95509 dirstate.walk: fold findfiles into main walk loop Matt Mackall <mpm@selenic.com> parents: 6819 diff changeset	474
639d9cb95509 dirstate.walk: fold findfiles into main walk loop Matt Mackall <mpm@selenic.com> parents: 6819 diff changeset	475 try:
6831 2b663f542bd3 dirstate.walk: more cleanups Matt Mackall <mpm@selenic.com> parents: 6830 diff changeset	476 st = lstat(join(nf))
6830 2cf4cda64727 dirstate.walk: fold in _supported Matt Mackall <mpm@selenic.com> parents: 6829 diff changeset	477 kind = getkind(st.st_mode)
2cf4cda64727 dirstate.walk: fold in _supported Matt Mackall <mpm@selenic.com> parents: 6829 diff changeset	478 if kind == dirkind:
6828 55d65a33da52 dirstate.walk: minor cleanups Matt Mackall <mpm@selenic.com> parents: 6827 diff changeset	479 if not dirignore(nf):
55d65a33da52 dirstate.walk: minor cleanups Matt Mackall <mpm@selenic.com> parents: 6827 diff changeset	480 wadd(nf)
6830 2cf4cda64727 dirstate.walk: fold in _supported Matt Mackall <mpm@selenic.com> parents: 6829 diff changeset	481 elif kind == regkind or kind == lnkkind:
2cf4cda64727 dirstate.walk: fold in _supported Matt Mackall <mpm@selenic.com> parents: 6829 diff changeset	482 results[nf] = st
6828 55d65a33da52 dirstate.walk: minor cleanups Matt Mackall <mpm@selenic.com> parents: 6827 diff changeset	483 else:
6830 2cf4cda64727 dirstate.walk: fold in _supported Matt Mackall <mpm@selenic.com> parents: 6829 diff changeset	484 badtype(ff, kind)
2cf4cda64727 dirstate.walk: fold in _supported Matt Mackall <mpm@selenic.com> parents: 6829 diff changeset	485 if nf in dmap:
6829 fec1da46006e dirstate.walk: build a dict rather than yield Matt Mackall <mpm@selenic.com> parents: 6828 diff changeset	486 results[nf] = None
6820 639d9cb95509 dirstate.walk: fold findfiles into main walk loop Matt Mackall <mpm@selenic.com> parents: 6819 diff changeset	487 except OSError, inst:
639d9cb95509 dirstate.walk: fold findfiles into main walk loop Matt Mackall <mpm@selenic.com> parents: 6819 diff changeset	488 keep = False
6828 55d65a33da52 dirstate.walk: minor cleanups Matt Mackall <mpm@selenic.com> parents: 6827 diff changeset	489 prefix = nf + "/"
6821 d8367107da05 dirstate.walk: change names for dc and known Matt Mackall <mpm@selenic.com> parents: 6820 diff changeset	490 for fn in dmap:
6828 55d65a33da52 dirstate.walk: minor cleanups Matt Mackall <mpm@selenic.com> parents: 6827 diff changeset	491 if nf == fn or fn.startswith(prefix):
6820 639d9cb95509 dirstate.walk: fold findfiles into main walk loop Matt Mackall <mpm@selenic.com> parents: 6819 diff changeset	492 keep = True
639d9cb95509 dirstate.walk: fold findfiles into main walk loop Matt Mackall <mpm@selenic.com> parents: 6819 diff changeset	493 break
639d9cb95509 dirstate.walk: fold findfiles into main walk loop Matt Mackall <mpm@selenic.com> parents: 6819 diff changeset	494 if not keep:
639d9cb95509 dirstate.walk: fold findfiles into main walk loop Matt Mackall <mpm@selenic.com> parents: 6819 diff changeset	495 if inst.errno != errno.ENOENT:
639d9cb95509 dirstate.walk: fold findfiles into main walk loop Matt Mackall <mpm@selenic.com> parents: 6819 diff changeset	496 fwarn(ff, inst.strerror)
6832 643ff33812f8 dirstate.walk: inline imatch Matt Mackall <mpm@selenic.com> parents: 6831 diff changeset	497 elif badfn(ff, inst.strerror):
6834 cbdfd08eabc9 dirstate.walk: speed up calling match function Matt Mackall <mpm@selenic.com> parents: 6833 diff changeset	498 if (nf in dmap or not ignore(nf)) and matchfn(nf):
6832 643ff33812f8 dirstate.walk: inline imatch Matt Mackall <mpm@selenic.com> parents: 6831 diff changeset	499 results[nf] = None
6820 639d9cb95509 dirstate.walk: fold findfiles into main walk loop Matt Mackall <mpm@selenic.com> parents: 6819 diff changeset	500
6826 eca20fee0728 dirstate.walk: pull directory scanning into top-level loop Matt Mackall <mpm@selenic.com> parents: 6825 diff changeset	501 # step 2: visit subdirectories
eca20fee0728 dirstate.walk: pull directory scanning into top-level loop Matt Mackall <mpm@selenic.com> parents: 6825 diff changeset	502 while work:
eca20fee0728 dirstate.walk: pull directory scanning into top-level loop Matt Mackall <mpm@selenic.com> parents: 6825 diff changeset	503 nd = work.pop()
eca20fee0728 dirstate.walk: pull directory scanning into top-level loop Matt Mackall <mpm@selenic.com> parents: 6825 diff changeset	504 if hasattr(match, 'dir'):
eca20fee0728 dirstate.walk: pull directory scanning into top-level loop Matt Mackall <mpm@selenic.com> parents: 6825 diff changeset	505 match.dir(nd)
7099 6f750e76fb46 dirstate.walk: skip unreadable directories (issue1213) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7096 diff changeset	506 skip = None
6826 eca20fee0728 dirstate.walk: pull directory scanning into top-level loop Matt Mackall <mpm@selenic.com> parents: 6825 diff changeset	507 if nd == '.':
eca20fee0728 dirstate.walk: pull directory scanning into top-level loop Matt Mackall <mpm@selenic.com> parents: 6825 diff changeset	508 nd = ''
eca20fee0728 dirstate.walk: pull directory scanning into top-level loop Matt Mackall <mpm@selenic.com> parents: 6825 diff changeset	509 else:
7099 6f750e76fb46 dirstate.walk: skip unreadable directories (issue1213) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7096 diff changeset	510 skip = '.hg'
6f750e76fb46 dirstate.walk: skip unreadable directories (issue1213) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7096 diff changeset	511 try:
6f750e76fb46 dirstate.walk: skip unreadable directories (issue1213) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7096 diff changeset	512 entries = listdir(join(nd), stat=True, skip=skip)
6f750e76fb46 dirstate.walk: skip unreadable directories (issue1213) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7096 diff changeset	513 except OSError, inst:
6f750e76fb46 dirstate.walk: skip unreadable directories (issue1213) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7096 diff changeset	514 if inst.errno == errno.EACCES:
6f750e76fb46 dirstate.walk: skip unreadable directories (issue1213) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7096 diff changeset	515 fwarn(nd, inst.strerror)
6f750e76fb46 dirstate.walk: skip unreadable directories (issue1213) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7096 diff changeset	516 continue
6f750e76fb46 dirstate.walk: skip unreadable directories (issue1213) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7096 diff changeset	517 raise
6826 eca20fee0728 dirstate.walk: pull directory scanning into top-level loop Matt Mackall <mpm@selenic.com> parents: 6825 diff changeset	518 for f, kind, st in entries:
7068 57377fa7eda2 issue 1286: dirstat regression on case folding systems Petr Kodl <petrkodl@gmail.com> parents: 7034 diff changeset	519 nf = normalize(nd and (nd + "/" + f) or f, True)
6829 fec1da46006e dirstate.walk: build a dict rather than yield Matt Mackall <mpm@selenic.com> parents: 6828 diff changeset	520 if nf not in results:
6828 55d65a33da52 dirstate.walk: minor cleanups Matt Mackall <mpm@selenic.com> parents: 6827 diff changeset	521 if kind == dirkind:
55d65a33da52 dirstate.walk: minor cleanups Matt Mackall <mpm@selenic.com> parents: 6827 diff changeset	522 if not ignore(nf):
55d65a33da52 dirstate.walk: minor cleanups Matt Mackall <mpm@selenic.com> parents: 6827 diff changeset	523 wadd(nf)
6834 cbdfd08eabc9 dirstate.walk: speed up calling match function Matt Mackall <mpm@selenic.com> parents: 6833 diff changeset	524 if nf in dmap and matchfn(nf):
6829 fec1da46006e dirstate.walk: build a dict rather than yield Matt Mackall <mpm@selenic.com> parents: 6828 diff changeset	525 results[nf] = None
6832 643ff33812f8 dirstate.walk: inline imatch Matt Mackall <mpm@selenic.com> parents: 6831 diff changeset	526 elif kind == regkind or kind == lnkkind:
643ff33812f8 dirstate.walk: inline imatch Matt Mackall <mpm@selenic.com> parents: 6831 diff changeset	527 if nf in dmap:
6834 cbdfd08eabc9 dirstate.walk: speed up calling match function Matt Mackall <mpm@selenic.com> parents: 6833 diff changeset	528 if matchfn(nf):
6832 643ff33812f8 dirstate.walk: inline imatch Matt Mackall <mpm@selenic.com> parents: 6831 diff changeset	529 results[nf] = st
6834 cbdfd08eabc9 dirstate.walk: speed up calling match function Matt Mackall <mpm@selenic.com> parents: 6833 diff changeset	530 elif matchfn(nf) and not ignore(nf):
6829 fec1da46006e dirstate.walk: build a dict rather than yield Matt Mackall <mpm@selenic.com> parents: 6828 diff changeset	531 results[nf] = st
6834 cbdfd08eabc9 dirstate.walk: speed up calling match function Matt Mackall <mpm@selenic.com> parents: 6833 diff changeset	532 elif nf in dmap and matchfn(nf):
6832 643ff33812f8 dirstate.walk: inline imatch Matt Mackall <mpm@selenic.com> parents: 6831 diff changeset	533 results[nf] = None
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	534
6826 eca20fee0728 dirstate.walk: pull directory scanning into top-level loop Matt Mackall <mpm@selenic.com> parents: 6825 diff changeset	535 # step 3: report unseen items in the dmap hash
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8151 diff changeset	536 visit = sorted([f for f in dmap if f not in results and match(f)])
7118 619ebf82cef2 Take advantage of fstat calls clustering per directory if OS support it. Petr Kodl <petrkodl@gmail.com> parents: 7099 diff changeset	537 for nf, st in zip(visit, util.statfiles([join(i) for i in visit])):
619ebf82cef2 Take advantage of fstat calls clustering per directory if OS support it. Petr Kodl <petrkodl@gmail.com> parents: 7099 diff changeset	538 if not st is None and not getkind(st.st_mode) in (regkind, lnkkind):
619ebf82cef2 Take advantage of fstat calls clustering per directory if OS support it. Petr Kodl <petrkodl@gmail.com> parents: 7099 diff changeset	539 st = None
619ebf82cef2 Take advantage of fstat calls clustering per directory if OS support it. Petr Kodl <petrkodl@gmail.com> parents: 7099 diff changeset	540 results[nf] = st
6829 fec1da46006e dirstate.walk: build a dict rather than yield Matt Mackall <mpm@selenic.com> parents: 6828 diff changeset	541
6831 2b663f542bd3 dirstate.walk: more cleanups Matt Mackall <mpm@selenic.com> parents: 6830 diff changeset	542 del results['.hg']
6829 fec1da46006e dirstate.walk: build a dict rather than yield Matt Mackall <mpm@selenic.com> parents: 6828 diff changeset	543 return results
669 8aa2a282eda4 .hgignore speedups patch incorporating Matt's feedback. mwilli2@localhost.localdomain parents: 667 diff changeset	544
6753 ed5ffb2c12f3 repo.status: eliminate list_ Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	545 def status(self, match, ignored, clean, unknown):
ed5ffb2c12f3 repo.status: eliminate list_ Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	546 listignored, listclean, listunknown = ignored, clean, unknown
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2008 diff changeset	547 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	548 removed, deleted, clean = [], [], []
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	549
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	550 dmap = self._map
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	551 ladd = lookup.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	552 madd = modified.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	553 aadd = added.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	554 uadd = unknown.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	555 iadd = ignored.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	556 radd = removed.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	557 dadd = deleted.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	558 cadd = clean.append
4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	559
6829 fec1da46006e dirstate.walk: build a dict rather than yield Matt Mackall <mpm@selenic.com> parents: 6828 diff changeset	560 for fn, st in self.walk(match, listunknown, listignored).iteritems():
6591 eda3fd322a7f dirstate: minor status cleanups Matt Mackall <mpm@selenic.com> parents: 6590 diff changeset	561 if fn not in dmap:
6753 ed5ffb2c12f3 repo.status: eliminate list_ Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	562 if (listignored or match.exact(fn)) and self._dirignore(fn):
ed5ffb2c12f3 repo.status: eliminate list_ Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	563 if listignored:
6033 a1ebd5cd7e55 dirstate.status: avoid putting ignored files in the unknown list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6032 diff changeset	564 iadd(fn)
6753 ed5ffb2c12f3 repo.status: eliminate list_ Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	565 elif listunknown:
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	566 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	567 continue
6591 eda3fd322a7f dirstate: minor status cleanups Matt Mackall <mpm@selenic.com> parents: 6590 diff changeset	568
7093 16bafcebd3d1 dirstate: C parsing extension Matt Mackall <mpm@selenic.com> parents: 7069 diff changeset	569 state, mode, size, time = dmap[fn]
6591 eda3fd322a7f dirstate: minor status cleanups Matt Mackall <mpm@selenic.com> parents: 6590 diff changeset	570
6818 6e93fbd847ef dirstate.walk: eliminate src from yield Matt Mackall <mpm@selenic.com> parents: 6811 diff changeset	571 if not st and state in "nma":
6e93fbd847ef dirstate.walk: eliminate src from yield Matt Mackall <mpm@selenic.com> parents: 6811 diff changeset	572 dadd(fn)
6e93fbd847ef dirstate.walk: eliminate src from yield Matt Mackall <mpm@selenic.com> parents: 6811 diff changeset	573 elif state == 'n':
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	574 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	575 (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	576 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	577 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	578 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	579 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	580 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	581 ladd(fn)
6753 ed5ffb2c12f3 repo.status: eliminate list_ Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	582 elif listclean:
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	583 cadd(fn)
6590 9f80e062d71c status: rename type_ to state Matt Mackall <mpm@selenic.com> parents: 6589 diff changeset	584 elif state == 'm':
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	585 madd(fn)
6590 9f80e062d71c status: rename type_ to state Matt Mackall <mpm@selenic.com> parents: 6589 diff changeset	586 elif state == 'a':
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	587 aadd(fn)
6590 9f80e062d71c status: rename type_ to state Matt Mackall <mpm@selenic.com> parents: 6589 diff changeset	588 elif state == 'r':
5003 4b1acb3ecb3c dirstate: localize a bunch of methods in status fastpath Matt Mackall <mpm@selenic.com> parents: 5002 diff changeset	589 radd(fn)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	590
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2486 diff changeset	591 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	592 clean)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/dirstate.py @ 8312:b87a50b7125c