author | Matt Mackall <mpm@selenic.com> |
Wed, 26 Oct 2005 16:32:50 -0700 | |
changeset 1456 | 214f42f23a3b |
parent 1402 | 9d2c2e6b32b5 |
child 1471 | f56f38a1a85f |
permissions | -rw-r--r-- |
1089 | 1 |
""" |
2 |
dirstate.py - working directory tracking for mercurial |
|
3 |
||
4 |
Copyright 2005 Matt Mackall <mpm@selenic.com> |
|
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 |
import struct, os |
11 |
from node import * |
|
1400
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
1396
diff
changeset
|
12 |
from i18n import gettext as _ |
262 | 13 |
from demandload import * |
1104 | 14 |
demandload(globals(), "time bisect stat util re") |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
15 |
|
220 | 16 |
class dirstate: |
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 |
363 | 24 |
self.copies = {} |
723 | 25 |
self.ignorefunc = None |
1183 | 26 |
self.blockignore = False |
723 | 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 '' |
a82eae840447
Teach walk code about absolute paths.
Bryan O'Sullivan <bos@serpentine.com>
parents:
839
diff
changeset
|
34 |
return cwd[len(self.root) + 1:] |
a82eae840447
Teach walk code about absolute paths.
Bryan O'Sullivan <bos@serpentine.com>
parents:
839
diff
changeset
|
35 |
|
1270
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
36 |
def hgignore(self): |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
37 |
'''return the contents of .hgignore as a list of patterns. |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
38 |
|
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
39 |
trailing white space is dropped. |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
40 |
the escape character is backslash. |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
41 |
comments start with #. |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
42 |
empty lines are skipped. |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
43 |
|
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
44 |
lines can be of the following formats: |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
45 |
|
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
46 |
syntax: regexp # defaults following lines to non-rooted regexps |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
47 |
syntax: glob # defaults following lines to non-rooted globs |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
48 |
re:pattern # non-rooted regular expression |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
49 |
glob:pattern # non-rooted glob |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
50 |
pattern # pattern of the current default type''' |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
51 |
syntaxes = {'re': 'relre:', 'regexp': 'relre:', 'glob': 'relglob:'} |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
52 |
def parselines(fp): |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
53 |
for line in fp: |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
54 |
escape = False |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
55 |
for i in xrange(len(line)): |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
56 |
if escape: escape = False |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
57 |
elif line[i] == '\\': escape = True |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
58 |
elif line[i] == '#': break |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
59 |
line = line[:i].rstrip() |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
60 |
if line: yield line |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
61 |
pats = [] |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
62 |
try: |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
63 |
fp = open(self.wjoin('.hgignore')) |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
64 |
syntax = 'relre:' |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
65 |
for line in parselines(fp): |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
66 |
if line.startswith('syntax:'): |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
67 |
s = line[7:].strip() |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
68 |
try: |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
69 |
syntax = syntaxes[s] |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
70 |
except KeyError: |
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
|
71 |
self.ui.warn(_("ignoring invalid syntax '%s'\n") % s) |
1270
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
72 |
continue |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
73 |
pat = syntax + line |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
74 |
for s in syntaxes.values(): |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
75 |
if line.startswith(s): |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
76 |
pat = line |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
77 |
break |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
78 |
pats.append(pat) |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
79 |
except IOError: pass |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
80 |
return pats |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
81 |
|
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
82 |
def ignore(self, fn): |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
83 |
'''default match function used by dirstate and localrepository. |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
84 |
this honours the .hgignore file, and nothing more.''' |
1183 | 85 |
if self.blockignore: |
86 |
return False |
|
723 | 87 |
if not self.ignorefunc: |
1271
9ab14ca22e37
Fix ignore regression.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1270
diff
changeset
|
88 |
ignore = self.hgignore() |
9ab14ca22e37
Fix ignore regression.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1270
diff
changeset
|
89 |
if ignore: |
9ab14ca22e37
Fix ignore regression.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1270
diff
changeset
|
90 |
files, self.ignorefunc, anypats = util.matcher(self.root, |
9ab14ca22e37
Fix ignore regression.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1270
diff
changeset
|
91 |
inc=ignore) |
9ab14ca22e37
Fix ignore regression.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1270
diff
changeset
|
92 |
else: |
9ab14ca22e37
Fix ignore regression.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1270
diff
changeset
|
93 |
self.ignorefunc = util.never |
1270
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
94 |
return self.ignorefunc(fn) |
220 | 95 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
96 |
def __del__(self): |
220 | 97 |
if self.dirty: |
98 |
self.write() |
|
99 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
100 |
def __getitem__(self, key): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
101 |
try: |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
102 |
return self.map[key] |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
103 |
except TypeError: |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
104 |
self.read() |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
105 |
return self[key] |
220 | 106 |
|
107 |
def __contains__(self, key): |
|
108 |
if not self.map: self.read() |
|
109 |
return key in self.map |
|
110 |
||
227 | 111 |
def parents(self): |
112 |
if not self.pl: |
|
113 |
self.read() |
|
114 |
return self.pl |
|
115 |
||
723 | 116 |
def markdirty(self): |
117 |
if not self.dirty: |
|
118 |
self.dirty = 1 |
|
119 |
||
1062 | 120 |
def setparents(self, p1, p2=nullid): |
1394
b20b683e8d95
dirstate: make sure we read the dirstate before setting parents
Matt Mackall <mpm@selenic.com>
parents:
1392
diff
changeset
|
121 |
if not self.pl: |
b20b683e8d95
dirstate: make sure we read the dirstate before setting parents
Matt Mackall <mpm@selenic.com>
parents:
1392
diff
changeset
|
122 |
self.read() |
723 | 123 |
self.markdirty() |
227 | 124 |
self.pl = p1, p2 |
125 |
||
220 | 126 |
def state(self, key): |
127 |
try: |
|
128 |
return self[key][0] |
|
129 |
except KeyError: |
|
130 |
return "?" |
|
131 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
132 |
def read(self): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
133 |
if self.map is not None: return self.map |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
134 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
135 |
self.map = {} |
227 | 136 |
self.pl = [nullid, nullid] |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
137 |
try: |
220 | 138 |
st = self.opener("dirstate").read() |
311 | 139 |
if not st: return |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
140 |
except: return |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
141 |
|
227 | 142 |
self.pl = [st[:20], st[20: 40]] |
143 |
||
144 |
pos = 40 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
145 |
while pos < len(st): |
220 | 146 |
e = struct.unpack(">cllll", st[pos:pos+17]) |
147 |
l = e[4] |
|
148 |
pos += 17 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
149 |
f = st[pos:pos + l] |
515 | 150 |
if '\0' in f: |
363 | 151 |
f, c = f.split('\0') |
152 |
self.copies[f] = c |
|
220 | 153 |
self.map[f] = e[:4] |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
154 |
pos += l |
363 | 155 |
|
156 |
def copy(self, source, dest): |
|
157 |
self.read() |
|
723 | 158 |
self.markdirty() |
363 | 159 |
self.copies[dest] = source |
160 |
||
161 |
def copied(self, file): |
|
162 |
return self.copies.get(file, None) |
|
515 | 163 |
|
862
d70c1c31fd45
Fix 3-way-merge of original parent, workdir and new parent.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
861
diff
changeset
|
164 |
def update(self, files, state, **kw): |
220 | 165 |
''' current states: |
166 |
n normal |
|
231 | 167 |
m needs merging |
220 | 168 |
r marked for removal |
169 |
a marked for addition''' |
|
170 |
||
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
171 |
if not files: return |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
172 |
self.read() |
723 | 173 |
self.markdirty() |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
174 |
for f in files: |
220 | 175 |
if state == "r": |
176 |
self.map[f] = ('r', 0, 0, 0) |
|
177 |
else: |
|
1230 | 178 |
s = os.lstat(os.path.join(self.root, f)) |
862
d70c1c31fd45
Fix 3-way-merge of original parent, workdir and new parent.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
861
diff
changeset
|
179 |
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
|
180 |
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
|
181 |
self.map[f] = (state, s.st_mode, st_size, st_mtime) |
1117 | 182 |
if self.copies.has_key(f): |
183 |
del self.copies[f] |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
184 |
|
220 | 185 |
def forget(self, files): |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
186 |
if not files: return |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
187 |
self.read() |
723 | 188 |
self.markdirty() |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
189 |
for f in files: |
20 | 190 |
try: |
191 |
del self.map[f] |
|
192 |
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
|
193 |
self.ui.warn(_("not in dirstate: %s!\n") % f) |
20 | 194 |
pass |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
195 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
196 |
def clear(self): |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
197 |
self.map = {} |
723 | 198 |
self.markdirty() |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
199 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
200 |
def write(self): |
220 | 201 |
st = self.opener("dirstate", "w") |
227 | 202 |
st.write("".join(self.pl)) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
203 |
for f, e in self.map.items(): |
363 | 204 |
c = self.copied(f) |
205 |
if c: |
|
206 |
f = f + "\0" + c |
|
220 | 207 |
e = struct.pack(">cllll", e[0], e[1], e[2], e[3], len(f)) |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
208 |
st.write(e + f) |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
209 |
self.dirty = 0 |
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
210 |
|
879 | 211 |
def filterfiles(self, files): |
212 |
ret = {} |
|
213 |
unknown = [] |
|
214 |
||
215 |
for x in files: |
|
216 |
if x is '.': |
|
217 |
return self.map.copy() |
|
218 |
if x not in self.map: |
|
219 |
unknown.append(x) |
|
220 |
else: |
|
221 |
ret[x] = self.map[x] |
|
919 | 222 |
|
879 | 223 |
if not unknown: |
224 |
return ret |
|
225 |
||
226 |
b = self.map.keys() |
|
227 |
b.sort() |
|
228 |
blen = len(b) |
|
229 |
||
230 |
for x in unknown: |
|
231 |
bs = bisect.bisect(b, x) |
|
919 | 232 |
if bs != 0 and b[bs-1] == x: |
879 | 233 |
ret[x] = self.map[x] |
234 |
continue |
|
235 |
while bs < blen: |
|
236 |
s = b[bs] |
|
237 |
if len(s) > len(x) and s.startswith(x) and s[len(x)] == '/': |
|
238 |
ret[s] = self.map[s] |
|
239 |
else: |
|
240 |
break |
|
241 |
bs += 1 |
|
242 |
return ret |
|
243 |
||
1062 | 244 |
def walk(self, files=None, match=util.always, dc=None): |
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
245 |
self.read() |
879 | 246 |
|
723 | 247 |
# walk all files by default |
879 | 248 |
if not files: |
249 |
files = [self.root] |
|
250 |
if not dc: |
|
251 |
dc = self.map.copy() |
|
252 |
elif not dc: |
|
253 |
dc = self.filterfiles(files) |
|
919 | 254 |
|
1183 | 255 |
def statmatch(file, stat): |
1224
cc61d366bc3b
Fix Windows status problem from new dirstate walk code
mpm@selenic.com
parents:
1183
diff
changeset
|
256 |
file = util.pconvert(file) |
1183 | 257 |
if file not in dc and self.ignore(file): |
258 |
return False |
|
259 |
return match(file) |
|
1224
cc61d366bc3b
Fix Windows status problem from new dirstate walk code
mpm@selenic.com
parents:
1183
diff
changeset
|
260 |
|
1183 | 261 |
return self.walkhelper(files=files, statmatch=statmatch, dc=dc) |
262 |
||
263 |
# walk recursively through the directory tree, finding all files |
|
264 |
# matched by the statmatch function |
|
1224
cc61d366bc3b
Fix Windows status problem from new dirstate walk code
mpm@selenic.com
parents:
1183
diff
changeset
|
265 |
# |
1183 | 266 |
# results are yielded in a tuple (src, filename), where src is one of: |
267 |
# 'f' the file was found in the directory tree |
|
268 |
# 'm' the file was only in the dirstate and not in the tree |
|
269 |
# |
|
270 |
# dc is an optional arg for the current dirstate. dc is not modified |
|
271 |
# directly by this function, but might be modified by your statmatch call. |
|
272 |
# |
|
273 |
def walkhelper(self, files, statmatch, dc): |
|
1392
32d8068b3e36
add a check for filetype when walking
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1276
diff
changeset
|
274 |
def supported_type(f, st): |
32d8068b3e36
add a check for filetype when walking
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1276
diff
changeset
|
275 |
if stat.S_ISREG(st.st_mode): |
32d8068b3e36
add a check for filetype when walking
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1276
diff
changeset
|
276 |
return True |
32d8068b3e36
add a check for filetype when walking
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1276
diff
changeset
|
277 |
else: |
32d8068b3e36
add a check for filetype when walking
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1276
diff
changeset
|
278 |
kind = 'unknown' |
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
|
279 |
if stat.S_ISCHR(st.st_mode): kind = _('character device') |
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
|
280 |
elif stat.S_ISBLK(st.st_mode): kind = _('block device') |
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
|
281 |
elif stat.S_ISFIFO(st.st_mode): kind = _('fifo') |
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
|
282 |
elif stat.S_ISLNK(st.st_mode): kind = _('symbolic link') |
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
|
283 |
elif stat.S_ISSOCK(st.st_mode): kind = _('socket') |
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
|
284 |
elif stat.S_ISDIR(st.st_mode): kind = _('directory') |
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
|
285 |
self.ui.warn(_('%s: unsupported file type (type is %s)\n') % ( |
1392
32d8068b3e36
add a check for filetype when walking
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1276
diff
changeset
|
286 |
util.pathto(self.getcwd(), f), |
32d8068b3e36
add a check for filetype when walking
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1276
diff
changeset
|
287 |
kind)) |
32d8068b3e36
add a check for filetype when walking
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1276
diff
changeset
|
288 |
return False |
32d8068b3e36
add a check for filetype when walking
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1276
diff
changeset
|
289 |
|
1183 | 290 |
# recursion free walker, faster than os.walk. |
291 |
def findfiles(s): |
|
292 |
retfiles = [] |
|
293 |
work = [s] |
|
294 |
while work: |
|
295 |
top = work.pop() |
|
296 |
names = os.listdir(top) |
|
297 |
names.sort() |
|
298 |
# nd is the top of the repository dir tree |
|
299 |
nd = util.normpath(top[len(self.root) + 1:]) |
|
300 |
if nd == '.': nd = '' |
|
301 |
for f in names: |
|
302 |
np = os.path.join(nd, f) |
|
303 |
if seen(np): |
|
304 |
continue |
|
305 |
p = os.path.join(top, f) |
|
1228
db950da49539
Fix dangling symlink bug in dirstate walk code
mpm@selenic.com
parents:
1224
diff
changeset
|
306 |
# don't trip over symlinks |
db950da49539
Fix dangling symlink bug in dirstate walk code
mpm@selenic.com
parents:
1224
diff
changeset
|
307 |
st = os.lstat(p) |
1183 | 308 |
if stat.S_ISDIR(st.st_mode): |
309 |
ds = os.path.join(nd, f +'/') |
|
310 |
if statmatch(ds, st): |
|
311 |
work.append(p) |
|
1396
8c3e2a254257
check if a file is ignored before complaining if it is an unsupported type
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1394
diff
changeset
|
312 |
elif statmatch(np, st) and supported_type(np, st): |
8c3e2a254257
check if a file is ignored before complaining if it is an unsupported type
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1394
diff
changeset
|
313 |
yield util.pconvert(np) |
1183 | 314 |
|
1392
32d8068b3e36
add a check for filetype when walking
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1276
diff
changeset
|
315 |
|
821
72d9bd4841f3
Ensure that dirstate.walk only yields names once.
Bryan O'Sullivan <bos@serpentine.com>
parents:
820
diff
changeset
|
316 |
known = {'.hg': 1} |
72d9bd4841f3
Ensure that dirstate.walk only yields names once.
Bryan O'Sullivan <bos@serpentine.com>
parents:
820
diff
changeset
|
317 |
def seen(fn): |
72d9bd4841f3
Ensure that dirstate.walk only yields names once.
Bryan O'Sullivan <bos@serpentine.com>
parents:
820
diff
changeset
|
318 |
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
|
319 |
known[fn] = 1 |
1183 | 320 |
|
321 |
# step one, find all files that match our criteria |
|
322 |
files.sort() |
|
323 |
for ff in util.unique(files): |
|
324 |
f = os.path.join(self.root, ff) |
|
325 |
try: |
|
1230 | 326 |
st = os.lstat(f) |
1183 | 327 |
except OSError, inst: |
328 |
if ff not in dc: self.ui.warn('%s: %s\n' % ( |
|
329 |
util.pathto(self.getcwd(), ff), |
|
330 |
inst.strerror)) |
|
331 |
continue |
|
332 |
if stat.S_ISDIR(st.st_mode): |
|
333 |
sorted = [ x for x in findfiles(f) ] |
|
334 |
sorted.sort() |
|
335 |
for fl in sorted: |
|
336 |
yield 'f', fl |
|
1392
32d8068b3e36
add a check for filetype when walking
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1276
diff
changeset
|
337 |
else: |
1183 | 338 |
ff = util.normpath(ff) |
339 |
if seen(ff): |
|
884
087771ebe2e6
Fix walk code for files that do not exist anywhere, and unhandled types.
Bryan O'Sullivan <bos@serpentine.com>
parents:
883
diff
changeset
|
340 |
continue |
1183 | 341 |
found = False |
342 |
self.blockignore = True |
|
1396
8c3e2a254257
check if a file is ignored before complaining if it is an unsupported type
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1394
diff
changeset
|
343 |
if statmatch(ff, st) and supported_type(ff, st): |
1183 | 344 |
found = True |
345 |
self.blockignore = False |
|
346 |
if found: |
|
884
087771ebe2e6
Fix walk code for files that do not exist anywhere, and unhandled types.
Bryan O'Sullivan <bos@serpentine.com>
parents:
883
diff
changeset
|
347 |
yield 'f', ff |
536 | 348 |
|
1183 | 349 |
# step two run through anything left in the dc hash and yield |
350 |
# if we haven't already seen it |
|
351 |
ks = dc.keys() |
|
352 |
ks.sort() |
|
353 |
for k in ks: |
|
354 |
if not seen(k) and (statmatch(k, None)): |
|
726
809a870a0e73
Add a source designator to the walk methods.
Bryan O'Sullivan <bos@serpentine.com>
parents:
725
diff
changeset
|
355 |
yield 'm', k |
669
8aa2a282eda4
.hgignore speedups patch incorporating Matt's feedback.
mwilli2@localhost.localdomain
parents:
667
diff
changeset
|
356 |
|
861
cbe5c4d016b7
dirstate.changes() now distinguishes 'hg remove'd or just deleted files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
856
diff
changeset
|
357 |
def changes(self, files=None, match=util.always): |
723 | 358 |
self.read() |
879 | 359 |
if not files: |
1183 | 360 |
files = [self.root] |
879 | 361 |
dc = self.map.copy() |
362 |
else: |
|
363 |
dc = self.filterfiles(files) |
|
861
cbe5c4d016b7
dirstate.changes() now distinguishes 'hg remove'd or just deleted files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
856
diff
changeset
|
364 |
lookup, modified, added, unknown = [], [], [], [] |
cbe5c4d016b7
dirstate.changes() now distinguishes 'hg remove'd or just deleted files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
856
diff
changeset
|
365 |
removed, deleted = [], [] |
723 | 366 |
|
1183 | 367 |
# statmatch function to eliminate entries from the dirstate copy |
368 |
# and put files into the appropriate array. This gets passed |
|
369 |
# to the walking code |
|
370 |
def statmatch(fn, s): |
|
1224
cc61d366bc3b
Fix Windows status problem from new dirstate walk code
mpm@selenic.com
parents:
1183
diff
changeset
|
371 |
fn = util.pconvert(fn) |
1183 | 372 |
def checkappend(l, fn): |
373 |
if match is util.always or match(fn): |
|
374 |
l.append(fn) |
|
1224
cc61d366bc3b
Fix Windows status problem from new dirstate walk code
mpm@selenic.com
parents:
1183
diff
changeset
|
375 |
|
1183 | 376 |
if not s or stat.S_ISDIR(s.st_mode): |
1268
c631f26346ca
Fix performance of dirstate.changes with ignored directories.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1245
diff
changeset
|
377 |
if self.ignore(fn): return False |
c631f26346ca
Fix performance of dirstate.changes with ignored directories.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1245
diff
changeset
|
378 |
return match(fn) |
1183 | 379 |
|
380 |
c = dc.pop(fn, None) |
|
861
cbe5c4d016b7
dirstate.changes() now distinguishes 'hg remove'd or just deleted files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
856
diff
changeset
|
381 |
if c: |
1183 | 382 |
type, mode, size, time = c |
383 |
# check the common case first |
|
384 |
if type == 'n': |
|
385 |
if size != s.st_size or (mode ^ s.st_mode) & 0100: |
|
386 |
checkappend(modified, fn) |
|
387 |
elif time != s.st_mtime: |
|
388 |
checkappend(lookup, fn) |
|
389 |
elif type == 'm': |
|
390 |
checkappend(modified, fn) |
|
391 |
elif type == 'a': |
|
392 |
checkappend(added, fn) |
|
393 |
elif type == 'r': |
|
394 |
checkappend(unknown, fn) |
|
1270
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
395 |
elif not self.ignore(fn) and match(fn): |
fc3b41570082
Switch to new syntax for .hgignore files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1268
diff
changeset
|
396 |
unknown.append(fn) |
1183 | 397 |
# return false because we've already handled all cases above. |
398 |
# there's no need for the walking code to process the file |
|
399 |
# any further. |
|
400 |
return False |
|
536 | 401 |
|
1183 | 402 |
# because our statmatch always returns false, self.walk will only |
403 |
# return files in the dirstate map that are not present in the FS. |
|
404 |
# But, we still need to iterate through the results to force the |
|
405 |
# walk to complete |
|
406 |
for src, fn in self.walkhelper(files, statmatch, dc): |
|
407 |
pass |
|
408 |
||
1276
25e5b1086624
Fix dirstate.changes for ignored directories.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1271
diff
changeset
|
409 |
# there may be patterns in the .hgignore file that prevent us |
25e5b1086624
Fix dirstate.changes for ignored directories.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1271
diff
changeset
|
410 |
# from examining entire directories in the dirstate map, so we |
25e5b1086624
Fix dirstate.changes for ignored directories.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1271
diff
changeset
|
411 |
# go back and explicitly examine any matching files we've |
25e5b1086624
Fix dirstate.changes for ignored directories.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1271
diff
changeset
|
412 |
# ignored |
25e5b1086624
Fix dirstate.changes for ignored directories.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1271
diff
changeset
|
413 |
unexamined = [fn for fn in dc.iterkeys() |
25e5b1086624
Fix dirstate.changes for ignored directories.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1271
diff
changeset
|
414 |
if self.ignore(fn) and match(fn)] |
25e5b1086624
Fix dirstate.changes for ignored directories.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1271
diff
changeset
|
415 |
|
25e5b1086624
Fix dirstate.changes for ignored directories.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1271
diff
changeset
|
416 |
for src, fn in self.walkhelper(unexamined, statmatch, dc): |
25e5b1086624
Fix dirstate.changes for ignored directories.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1271
diff
changeset
|
417 |
pass |
25e5b1086624
Fix dirstate.changes for ignored directories.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1271
diff
changeset
|
418 |
|
1183 | 419 |
# anything left in dc didn't exist in the filesystem |
1276
25e5b1086624
Fix dirstate.changes for ignored directories.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1271
diff
changeset
|
420 |
for fn, c in dc.iteritems(): |
25e5b1086624
Fix dirstate.changes for ignored directories.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1271
diff
changeset
|
421 |
if not match(fn): continue |
861
cbe5c4d016b7
dirstate.changes() now distinguishes 'hg remove'd or just deleted files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
856
diff
changeset
|
422 |
if c[0] == 'r': |
cbe5c4d016b7
dirstate.changes() now distinguishes 'hg remove'd or just deleted files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
856
diff
changeset
|
423 |
removed.append(fn) |
cbe5c4d016b7
dirstate.changes() now distinguishes 'hg remove'd or just deleted files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
856
diff
changeset
|
424 |
else: |
cbe5c4d016b7
dirstate.changes() now distinguishes 'hg remove'd or just deleted files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
856
diff
changeset
|
425 |
deleted.append(fn) |
cbe5c4d016b7
dirstate.changes() now distinguishes 'hg remove'd or just deleted files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
856
diff
changeset
|
426 |
return (lookup, modified, added, removed + deleted, unknown) |