mercurial-crew-with-dirclash: mercurial/dirstate.py annotate

annotate mercurial/dirstate.py @ 1740:f95654385065

add --daemon option to serve command. for issue 45. code looks odd because it is portable to windows. windows does not have os.fork, so have to spawn and use pipe to tell parent ready instead.

author	Vadim Gelfer <vadim.gelfer@gmail.com>
date	Fri, 17 Feb 2006 16:29:30 -0800
parents	ece5d785e87a
children	d457fec76ab0

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
142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	4 Copyright 2005 Matt Mackall <mpm@selenic.com>
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: 1089 diff changeset	10 import struct, os
221b5252864c Adjust some imports mpm@selenic.com parents: 1089 diff changeset	11 from node import *
1400 cf9a1233738a i18n first part: make '_' available for files who need it Benoit Boissinot <benoit.boissinot@ens-lyon.org parents: 1396 diff changeset	12 from i18n import gettext as _
262 3db700146536 implement demand loading hack mpm@selenic.com parents: 256 diff changeset	13 from demandload import *
1476 17e8c70fb670 fix dirstate.change: it should walk ignored files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1471 diff changeset	14 demandload(globals(), "time bisect stat util re errno")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	15
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1541 diff changeset	16 class dirstate(object):
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	17 def __init__(self, opener, ui, root):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	18 self.opener = opener
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	19 self.root = root
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	20 self.dirty = 0
20 a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	21 self.ui = ui
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	22 self.map = None
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	23 self.pl = None
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	24 self.copies = {}
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	25 self.ignorefunc = None
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	26 self.blockignore = False
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	27
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	28 def wjoin(self, f):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	29 return os.path.join(self.root, f)
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	30
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	31 def getcwd(self):
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	32 cwd = os.getcwd()
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	33 if cwd == self.root: return ''
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	34 return cwd[len(self.root) + 1:]
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	35
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	36 def hgignore(self):
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	37 '''return the contents of .hgignore as a list of patterns.
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	38
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	39 trailing white space is dropped.
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	40 the escape character is backslash.
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	41 comments start with #.
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	42 empty lines are skipped.
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	43
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	44 lines can be of the following formats:
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	45
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	46 syntax: regexp # defaults following lines to non-rooted regexps
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	47 syntax: glob # defaults following lines to non-rooted globs
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	48 re:pattern # non-rooted regular expression
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	49 glob:pattern # non-rooted glob
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	50 pattern # pattern of the current default type'''
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	51 syntaxes = {'re': 'relre:', 'regexp': 'relre:', 'glob': 'relglob:'}
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	52 def parselines(fp):
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	53 for line in fp:
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	54 escape = False
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	55 for i in xrange(len(line)):
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	56 if escape: escape = False
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	57 elif line[i] == '\\': escape = True
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	58 elif line[i] == '#': break
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	59 line = line[:i].rstrip()
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	60 if line: yield line
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	61 pats = []
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	62 try:
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	63 fp = open(self.wjoin('.hgignore'))
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	64 syntax = 'relre:'
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	65 for line in parselines(fp):
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	66 if line.startswith('syntax:'):
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	67 s = line[7:].strip()
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	68 try:
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	69 syntax = syntaxes[s]
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	70 except KeyError:
1610 84e9b3484ff6 if hgignore contains errors, print message that is not confusing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1564 diff changeset	71 self.ui.warn(_(".hgignore: ignoring invalid "
84e9b3484ff6 if hgignore contains errors, print message that is not confusing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1564 diff changeset	72 "syntax '%s'\n") % s)
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	73 continue
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	74 pat = syntax + line
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	75 for s in syntaxes.values():
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	76 if line.startswith(s):
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	77 pat = line
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	78 break
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	79 pats.append(pat)
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	80 except IOError: pass
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	81 return pats
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	82
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	83 def ignore(self, fn):
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	84 '''default match function used by dirstate and localrepository.
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	85 this honours the .hgignore file, and nothing more.'''
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	86 if self.blockignore:
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	87 return False
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	88 if not self.ignorefunc:
1271 9ab14ca22e37 Fix ignore regression. Bryan O'Sullivan <bos@serpentine.com> parents: 1270 diff changeset	89 ignore = self.hgignore()
9ab14ca22e37 Fix ignore regression. Bryan O'Sullivan <bos@serpentine.com> parents: 1270 diff changeset	90 if ignore:
9ab14ca22e37 Fix ignore regression. Bryan O'Sullivan <bos@serpentine.com> parents: 1270 diff changeset	91 files, self.ignorefunc, anypats = util.matcher(self.root,
1610 84e9b3484ff6 if hgignore contains errors, print message that is not confusing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1564 diff changeset	92 inc=ignore,
84e9b3484ff6 if hgignore contains errors, print message that is not confusing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1564 diff changeset	93 src='.hgignore')
1271 9ab14ca22e37 Fix ignore regression. Bryan O'Sullivan <bos@serpentine.com> parents: 1270 diff changeset	94 else:
9ab14ca22e37 Fix ignore regression. Bryan O'Sullivan <bos@serpentine.com> parents: 1270 diff changeset	95 self.ignorefunc = util.never
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	96 return self.ignorefunc(fn)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	97
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	98 def __del__(self):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	99 if self.dirty:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	100 self.write()
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	101
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	102 def __getitem__(self, key):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	103 try:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	104 return self.map[key]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	105 except TypeError:
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	106 self.lazyread()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	107 return self[key]
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	108
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	109 def __contains__(self, key):
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	110 self.lazyread()
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	111 return key in self.map
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	112
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	113 def parents(self):
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	114 self.lazyread()
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	115 return self.pl
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	116
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	117 def markdirty(self):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	118 if not self.dirty:
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	119 self.dirty = 1
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	120
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1040 diff changeset	121 def setparents(self, p1, p2=nullid):
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	122 self.lazyread()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	123 self.markdirty()
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	124 self.pl = p1, p2
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	125
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	126 def state(self, key):
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	127 try:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	128 return self[key][0]
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	129 except KeyError:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	130 return "?"
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	131
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	132 def lazyread(self):
a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	133 if self.map is None:
a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	134 self.read()
a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	135
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	136 def read(self):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	137 self.map = {}
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	138 self.pl = [nullid, nullid]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	139 try:
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	140 st = self.opener("dirstate").read()
311 3b17056b72dc fix KeyErrors from reading empty dirstate mpm@selenic.com parents: 308 diff changeset	141 if not st: return
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	142 except: return
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	143
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	144 self.pl = [st[:20], st[20: 40]]
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	145
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	146 pos = 40
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	147 while pos < len(st):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	148 e = struct.unpack(">cllll", st[pos:pos+17])
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	149 l = e[4]
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	150 pos += 17
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	151 f = st[pos:pos + l]
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	152 if '\0' in f:
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	153 f, c = f.split('\0')
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	154 self.copies[f] = c
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	155 self.map[f] = e[:4]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	156 pos += l
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	157
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	158 def copy(self, source, dest):
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	159 self.lazyread()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	160 self.markdirty()
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	161 self.copies[dest] = source
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	162
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	163 def copied(self, file):
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	164 return self.copies.get(file, None)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	165
862 d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	166 def update(self, files, state, **kw):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	167 ''' current states:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	168 n normal
231 15e7c6cee929 add 'm' state to dirstates mpm@selenic.com parents: 230 diff changeset	169 m needs merging
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	170 r marked for removal
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	171 a marked for addition'''
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	172
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	173 if not files: return
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	174 self.lazyread()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	175 self.markdirty()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	176 for f in files:
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	177 if state == "r":
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	178 self.map[f] = ('r', 0, 0, 0)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	179 else:
1510 755e7ac351ef use self.{w,}join when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1491 diff changeset	180 s = os.lstat(self.wjoin(f))
862 d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	181 st_size = kw.get('st_size', s.st_size)
d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	182 st_mtime = kw.get('st_mtime', s.st_mtime)
865 2d2fee33ec68 Cleanup after previous changes: Thomas Arendsen Hein <thomas@intevation.de> parents: 863 diff changeset	183 self.map[f] = (state, s.st_mode, st_size, st_mtime)
1117 30ab5b8ee8ec fix some rename/copy bugs mpm@selenic.com parents: 1104 diff changeset	184 if self.copies.has_key(f):
30ab5b8ee8ec fix some rename/copy bugs mpm@selenic.com parents: 1104 diff changeset	185 del self.copies[f]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	186
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	187 def forget(self, files):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	188 if not files: return
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	189 self.lazyread()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	190 self.markdirty()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	191 for f in files:
20 a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	192 try:
a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	193 del self.map[f]
a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	194 except KeyError:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	195 self.ui.warn(_("not in dirstate: %s!\n") % f)
20 a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	196 pass
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	197
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	198 def clear(self):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	199 self.map = {}
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	200 self.markdirty()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	201
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	202 def write(self):
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	203 st = self.opener("dirstate", "w", atomic=True)
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	204 st.write("".join(self.pl))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	205 for f, e in self.map.items():
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	206 c = self.copied(f)
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	207 if c:
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	208 f = f + "\0" + c
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	209 e = struct.pack(">cllll", e[0], e[1], e[2], e[3], len(f))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	210 st.write(e + f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	211 self.dirty = 0
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	212
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	213 def filterfiles(self, files):
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	214 ret = {}
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	215 unknown = []
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	216
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	217 for x in files:
1541 bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1529 diff changeset	218 if x == '.':
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	219 return self.map.copy()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	220 if x not in self.map:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	221 unknown.append(x)
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	222 else:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	223 ret[x] = self.map[x]
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	224
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	225 if not unknown:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	226 return ret
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	227
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	228 b = self.map.keys()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	229 b.sort()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	230 blen = len(b)
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	231
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	232 for x in unknown:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	233 bs = bisect.bisect(b, x)
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	234 if bs != 0 and b[bs-1] == x:
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	235 ret[x] = self.map[x]
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	236 continue
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	237 while bs < blen:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	238 s = b[bs]
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	239 if len(s) > len(x) and s.startswith(x) and s[len(x)] == '/':
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	240 ret[s] = self.map[s]
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	241 else:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	242 break
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	243 bs += 1
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	244 return ret
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	245
1527 c13fce7167c2 don't print anything about file of unsupported type unless Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1510 diff changeset	246 def supported_type(self, f, st, verbose=False):
1487 2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	247 if stat.S_ISREG(st.st_mode):
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	248 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	249 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	250 kind = 'unknown'
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	251 if stat.S_ISCHR(st.st_mode): kind = _('character device')
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	252 elif stat.S_ISBLK(st.st_mode): kind = _('block device')
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	253 elif stat.S_ISFIFO(st.st_mode): kind = _('fifo')
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	254 elif stat.S_ISLNK(st.st_mode): kind = _('symbolic link')
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	255 elif stat.S_ISSOCK(st.st_mode): kind = _('socket')
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	256 elif stat.S_ISDIR(st.st_mode): kind = _('directory')
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	257 self.ui.warn(_('%s: unsupported file type (type is %s)\n') % (
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	258 util.pathto(self.getcwd(), f),
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	259 kind))
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	260 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	261
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	262 def statwalk(self, files=None, match=util.always, dc=None):
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	263 self.lazyread()
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	264
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	265 # walk all files by default
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	266 if not files:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	267 files = [self.root]
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	268 if not dc:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	269 dc = self.map.copy()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	270 elif not dc:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	271 dc = self.filterfiles(files)
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	272
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	273 def statmatch(file, stat):
1224 cc61d366bc3b Fix Windows status problem from new dirstate walk code mpm@selenic.com parents: 1183 diff changeset	274 file = util.pconvert(file)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	275 if file not in dc and self.ignore(file):
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	276 return False
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	277 return match(file)
1224 cc61d366bc3b Fix Windows status problem from new dirstate walk code mpm@selenic.com parents: 1183 diff changeset	278
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	279 return self.walkhelper(files=files, statmatch=statmatch, dc=dc)
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	280
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	281 def walk(self, files=None, match=util.always, dc=None):
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	282 # filter out the stat
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	283 for src, f, st in self.statwalk(files, match, dc):
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	284 yield src, f
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	285
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	286 # walk recursively through the directory tree, finding all files
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	287 # matched by the statmatch function
1224 cc61d366bc3b Fix Windows status problem from new dirstate walk code mpm@selenic.com parents: 1183 diff changeset	288 #
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	289 # results are yielded in a tuple (src, filename, st), where src
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	290 # is one of:
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	291 # 'f' the file was found in the directory tree
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	292 # 'm' the file was only in the dirstate and not in the tree
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	293 # and st is the stat result if the file was found in the directory.
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	294 #
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	295 # dc is an optional arg for the current dirstate. dc is not modified
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	296 # directly by this function, but might be modified by your statmatch call.
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	297 #
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	298 def walkhelper(self, files, statmatch, dc):
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	299 # recursion free walker, faster than os.walk.
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	300 def findfiles(s):
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	301 work = [s]
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	302 while work:
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	303 top = work.pop()
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	304 names = os.listdir(top)
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	305 names.sort()
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	306 # nd is the top of the repository dir tree
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	307 nd = util.normpath(top[len(self.root) + 1:])
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	308 if nd == '.': nd = ''
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	309 for f in names:
1562 2f97af0b522c Fix walkhelper on windows. Christian Boos <cboos@neuf.fr> parents: 1559 diff changeset	310 np = util.pconvert(os.path.join(nd, f))
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	311 if seen(np):
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	312 continue
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	313 p = os.path.join(top, f)
1228 db950da49539 Fix dangling symlink bug in dirstate walk code mpm@selenic.com parents: 1224 diff changeset	314 # don't trip over symlinks
db950da49539 Fix dangling symlink bug in dirstate walk code mpm@selenic.com parents: 1224 diff changeset	315 st = os.lstat(p)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	316 if stat.S_ISDIR(st.st_mode):
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	317 ds = os.path.join(nd, f +'/')
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	318 if statmatch(ds, st):
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	319 work.append(p)
1487 2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	320 if statmatch(np, st) and np in dc:
1562 2f97af0b522c Fix walkhelper on windows. Christian Boos <cboos@neuf.fr> parents: 1559 diff changeset	321 yield 'm', np, 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	322 elif statmatch(np, st):
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	323 if self.supported_type(np, st):
1562 2f97af0b522c Fix walkhelper on windows. Christian Boos <cboos@neuf.fr> parents: 1559 diff changeset	324 yield 'f', np, 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	325 elif np in dc:
1562 2f97af0b522c Fix walkhelper on windows. Christian Boos <cboos@neuf.fr> parents: 1559 diff changeset	326 yield 'm', np, st
1392 32d8068b3e36 add a check for filetype when walking Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1276 diff changeset	327
821 72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	328 known = {'.hg': 1}
72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	329 def seen(fn):
72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	330 if fn in known: return True
72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	331 known[fn] = 1
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	332
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	333 # step one, find all files that match our criteria
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	334 files.sort()
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	335 for ff in util.unique(files):
1510 755e7ac351ef use self.{w,}join when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1491 diff changeset	336 f = self.wjoin(ff)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	337 try:
1230 6eac821c202c dirstate: two more stat -> lstat changes mpm@selenic.com parents: 1228 diff changeset	338 st = os.lstat(f)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	339 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	340 nf = util.normpath(ff)
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	341 found = False
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	342 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	343 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	344 found = True
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	345 break
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	346 if not found:
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	347 self.ui.warn('%s: %s\n' % (
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	348 util.pathto(self.getcwd(), ff),
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	349 inst.strerror))
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	350 continue
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	351 if stat.S_ISDIR(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	352 cmp1 = (lambda x, y: cmp(x[1], y[1]))
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	353 sorted = [ x for x in findfiles(f) ]
1487 2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	354 sorted.sort(cmp1)
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	355 for e in sorted:
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	356 yield e
1392 32d8068b3e36 add a check for filetype when walking Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1276 diff changeset	357 else:
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	358 ff = util.normpath(ff)
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	359 if seen(ff):
884 087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	360 continue
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	361 self.blockignore = True
1487 2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	362 if statmatch(ff, st):
1527 c13fce7167c2 don't print anything about file of unsupported type unless Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1510 diff changeset	363 if self.supported_type(ff, st, verbose=True):
1487 2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	364 yield 'f', ff, st
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	365 elif ff in dc:
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	366 yield 'm', ff, st
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	367 self.blockignore = False
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	368
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	369 # step two run through anything left in the dc hash and yield
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	370 # if we haven't already seen it
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	371 ks = dc.keys()
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	372 ks.sort()
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	373 for k in ks:
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	374 if not seen(k) and (statmatch(k, None)):
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	375 yield 'm', k, None
669 8aa2a282eda4 .hgignore speedups patch incorporating Matt's feedback. mwilli2@localhost.localdomain parents: 667 diff changeset	376
861 cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	377 def changes(self, files=None, match=util.always):
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	378 lookup, modified, added, unknown = [], [], [], []
cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	379 removed, deleted = [], []
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	380
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	381 for src, fn, st in self.statwalk(files, match):
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	382 try:
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	383 type, mode, size, time = self[fn]
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	384 except KeyError:
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	385 unknown.append(fn)
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	386 continue
1476 17e8c70fb670 fix dirstate.change: it should walk ignored files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1471 diff changeset	387 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	388 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	389 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	390 try:
1510 755e7ac351ef use self.{w,}join when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1491 diff changeset	391 f = self.wjoin(fn)
1491 91c0e8d7ddcf fix a bug in dirstate.changes when cwd != repo.root Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1488 diff changeset	392 st = os.lstat(f)
1487 2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	393 except OSError, inst:
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	394 if inst.errno != errno.ENOENT:
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	395 raise
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	396 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	397 # We need to re-check that it is a valid file
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	398 if st and self.supported_type(fn, st):
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	399 nonexistent = False
1476 17e8c70fb670 fix dirstate.change: it should walk ignored files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1471 diff changeset	400 # 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	401 # who are not removed in the dirstate ?
1488 08c7851969cc only files in normal state should be marked as deleted Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1487 diff changeset	402 if nonexistent and type in "nm":
1476 17e8c70fb670 fix dirstate.change: it should walk ignored files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1471 diff changeset	403 deleted.append(fn)
17e8c70fb670 fix dirstate.change: it should walk ignored files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1471 diff changeset	404 continue
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	405 # check the common case first
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	406 if type == 'n':
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	407 if not st:
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	408 st = os.stat(fn)
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	409 if size != st.st_size or (mode ^ st.st_mode) & 0100:
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	410 modified.append(fn)
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	411 elif time != st.st_mtime:
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	412 lookup.append(fn)
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	413 elif type == 'm':
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	414 modified.append(fn)
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	415 elif type == 'a':
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	416 added.append(fn)
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	417 elif type == 'r':
f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	418 removed.append(fn)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	419
1617 ece5d785e87a Make localrepo.changes() internally distinguish between removed and deleted. Thomas Arendsen Hein <thomas@intevation.de> parents: 1610 diff changeset	420 return (lookup, modified, added, removed, deleted, unknown)

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/dirstate.py @ 1740:f95654385065