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

annotate mercurial/dirstate.py @ 2161:12e11413ca19

Fix just introduced possible old-http bug My last patch changed httprangereader.read to read only the specified amount of data from the connection, to prevent it from returning more than what was asked. I just realized that this could lead to the connection not being closed. In practice, it looks like the connection is closed just fine, but it's probably safer to read everything and then return only what's necessary.

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
date	Sun, 30 Apr 2006 18:50:53 +0200
parents	f1fda71e134e
children	5083cba2a777

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):
2003 62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	37 '''return the contents of .hgignore files as a list of patterns.
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	38
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	39 the files parsed for patterns include:
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	40 .hgignore in the repository root
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	41 any additional files specified in the [ui] section of ~/.hgrc
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	42
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	43 trailing white space is dropped.
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	44 the escape character is backslash.
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	45 comments start with #.
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	46 empty lines are skipped.
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	47
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	48 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	49
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	50 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	51 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	52 re:pattern # non-rooted regular expression
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	53 glob:pattern # non-rooted glob
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	54 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	55 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	56 def parselines(fp):
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	57 for line in fp:
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	58 escape = False
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	59 for i in xrange(len(line)):
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	60 if escape: escape = False
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	61 elif line[i] == '\\': escape = True
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	62 elif line[i] == '#': break
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	63 line = line[:i].rstrip()
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	64 if line: yield line
2004 7dd6317ab4fd Add warning if user-configured hgignore file isn't found mcmillen@cs.cmu.edu parents: 2003 diff changeset	65 repoignore = self.wjoin('.hgignore')
7dd6317ab4fd Add warning if user-configured hgignore file isn't found mcmillen@cs.cmu.edu parents: 2003 diff changeset	66 files = [repoignore]
2003 62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	67 files.extend(self.ui.hgignorefiles())
2005 bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	68 pats = {}
2003 62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	69 for f in files:
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	70 try:
2005 bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	71 pats[f] = []
2003 62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	72 fp = open(f)
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	73 syntax = 'relre:'
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	74 for line in parselines(fp):
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	75 if line.startswith('syntax:'):
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	76 s = line[7:].strip()
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	77 try:
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	78 syntax = syntaxes[s]
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	79 except KeyError:
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	80 self.ui.warn(_("%s: ignoring invalid "
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	81 "syntax '%s'\n") % (f, s))
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	82 continue
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	83 pat = syntax + line
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	84 for s in syntaxes.values():
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	85 if line.startswith(s):
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	86 pat = line
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	87 break
2005 bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	88 pats[f].append(pat)
2006 ff8b39daa930 Show reason why an ignore file can't be read and state that it is skipped. Thomas Arendsen Hein <thomas@intevation.de> parents: 2005 diff changeset	89 except IOError, inst:
2004 7dd6317ab4fd Add warning if user-configured hgignore file isn't found mcmillen@cs.cmu.edu parents: 2003 diff changeset	90 if f != repoignore:
2006 ff8b39daa930 Show reason why an ignore file can't be read and state that it is skipped. Thomas Arendsen Hein <thomas@intevation.de> parents: 2005 diff changeset	91 self.ui.warn(_("skipping unreadable ignore file"
ff8b39daa930 Show reason why an ignore file can't be read and state that it is skipped. Thomas Arendsen Hein <thomas@intevation.de> parents: 2005 diff changeset	92 " '%s': %s\n") % (f, inst.strerror))
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	93 return pats
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	94
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	95 def ignore(self, fn):
2003 62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	96 '''default match function used by dirstate and
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	97 localrepository. this honours the repository .hgignore file
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	98 and any other files specified in the [ui] section of .hgrc.'''
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	99 if self.blockignore:
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	100 return False
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	101 if not self.ignorefunc:
1271 9ab14ca22e37 Fix ignore regression. Bryan O'Sullivan <bos@serpentine.com> parents: 1270 diff changeset	102 ignore = self.hgignore()
2008 11ffa1267185 Don't ignore everything if all hgignore files are empty. Thomas Arendsen Hein <thomas@intevation.de> parents: 2006 diff changeset	103 allpats = []
11ffa1267185 Don't ignore everything if all hgignore files are empty. Thomas Arendsen Hein <thomas@intevation.de> parents: 2006 diff changeset	104 [allpats.extend(patlist) for patlist in ignore.values()]
11ffa1267185 Don't ignore everything if all hgignore files are empty. Thomas Arendsen Hein <thomas@intevation.de> parents: 2006 diff changeset	105 if allpats:
2005 bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	106 try:
bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	107 files, self.ignorefunc, anypats = (
bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	108 util.matcher(self.root, inc=allpats, src='.hgignore'))
bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	109 except util.Abort:
bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	110 # Re-raise an exception where the src is the right file
bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	111 for f, patlist in ignore.items():
bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	112 files, self.ignorefunc, anypats = (
bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	113 util.matcher(self.root, inc=patlist, src=f))
1271 9ab14ca22e37 Fix ignore regression. Bryan O'Sullivan <bos@serpentine.com> parents: 1270 diff changeset	114 else:
9ab14ca22e37 Fix ignore regression. Bryan O'Sullivan <bos@serpentine.com> parents: 1270 diff changeset	115 self.ignorefunc = util.never
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	116 return self.ignorefunc(fn)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	117
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	118 def __del__(self):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	119 if self.dirty:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	120 self.write()
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	121
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	122 def __getitem__(self, key):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	123 try:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	124 return self.map[key]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	125 except TypeError:
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	126 self.lazyread()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	127 return self[key]
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	128
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	129 def __contains__(self, key):
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	130 self.lazyread()
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	131 return key in self.map
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	132
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	133 def parents(self):
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	134 self.lazyread()
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	135 return self.pl
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	136
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	137 def markdirty(self):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	138 if not self.dirty:
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	139 self.dirty = 1
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	140
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1040 diff changeset	141 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	142 self.lazyread()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	143 self.markdirty()
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	144 self.pl = p1, p2
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	145
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	146 def state(self, key):
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	147 try:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	148 return self[key][0]
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	149 except KeyError:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	150 return "?"
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	151
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	152 def lazyread(self):
a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	153 if self.map is None:
a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	154 self.read()
a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	155
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	156 def read(self):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	157 self.map = {}
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	158 self.pl = [nullid, nullid]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	159 try:
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	160 st = self.opener("dirstate").read()
311 3b17056b72dc fix KeyErrors from reading empty dirstate mpm@selenic.com parents: 308 diff changeset	161 if not st: return
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	162 except: return
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	163
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	164 self.pl = [st[:20], st[20: 40]]
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	165
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	166 pos = 40
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	167 while pos < len(st):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	168 e = struct.unpack(">cllll", st[pos:pos+17])
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	169 l = e[4]
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	170 pos += 17
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	171 f = st[pos:pos + l]
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	172 if '\0' in f:
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	173 f, c = f.split('\0')
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	174 self.copies[f] = c
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	175 self.map[f] = e[:4]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	176 pos += l
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	177
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	178 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	179 self.lazyread()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	180 self.markdirty()
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	181 self.copies[dest] = source
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	182
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	183 def copied(self, file):
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	184 return self.copies.get(file, None)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	185
862 d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	186 def update(self, files, state, **kw):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	187 ''' current states:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	188 n normal
231 15e7c6cee929 add 'm' state to dirstates mpm@selenic.com parents: 230 diff changeset	189 m needs merging
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	190 r marked for removal
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	191 a marked for addition'''
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	192
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	193 if not files: return
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	194 self.lazyread()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	195 self.markdirty()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	196 for f in files:
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	197 if state == "r":
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	198 self.map[f] = ('r', 0, 0, 0)
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	199 else:
1510 755e7ac351ef use self.{w,}join when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1491 diff changeset	200 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	201 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	202 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	203 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	204 if self.copies.has_key(f):
30ab5b8ee8ec fix some rename/copy bugs mpm@selenic.com parents: 1104 diff changeset	205 del self.copies[f]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	206
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	207 def forget(self, files):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	208 if not files: return
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	209 self.lazyread()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	210 self.markdirty()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	211 for f in files:
20 a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	212 try:
a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	213 del self.map[f]
a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	214 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	215 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	216 pass
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	217
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	218 def clear(self):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	219 self.map = {}
1755 a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	220 self.copies = {}
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	221 self.markdirty()
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	222
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	223 def rebuild(self, parent, files):
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	224 self.clear()
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	225 umask = os.umask(0)
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	226 os.umask(umask)
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	227 for f, mode in files:
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	228 if mode:
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	229 self.map[f] = ('n', ~umask, -1, 0)
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	230 else:
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	231 self.map[f] = ('n', ~umask & 0666, -1, 0)
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	232 self.pl = (parent, nullid)
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	233 self.markdirty()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	234
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	235 def write(self):
1794 98b6c1cad58b only write the dirstate when something changed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1755 diff changeset	236 if not self.dirty:
98b6c1cad58b only write the dirstate when something changed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1755 diff changeset	237 return
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	238 st = self.opener("dirstate", "w", atomic=True)
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	239 st.write("".join(self.pl))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	240 for f, e in self.map.items():
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	241 c = self.copied(f)
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	242 if c:
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	243 f = f + "\0" + c
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	244 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	245 st.write(e + f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	246 self.dirty = 0
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	247
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	248 def filterfiles(self, files):
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	249 ret = {}
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	250 unknown = []
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	251
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	252 for x in files:
1541 bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1529 diff changeset	253 if x == '.':
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	254 return self.map.copy()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	255 if x not in self.map:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	256 unknown.append(x)
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	257 else:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	258 ret[x] = self.map[x]
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	259
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	260 if not unknown:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	261 return ret
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	262
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	263 b = self.map.keys()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	264 b.sort()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	265 blen = len(b)
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	266
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	267 for x in unknown:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	268 bs = bisect.bisect(b, x)
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	269 if bs != 0 and b[bs-1] == x:
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	270 ret[x] = self.map[x]
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	271 continue
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	272 while bs < blen:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	273 s = b[bs]
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	274 if len(s) > len(x) and s.startswith(x) and s[len(x)] == '/':
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	275 ret[s] = self.map[s]
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	276 else:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	277 break
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	278 bs += 1
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	279 return ret
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	280
1527 c13fce7167c2 don't print anything about file of unsupported type unless Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1510 diff changeset	281 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	282 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	283 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	284 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	285 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	286 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	287 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	288 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	289 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	290 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	291 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	292 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	293 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	294 kind))
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	295 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	296
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	297 def statwalk(self, files=None, match=util.always, dc=None, ignored=False,
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	298 badmatch=None):
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	299 self.lazyread()
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	300
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	301 # walk all files by default
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	302 if not files:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	303 files = [self.root]
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	304 if not dc:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	305 dc = self.map.copy()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	306 elif not dc:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	307 dc = self.filterfiles(files)
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	308
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	309 def statmatch(file_, stat):
d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	310 file_ = util.pconvert(file_)
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2008 diff changeset	311 if not ignored and file_ not in dc and self.ignore(file_):
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	312 return False
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	313 return match(file_)
1224 cc61d366bc3b Fix Windows status problem from new dirstate walk code mpm@selenic.com parents: 1183 diff changeset	314
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	315 return self.walkhelper(files=files, statmatch=statmatch, dc=dc,
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	316 badmatch=badmatch)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	317
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	318 def walk(self, files=None, match=util.always, dc=None, badmatch=None):
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	319 # filter out the stat
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	320 for src, f, st in self.statwalk(files, match, dc, badmatch=badmatch):
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	321 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	322
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	323 # walk recursively through the directory tree, finding all files
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	324 # matched by the statmatch function
1224 cc61d366bc3b Fix Windows status problem from new dirstate walk code mpm@selenic.com parents: 1183 diff changeset	325 #
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	326 # 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	327 # is one of:
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	328 # 'f' the file was found in the directory tree
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	329 # '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	330 # 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	331 #
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	332 # dc is an optional arg for the current dirstate. dc is not modified
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	333 # directly by this function, but might be modified by your statmatch call.
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	334 #
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	335 def walkhelper(self, files, statmatch, dc, badmatch=None):
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	336 # recursion free walker, faster than os.walk.
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	337 def findfiles(s):
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	338 work = [s]
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	339 while work:
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	340 top = work.pop()
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	341 names = os.listdir(top)
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	342 names.sort()
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	343 # nd is the top of the repository dir tree
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	344 nd = util.normpath(top[len(self.root) + 1:])
2061 5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	345 if nd == '.':
5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	346 nd = ''
5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	347 else:
2063 f1fda71e134e benoit asked for comment to make avoid of recursive repo clearer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2062 diff changeset	348 # do not recurse into a repo contained in this
f1fda71e134e benoit asked for comment to make avoid of recursive repo clearer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2062 diff changeset	349 # one. use bisect to find .hg directory so speed
f1fda71e134e benoit asked for comment to make avoid of recursive repo clearer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2062 diff changeset	350 # is good on big directory.
2061 5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	351 hg = bisect.bisect_left(names, '.hg')
5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	352 if hg < len(names) and names[hg] == '.hg':
5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	353 if os.path.isdir(os.path.join(top, '.hg')):
5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	354 continue
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	355 for f in names:
1562 2f97af0b522c Fix walkhelper on windows. Christian Boos <cboos@neuf.fr> parents: 1559 diff changeset	356 np = util.pconvert(os.path.join(nd, f))
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	357 if seen(np):
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	358 continue
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	359 p = os.path.join(top, f)
1228 db950da49539 Fix dangling symlink bug in dirstate walk code mpm@selenic.com parents: 1224 diff changeset	360 # don't trip over symlinks
db950da49539 Fix dangling symlink bug in dirstate walk code mpm@selenic.com parents: 1224 diff changeset	361 st = os.lstat(p)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	362 if stat.S_ISDIR(st.st_mode):
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	363 ds = os.path.join(nd, f +'/')
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	364 if statmatch(ds, st):
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	365 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	366 if statmatch(np, st) and np in dc:
1562 2f97af0b522c Fix walkhelper on windows. Christian Boos <cboos@neuf.fr> parents: 1559 diff changeset	367 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	368 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	369 if self.supported_type(np, st):
1562 2f97af0b522c Fix walkhelper on windows. Christian Boos <cboos@neuf.fr> parents: 1559 diff changeset	370 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	371 elif np in dc:
1562 2f97af0b522c Fix walkhelper on windows. Christian Boos <cboos@neuf.fr> parents: 1559 diff changeset	372 yield 'm', np, st
1392 32d8068b3e36 add a check for filetype when walking Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1276 diff changeset	373
821 72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	374 known = {'.hg': 1}
72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	375 def seen(fn):
72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	376 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	377 known[fn] = 1
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	378
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	379 # step one, find all files that match our criteria
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	380 files.sort()
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	381 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	382 f = self.wjoin(ff)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	383 try:
1230 6eac821c202c dirstate: two more stat -> lstat changes mpm@selenic.com parents: 1228 diff changeset	384 st = os.lstat(f)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	385 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	386 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	387 found = False
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	388 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	389 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	390 found = True
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	391 break
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	392 if not found:
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	393 if inst.errno != errno.ENOENT or not badmatch:
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	394 self.ui.warn('%s: %s\n' % (
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	395 util.pathto(self.getcwd(), ff),
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	396 inst.strerror))
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	397 elif badmatch and badmatch(ff) and statmatch(ff, None):
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	398 yield 'b', ff, None
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	399 continue
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	400 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	401 cmp1 = (lambda x, y: cmp(x[1], y[1]))
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	402 sorted_ = [ x for x in findfiles(f) ]
d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	403 sorted_.sort(cmp1)
d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	404 for e in sorted_:
1487 2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	405 yield e
1392 32d8068b3e36 add a check for filetype when walking Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1276 diff changeset	406 else:
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	407 ff = util.normpath(ff)
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	408 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	409 continue
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	410 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	411 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	412 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	413 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	414 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	415 yield 'm', ff, st
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	416 self.blockignore = False
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	417
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	418 # step two run through anything left in the dc hash and yield
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	419 # if we haven't already seen it
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	420 ks = dc.keys()
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	421 ks.sort()
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	422 for k in ks:
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	423 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	424 yield 'm', k, None
669 8aa2a282eda4 .hgignore speedups patch incorporating Matt's feedback. mwilli2@localhost.localdomain parents: 667 diff changeset	425
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2008 diff changeset	426 def changes(self, files=None, match=util.always, show_ignored=None):
a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2008 diff changeset	427 lookup, modified, added, unknown, ignored = [], [], [], [], []
861 cbe5c4d016b7 dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Thomas Arendsen Hein <thomas@intevation.de> parents: 856 diff changeset	428 removed, deleted = [], []
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	429
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2008 diff changeset	430 for src, fn, st in self.statwalk(files, match, ignored=show_ignored):
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	431 try:
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	432 type_, mode, size, time = self[fn]
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	433 except KeyError:
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2008 diff changeset	434 if show_ignored and self.ignore(fn):
a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2008 diff changeset	435 ignored.append(fn)
a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2008 diff changeset	436 else:
a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2008 diff changeset	437 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	438 continue
1476 17e8c70fb670 fix dirstate.change: it should walk ignored files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1471 diff changeset	439 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	440 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	441 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	442 try:
1510 755e7ac351ef use self.{w,}join when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1491 diff changeset	443 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	444 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	445 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	446 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	447 raise
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	448 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	449 # 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	450 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	451 nonexistent = False
1476 17e8c70fb670 fix dirstate.change: it should walk ignored files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1471 diff changeset	452 # 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	453 # who are not removed in the dirstate ?
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	454 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	455 deleted.append(fn)
17e8c70fb670 fix dirstate.change: it should walk ignored files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1471 diff changeset	456 continue
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	457 # check the common case first
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	458 if type_ == 'n':
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	459 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	460 st = os.stat(fn)
1755 a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	461 if size >= 0 and (size != st.st_size
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	462 or (mode ^ st.st_mode) & 0100):
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	463 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	464 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	465 lookup.append(fn)
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	466 elif type_ == 'm':
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	467 modified.append(fn)
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	468 elif type_ == 'a':
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	469 added.append(fn)
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	470 elif type_ == 'r':
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	471 removed.append(fn)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	472
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2008 diff changeset	473 return (lookup, modified, added, removed, deleted, unknown, ignored)

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/dirstate.py @ 2161:12e11413ca19