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