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

annotate mercurial/dirstate.py @ 4230:c93562fb12cc

Fix handling of paths when run outside the repo. The main problem was that dirstate.getcwd() returned just "", which was interpreted as "we're at the repo root". It now returns an absolute path. The util.pathto function was also changed to deal with the "cwd is an absolute path" case.

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
date	Fri, 16 Mar 2007 00:22:58 -0300
parents	24c22a3f2ef8
children	0d51eb296fb9 1b9fc3f48861

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
2859 345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2836 diff changeset	4 Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
1089 142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	5
142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	6 This software may be used and distributed according to the terms
142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	7 of the GNU General Public License, incorporated herein by reference.
142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	8 """
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	9
1094 221b5252864c Adjust some imports mpm@selenic.com parents: 1093 1089 diff changeset	10 from node import *
1400 cf9a1233738a i18n first part: make '_' available for files who need it Benoit Boissinot <benoit.boissinot@ens-lyon.org parents: 1396 diff changeset	11 from i18n import gettext as _
262 3db700146536 implement demand loading hack mpm@selenic.com parents: 256 diff changeset	12 from demandload import *
2953 3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	13 demandload(globals(), "struct os time bisect stat strutil util re errno")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	14
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1541 diff changeset	15 class dirstate(object):
2393 5083cba2a777 dirstate: refactor the dirstate binary format, remove magic numbers Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2063 diff changeset	16 format = ">cllll"
5083cba2a777 dirstate: refactor the dirstate binary format, remove magic numbers Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2063 diff changeset	17
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	18 def __init__(self, opener, ui, root):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	19 self.opener = opener
244 43105253cf5e root relative IO and valid commit states mpm@selenic.com parents: 241 diff changeset	20 self.root = root
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	21 self.dirty = 0
20 a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	22 self.ui = ui
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	23 self.map = None
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	24 self.pl = None
2953 3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	25 self.dirs = None
3154 b1f10d3223c1 dirstate: add copies function Matt Mackall <mpm@selenic.com> parents: 2962 diff changeset	26 self.copymap = {}
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	27 self.ignorefunc = None
4179 7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	28 self._branch = None
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	29
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	30 def wjoin(self, f):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	31 return os.path.join(self.root, f)
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	32
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	33 def getcwd(self):
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	34 cwd = os.getcwd()
a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	35 if cwd == self.root: return ''
3665 63e173a4ffbc issue228: Fix repositories at the filesystem root (/ or C:\) Thomas Arendsen Hein <thomas@intevation.de> parents: 3607 diff changeset	36 # self.root ends with a path separator if self.root is '/' or 'C:\'
4230 c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	37 rootsep = self.root
c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	38 if not rootsep.endswith(os.sep):
c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	39 rootsep += os.sep
c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	40 if cwd.startswith(rootsep):
c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	41 return cwd[len(rootsep):]
c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	42 else:
c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	43 # we're outside the repo. return an absolute path.
c93562fb12cc Fix handling of paths when run outside the repo. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4229 diff changeset	44 return cwd
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 839 diff changeset	45
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	46 def hgignore(self):
2003 62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	47 '''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	48
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	49 the files parsed for patterns include:
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	50 .hgignore in the repository root
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	51 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	52
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	53 trailing white space is dropped.
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	54 the escape character is backslash.
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	55 comments start with #.
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	56 empty lines are skipped.
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	57
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	58 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	59
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	60 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	61 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	62 re:pattern # non-rooted regular expression
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	63 glob:pattern # non-rooted glob
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	64 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	65 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	66 def parselines(fp):
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	67 for line in fp:
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	68 escape = False
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	69 for i in xrange(len(line)):
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	70 if escape: escape = False
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	71 elif line[i] == '\\': escape = True
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	72 elif line[i] == '#': break
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	73 line = line[:i].rstrip()
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	74 if line: yield line
2004 7dd6317ab4fd Add warning if user-configured hgignore file isn't found mcmillen@cs.cmu.edu parents: 2003 diff changeset	75 repoignore = self.wjoin('.hgignore')
7dd6317ab4fd Add warning if user-configured hgignore file isn't found mcmillen@cs.cmu.edu parents: 2003 diff changeset	76 files = [repoignore]
2003 62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	77 files.extend(self.ui.hgignorefiles())
2005 bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	78 pats = {}
2003 62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	79 for f in files:
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	80 try:
2005 bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	81 pats[f] = []
2003 62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	82 fp = open(f)
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	83 syntax = 'relre:'
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	84 for line in parselines(fp):
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	85 if line.startswith('syntax:'):
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	86 s = line[7:].strip()
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	87 try:
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	88 syntax = syntaxes[s]
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	89 except KeyError:
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	90 self.ui.warn(_("%s: ignoring invalid "
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	91 "syntax '%s'\n") % (f, s))
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	92 continue
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	93 pat = syntax + line
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	94 for s in syntaxes.values():
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	95 if line.startswith(s):
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	96 pat = line
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	97 break
2005 bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	98 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	99 except IOError, inst:
2004 7dd6317ab4fd Add warning if user-configured hgignore file isn't found mcmillen@cs.cmu.edu parents: 2003 diff changeset	100 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	101 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	102 " '%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	103 return pats
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	104
fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	105 def ignore(self, fn):
2003 62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	106 '''default match function used by dirstate and
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	107 localrepository. this honours the repository .hgignore file
62647394e368 Implementation of per-user .hgignore. mcmillen@cs.cmu.edu parents: 1794 diff changeset	108 and any other files specified in the [ui] section of .hgrc.'''
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	109 if not self.ignorefunc:
1271 9ab14ca22e37 Fix ignore regression. Bryan O'Sullivan <bos@serpentine.com> parents: 1270 diff changeset	110 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	111 allpats = []
11ffa1267185 Don't ignore everything if all hgignore files are empty. Thomas Arendsen Hein <thomas@intevation.de> parents: 2006 diff changeset	112 [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	113 if allpats:
2005 bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	114 try:
bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	115 files, self.ignorefunc, anypats = (
bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	116 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	117 except util.Abort:
bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	118 # 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	119 for f, patlist in ignore.items():
bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	120 files, self.ignorefunc, anypats = (
bc47af2d3693 On error parsing hgignore file, print the correct filename. mcmillen@cs.cmu.edu parents: 2004 diff changeset	121 util.matcher(self.root, inc=patlist, src=f))
1271 9ab14ca22e37 Fix ignore regression. Bryan O'Sullivan <bos@serpentine.com> parents: 1270 diff changeset	122 else:
9ab14ca22e37 Fix ignore regression. Bryan O'Sullivan <bos@serpentine.com> parents: 1270 diff changeset	123 self.ignorefunc = util.never
1270 fc3b41570082 Switch to new syntax for .hgignore files. Bryan O'Sullivan <bos@serpentine.com> parents: 1268 diff changeset	124 return self.ignorefunc(fn)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	125
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	126 def __del__(self):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	127 if self.dirty:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	128 self.write()
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	129
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	130 def __getitem__(self, key):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	131 try:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	132 return self.map[key]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	133 except TypeError:
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	134 self.lazyread()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	135 return self[key]
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	136
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	137 def __contains__(self, key):
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	138 self.lazyread()
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	139 return key in self.map
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	140
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	141 def parents(self):
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	142 self.lazyread()
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	143 return self.pl
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	144
4179 7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	145 def branch(self):
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	146 if not self._branch:
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	147 try:
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	148 self._branch = self.opener("branch").read().strip()\
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	149 or "default"
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	150 except IOError:
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	151 self._branch = "default"
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	152 return self._branch
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	153
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	154 def markdirty(self):
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	155 if not self.dirty:
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	156 self.dirty = 1
9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	157
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1040 diff changeset	158 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	159 self.lazyread()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	160 self.markdirty()
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	161 self.pl = p1, p2
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	162
4179 7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	163 def setbranch(self, branch):
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	164 self._branch = branch
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	165 self.opener("branch", "w").write(branch + '\n')
7e1c8a565a4f Move branch read/write to dirstate where it belongs Matt Mackall <mpm@selenic.com> parents: 4172 diff changeset	166
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	167 def state(self, key):
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	168 try:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	169 return self[key][0]
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	170 except KeyError:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	171 return "?"
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	172
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	173 def lazyread(self):
a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	174 if self.map is None:
a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	175 self.read()
a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	176
2427 150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	177 def parse(self, st):
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	178 self.pl = [st[:20], st[20: 40]]
f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	179
2427 150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	180 # deref fields so they will be local in loop
150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	181 map = self.map
3154 b1f10d3223c1 dirstate: add copies function Matt Mackall <mpm@selenic.com> parents: 2962 diff changeset	182 copymap = self.copymap
2427 150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	183 format = self.format
150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	184 unpack = struct.unpack
150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	185
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	186 pos = 40
2427 150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	187 e_size = struct.calcsize(format)
150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	188
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	189 while pos < len(st):
2425 be2fd6398d50 dirstate: speed up inner loop of read. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2393 diff changeset	190 newpos = pos + e_size
2427 150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	191 e = unpack(format, st[pos:newpos])
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	192 l = e[4]
2425 be2fd6398d50 dirstate: speed up inner loop of read. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2393 diff changeset	193 pos = newpos
be2fd6398d50 dirstate: speed up inner loop of read. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2393 diff changeset	194 newpos = pos + l
be2fd6398d50 dirstate: speed up inner loop of read. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2393 diff changeset	195 f = st[pos:newpos]
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	196 if '\0' in f:
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	197 f, c = f.split('\0')
3154 b1f10d3223c1 dirstate: add copies function Matt Mackall <mpm@selenic.com> parents: 2962 diff changeset	198 copymap[f] = c
2427 150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	199 map[f] = e[:4]
2425 be2fd6398d50 dirstate: speed up inner loop of read. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2393 diff changeset	200 pos = newpos
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	201
2427 150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	202 def read(self):
150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	203 self.map = {}
150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	204 self.pl = [nullid, nullid]
150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	205 try:
150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	206 st = self.opener("dirstate").read()
150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	207 if st:
150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	208 self.parse(st)
150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	209 except IOError, err:
150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	210 if err.errno != errno.ENOENT: raise
150cde10ea21 dirstate.read: make 15% faster. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2425 diff changeset	211
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	212 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	213 self.lazyread()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	214 self.markdirty()
3154 b1f10d3223c1 dirstate: add copies function Matt Mackall <mpm@selenic.com> parents: 2962 diff changeset	215 self.copymap[dest] = source
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	216
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	217 def copied(self, file):
3154 b1f10d3223c1 dirstate: add copies function Matt Mackall <mpm@selenic.com> parents: 2962 diff changeset	218 return self.copymap.get(file, None)
b1f10d3223c1 dirstate: add copies function Matt Mackall <mpm@selenic.com> parents: 2962 diff changeset	219
b1f10d3223c1 dirstate: add copies function Matt Mackall <mpm@selenic.com> parents: 2962 diff changeset	220 def copies(self):
b1f10d3223c1 dirstate: add copies function Matt Mackall <mpm@selenic.com> parents: 2962 diff changeset	221 return self.copymap
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	222
2953 3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	223 def initdirs(self):
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	224 if self.dirs is None:
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	225 self.dirs = {}
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	226 for f in self.map:
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	227 self.updatedirs(f, 1)
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3154 diff changeset	228
2953 3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	229 def updatedirs(self, path, delta):
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	230 if self.dirs is not None:
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	231 for c in strutil.findall(path, '/'):
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	232 pc = path[:c]
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	233 self.dirs.setdefault(pc, 0)
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	234 self.dirs[pc] += delta
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	235
3607 f4c9bb4ad7b1 issue352: disallow '\n' and '\r' in filenames (dirstate and manifest) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3536 diff changeset	236 def checkinterfering(self, files):
2953 3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	237 def prefixes(f):
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	238 for c in strutil.rfindall(f, '/'):
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	239 yield f[:c]
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	240 self.lazyread()
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	241 self.initdirs()
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	242 seendirs = {}
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	243 for f in files:
3607 f4c9bb4ad7b1 issue352: disallow '\n' and '\r' in filenames (dirstate and manifest) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3536 diff changeset	244 # shadows
2953 3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	245 if self.dirs.get(f):
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	246 raise util.Abort(_('directory named %r already in dirstate') %
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	247 f)
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	248 for d in prefixes(f):
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	249 if d in seendirs:
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	250 break
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	251 if d in self.map:
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	252 raise util.Abort(_('file named %r already in dirstate') %
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	253 d)
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	254 seendirs[d] = True
3607 f4c9bb4ad7b1 issue352: disallow '\n' and '\r' in filenames (dirstate and manifest) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3536 diff changeset	255 # disallowed
f4c9bb4ad7b1 issue352: disallow '\n' and '\r' in filenames (dirstate and manifest) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3536 diff changeset	256 if '\r' in f or '\n' in f:
f4c9bb4ad7b1 issue352: disallow '\n' and '\r' in filenames (dirstate and manifest) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3536 diff changeset	257 raise util.Abort(_("'\\n' and '\\r' disallowed in filenames"))
2953 3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	258
862 d70c1c31fd45 Fix 3-way-merge of original parent, workdir and new parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 861 diff changeset	259 def update(self, files, state, **kw):
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	260 ''' current states:
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	261 n normal
231 15e7c6cee929 add 'm' state to dirstates mpm@selenic.com parents: 230 diff changeset	262 m needs merging
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	263 r marked for removal
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	264 a marked for addition'''
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	265
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	266 if not files: return
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	267 self.lazyread()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	268 self.markdirty()
2953 3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	269 if state == "a":
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	270 self.initdirs()
3607 f4c9bb4ad7b1 issue352: disallow '\n' and '\r' in filenames (dirstate and manifest) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3536 diff changeset	271 self.checkinterfering(files)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	272 for f in files:
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	273 if state == "r":
3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	274 self.map[f] = ('r', 0, 0, 0)
2953 3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	275 self.updatedirs(f, -1)
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	276 else:
2953 3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	277 if state == "a":
3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	278 self.updatedirs(f, 1)
1510 755e7ac351ef use self.{w,}join when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1491 diff changeset	279 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	280 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	281 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	282 self.map[f] = (state, s.st_mode, st_size, st_mtime)
3154 b1f10d3223c1 dirstate: add copies function Matt Mackall <mpm@selenic.com> parents: 2962 diff changeset	283 if self.copymap.has_key(f):
b1f10d3223c1 dirstate: add copies function Matt Mackall <mpm@selenic.com> parents: 2962 diff changeset	284 del self.copymap[f]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	285
220 3113a94c1bff change dircache into dirstate mpm@selenic.com parents: 217 diff changeset	286 def forget(self, files):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	287 if not files: return
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	288 self.lazyread()
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	289 self.markdirty()
2953 3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	290 self.initdirs()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	291 for f in files:
20 a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	292 try:
a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	293 del self.map[f]
2953 3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	294 self.updatedirs(f, -1)
20 a664c2b624cf The actual hg remove fix from Thomas Hein mpm@selenic.com parents: 19 diff changeset	295 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	296 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	297 pass
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	298
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	299 def clear(self):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	300 self.map = {}
3154 b1f10d3223c1 dirstate: add copies function Matt Mackall <mpm@selenic.com> parents: 2962 diff changeset	301 self.copymap = {}
2953 3d5547845158 fix issue 322. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	302 self.dirs = None
1755 a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	303 self.markdirty()
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	304
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	305 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	306 self.clear()
2832 e196aa1df169 Start using manifestflags methods Matt Mackall <mpm@selenic.com> parents: 2486 diff changeset	307 for f in files:
e196aa1df169 Start using manifestflags methods Matt Mackall <mpm@selenic.com> parents: 2486 diff changeset	308 if files.execf(f):
3842 47c634bf1e92 remove unnecessary call to umask Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3665 diff changeset	309 self.map[f] = ('n', 0777, -1, 0)
1755 a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	310 else:
3842 47c634bf1e92 remove unnecessary call to umask Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3665 diff changeset	311 self.map[f] = ('n', 0666, -1, 0)
1755 a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	312 self.pl = (parent, nullid)
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	313 self.markdirty()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	314
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	315 def write(self):
1794 98b6c1cad58b only write the dirstate when something changed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1755 diff changeset	316 if not self.dirty:
98b6c1cad58b only write the dirstate when something changed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1755 diff changeset	317 return
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	318 st = self.opener("dirstate", "w", atomic=True)
227 f57519cddd3d move repo.current to dirstate.parents() mpm@selenic.com parents: 225 diff changeset	319 st.write("".join(self.pl))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	320 for f, e in self.map.items():
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	321 c = self.copied(f)
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	322 if c:
ae96b7e1318d Add hg copy mpm@selenic.com parents: 360 diff changeset	323 f = f + "\0" + c
2393 5083cba2a777 dirstate: refactor the dirstate binary format, remove magic numbers Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2063 diff changeset	324 e = struct.pack(self.format, 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	325 st.write(e + f)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	326 self.dirty = 0
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	327
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	328 def filterfiles(self, files):
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	329 ret = {}
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	330 unknown = []
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	331
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	332 for x in files:
1541 bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1529 diff changeset	333 if x == '.':
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	334 return self.map.copy()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	335 if x not in self.map:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	336 unknown.append(x)
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	337 else:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	338 ret[x] = self.map[x]
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	339
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	340 if not unknown:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	341 return ret
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	342
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	343 b = self.map.keys()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	344 b.sort()
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	345 blen = len(b)
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	346
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	347 for x in unknown:
2486 3ea8111ead90 simplify filterfiles when filtering based on a directory Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2485 diff changeset	348 bs = bisect.bisect(b, "%s%s" % (x, '/'))
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	349 while bs < blen:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	350 s = b[bs]
2485 885de96eb542 filterfiles: Search as long as the target is a prefix of current. Brendan Cully <brendan@kublai.com> parents: 2470 diff changeset	351 if len(s) > len(x) and s.startswith(x):
2486 3ea8111ead90 simplify filterfiles when filtering based on a directory Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2485 diff changeset	352 ret[s] = self.map[s]
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	353 else:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	354 break
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	355 bs += 1
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	356 return ret
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	357
1527 c13fce7167c2 don't print anything about file of unsupported type unless Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1510 diff changeset	358 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	359 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	360 return True
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	361 if verbose:
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	362 kind = 'unknown'
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	363 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	364 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	365 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	366 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	367 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	368 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	369 self.ui.warn(_('%s: unsupported file type (type is %s)\n') % (
4229 24c22a3f2ef8 pass repo.root to util.pathto() in preparation for the next patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4179 diff changeset	370 util.pathto(self.root, self.getcwd(), 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	371 kind))
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	372 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	373
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	374 def walk(self, files=None, match=util.always, badmatch=None):
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	375 # filter out the stat
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	376 for src, f, st in self.statwalk(files, match, badmatch=badmatch):
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	377 yield src, f
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	378
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	379 def statwalk(self, files=None, match=util.always, ignored=False,
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	380 badmatch=None):
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	381 '''
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	382 walk recursively through the directory tree, finding all files
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	383 matched by the match function
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	384
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	385 results are yielded in a tuple (src, filename, st), where src
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	386 is one of:
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	387 'f' the file was found in the directory tree
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	388 'm' the file was only in the dirstate and not in the tree
3532 26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3529 diff changeset	389 'b' file was not found and matched badmatch
26b556c1d01d improve walk docstrings Matt Mackall <mpm@selenic.com> parents: 3529 diff changeset	390
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	391 and st is the stat result if the file was found in the directory.
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	392 '''
1529 a208e86bbc34 add dirstate.lazyread, write atomically the dirstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1527 diff changeset	393 self.lazyread()
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	394
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	395 # walk all files by default
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	396 if not files:
4172 b36bd7534c08 statwalk: don't put self.root in the files list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4075 diff changeset	397 files = ['.']
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	398 dc = self.map.copy()
09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	399 else:
3536 ece5c53577eb small refactoring of path normalization in dirstate.statwalk Matt Mackall <mpm@selenic.com> parents: 3534 diff changeset	400 files = util.unique(files)
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	401 dc = self.filterfiles(files)
919 1458d20df2a8 whitespace cleanup mpm@selenic.com parents: 911 diff changeset	402
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	403 def imatch(file_):
3534 549cb7b640fb Simplify ignore logic in dirstate.walk Matt Mackall <mpm@selenic.com> parents: 3532 diff changeset	404 if file_ not in dc and self.ignore(file_):
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	405 return False
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	406 return match(file_)
1224 cc61d366bc3b Fix Windows status problem from new dirstate walk code mpm@selenic.com parents: 1183 diff changeset	407
3534 549cb7b640fb Simplify ignore logic in dirstate.walk Matt Mackall <mpm@selenic.com> parents: 3532 diff changeset	408 if ignored: imatch = match
549cb7b640fb Simplify ignore logic in dirstate.walk Matt Mackall <mpm@selenic.com> parents: 3532 diff changeset	409
2671 82864a2eb709 self.root == '/': prefix length computation out of the loop Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2670 diff changeset	410 # self.root may end with a path separator when self.root == '/'
82864a2eb709 self.root == '/': prefix length computation out of the loop Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2670 diff changeset	411 common_prefix_len = len(self.root)
4075 31a679ae7eef Fix dirstate fail at drive root on Windows Andrei Vermel <avermel@mail.ru> parents: 3842 diff changeset	412 if not self.root.endswith(os.sep):
2671 82864a2eb709 self.root == '/': prefix length computation out of the loop Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2670 diff changeset	413 common_prefix_len += 1
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	414 # recursion free walker, faster than os.walk.
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	415 def findfiles(s):
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	416 work = [s]
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	417 while work:
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	418 top = work.pop()
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	419 names = os.listdir(top)
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	420 names.sort()
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	421 # nd is the top of the repository dir tree
2671 82864a2eb709 self.root == '/': prefix length computation out of the loop Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2670 diff changeset	422 nd = util.normpath(top[common_prefix_len:])
2061 5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	423 if nd == '.':
5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	424 nd = ''
5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	425 else:
2063 f1fda71e134e benoit asked for comment to make avoid of recursive repo clearer. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2062 diff changeset	426 # 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	427 # 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	428 # is good on big directory.
2061 5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	429 hg = bisect.bisect_left(names, '.hg')
5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	430 if hg < len(names) and names[hg] == '.hg':
5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	431 if os.path.isdir(os.path.join(top, '.hg')):
5987c1eac2ce support nested repositories. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	432 continue
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	433 for f in names:
1562 2f97af0b522c Fix walkhelper on windows. Christian Boos <cboos@neuf.fr> parents: 1559 diff changeset	434 np = util.pconvert(os.path.join(nd, f))
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	435 if seen(np):
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	436 continue
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	437 p = os.path.join(top, f)
1228 db950da49539 Fix dangling symlink bug in dirstate walk code mpm@selenic.com parents: 1224 diff changeset	438 # don't trip over symlinks
db950da49539 Fix dangling symlink bug in dirstate walk code mpm@selenic.com parents: 1224 diff changeset	439 st = os.lstat(p)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	440 if stat.S_ISDIR(st.st_mode):
3534 549cb7b640fb Simplify ignore logic in dirstate.walk Matt Mackall <mpm@selenic.com> parents: 3532 diff changeset	441 ds = util.pconvert(os.path.join(nd, f +'/'))
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	442 if imatch(ds):
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	443 work.append(p)
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	444 if imatch(np) and np in dc:
1562 2f97af0b522c Fix walkhelper on windows. Christian Boos <cboos@neuf.fr> parents: 1559 diff changeset	445 yield 'm', np, st
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	446 elif imatch(np):
1487 2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	447 if self.supported_type(np, st):
1562 2f97af0b522c Fix walkhelper on windows. Christian Boos <cboos@neuf.fr> parents: 1559 diff changeset	448 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	449 elif np in dc:
1562 2f97af0b522c Fix walkhelper on windows. Christian Boos <cboos@neuf.fr> parents: 1559 diff changeset	450 yield 'm', np, st
1392 32d8068b3e36 add a check for filetype when walking Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1276 diff changeset	451
821 72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	452 known = {'.hg': 1}
72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	453 def seen(fn):
72d9bd4841f3 Ensure that dirstate.walk only yields names once. Bryan O'Sullivan <bos@serpentine.com> parents: 820 diff changeset	454 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	455 known[fn] = 1
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	456
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	457 # step one, find all files that match our criteria
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	458 files.sort()
3536 ece5c53577eb small refactoring of path normalization in dirstate.statwalk Matt Mackall <mpm@selenic.com> parents: 3534 diff changeset	459 for ff in files:
ece5c53577eb small refactoring of path normalization in dirstate.statwalk Matt Mackall <mpm@selenic.com> parents: 3534 diff changeset	460 nf = util.normpath(ff)
1510 755e7ac351ef use self.{w,}join when possible Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1491 diff changeset	461 f = self.wjoin(ff)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	462 try:
1230 6eac821c202c dirstate: two more stat -> lstat changes mpm@selenic.com parents: 1228 diff changeset	463 st = os.lstat(f)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	464 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	465 found = False
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	466 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	467 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	468 found = True
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	469 break
34579a67fa71 Re: [PATCH 2 of 3] remove walk warning about nonexistent files Benoit Boissinot <bboissin@gmail.com> parents: 1562 diff changeset	470 if not found:
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	471 if inst.errno != errno.ENOENT or not badmatch:
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	472 self.ui.warn('%s: %s\n' % (
4229 24c22a3f2ef8 pass repo.root to util.pathto() in preparation for the next patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4179 diff changeset	473 util.pathto(self.root, self.getcwd(), ff),
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	474 inst.strerror))
3534 549cb7b640fb Simplify ignore logic in dirstate.walk Matt Mackall <mpm@selenic.com> parents: 3532 diff changeset	475 elif badmatch and badmatch(ff) and imatch(nf):
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	476 yield 'b', ff, None
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	477 continue
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	478 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	479 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	480 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	481 sorted_.sort(cmp1)
d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	482 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	483 yield e
1392 32d8068b3e36 add a check for filetype when walking Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1276 diff changeset	484 else:
3536 ece5c53577eb small refactoring of path normalization in dirstate.statwalk Matt Mackall <mpm@selenic.com> parents: 3534 diff changeset	485 if not seen(nf) and match(nf):
1527 c13fce7167c2 don't print anything about file of unsupported type unless Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1510 diff changeset	486 if self.supported_type(ff, st, verbose=True):
3536 ece5c53577eb small refactoring of path normalization in dirstate.statwalk Matt Mackall <mpm@selenic.com> parents: 3534 diff changeset	487 yield 'f', nf, st
1487 2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	488 elif ff in dc:
3536 ece5c53577eb small refactoring of path normalization in dirstate.statwalk Matt Mackall <mpm@selenic.com> parents: 3534 diff changeset	489 yield 'm', nf, st
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 529 diff changeset	490
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	491 # step two run through anything left in the dc hash and yield
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	492 # if we haven't already seen it
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	493 ks = dc.keys()
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	494 ks.sort()
d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	495 for k in ks:
3529 09d99b7e4da0 simplify dirstate walking Matt Mackall <mpm@selenic.com> parents: 3223 diff changeset	496 if not seen(k) and imatch(k):
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	497 yield 'm', k, None
669 8aa2a282eda4 .hgignore speedups patch incorporating Matt's feedback. mwilli2@localhost.localdomain parents: 667 diff changeset	498
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2486 diff changeset	499 def status(self, files=None, match=util.always, list_ignored=False,
5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2486 diff changeset	500 list_clean=False):
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2008 diff changeset	501 lookup, modified, added, unknown, ignored = [], [], [], [], []
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2486 diff changeset	502 removed, deleted, clean = [], [], []
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	503
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2486 diff changeset	504 for src, fn, st in self.statwalk(files, match, ignored=list_ignored):
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	505 try:
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	506 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	507 except KeyError:
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2486 diff changeset	508 if list_ignored and self.ignore(fn):
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2008 diff changeset	509 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	510 else:
a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2008 diff changeset	511 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	512 continue
1476 17e8c70fb670 fix dirstate.change: it should walk ignored files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1471 diff changeset	513 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	514 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	515 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	516 try:
2429 6a8f7c3f7333 dirstate: fix call to os.lstat when st is None Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2427 diff changeset	517 st = os.lstat(self.wjoin(fn))
1487 2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	518 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	519 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	520 raise
2bc6cd62a29c fix handling of files of unsupported type in the walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1476 diff changeset	521 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	522 # 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	523 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	524 nonexistent = False
1476 17e8c70fb670 fix dirstate.change: it should walk ignored files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1471 diff changeset	525 # 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	526 # 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	527 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	528 deleted.append(fn)
17e8c70fb670 fix dirstate.change: it should walk ignored files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1471 diff changeset	529 continue
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	530 # 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	531 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	532 if not st:
2448 b77a2ef61b81 replace os.stat with os.lstat in some where. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2429 diff changeset	533 st = os.lstat(self.wjoin(fn))
1755 a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	534 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	535 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	536 modified.append(fn)
2962 882e703eaa94 dirstate.py: when comparing mtimes, use only the integer part. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2953 diff changeset	537 elif time != int(st.st_mtime):
1471 f56f38a1a85f rewrote changes function in dirstate to use generic walk code Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	538 lookup.append(fn)
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2486 diff changeset	539 elif list_clean:
5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2486 diff changeset	540 clean.append(fn)
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	541 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	542 modified.append(fn)
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	543 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	544 added.append(fn)
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1617 diff changeset	545 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	546 removed.append(fn)
1183 d9e85a75dbda Optimize dirstate walking mason@suse.com parents: 1117 diff changeset	547
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2486 diff changeset	548 return (lookup, modified, added, removed, deleted, unknown, ignored,
5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2486 diff changeset	549 clean)

Mercurial > public > mercurial-scm > hg

annotate mercurial/dirstate.py @ 4230:c93562fb12cc