Show More
@@ -1,595 +1,595 b'' | |||||
1 | """ |
|
1 | """ | |
2 | dirstate.py - working directory tracking for mercurial |
|
2 | dirstate.py - working directory tracking for mercurial | |
3 |
|
3 | |||
4 | Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
4 | Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | |
5 |
|
5 | |||
6 | This software may be used and distributed according to the terms |
|
6 | This software may be used and distributed according to the terms | |
7 | of the GNU General Public License, incorporated herein by reference. |
|
7 | of the GNU General Public License, incorporated herein by reference. | |
8 | """ |
|
8 | """ | |
9 |
|
9 | |||
10 | from node import nullid |
|
10 | from node import nullid | |
11 | from i18n import _ |
|
11 | from i18n import _ | |
12 | import struct, os, bisect, stat, util, errno, ignore |
|
12 | import struct, os, bisect, stat, util, errno, ignore | |
13 | import cStringIO, osutil, sys |
|
13 | import cStringIO, osutil, sys | |
14 |
|
14 | |||
15 | _unknown = ('?', 0, 0, 0) |
|
15 | _unknown = ('?', 0, 0, 0) | |
16 | _format = ">cllll" |
|
16 | _format = ">cllll" | |
17 |
|
17 | |||
18 | def _finddirs(path): |
|
18 | def _finddirs(path): | |
19 | pos = len(path) |
|
19 | pos = len(path) | |
20 | while 1: |
|
20 | while 1: | |
21 | pos = path.rfind('/', 0, pos) |
|
21 | pos = path.rfind('/', 0, pos) | |
22 | if pos == -1: |
|
22 | if pos == -1: | |
23 | break |
|
23 | break | |
24 | yield path[:pos] |
|
24 | yield path[:pos] | |
25 |
|
25 | |||
26 | class dirstate(object): |
|
26 | class dirstate(object): | |
27 |
|
27 | |||
28 | def __init__(self, opener, ui, root): |
|
28 | def __init__(self, opener, ui, root): | |
29 | self._opener = opener |
|
29 | self._opener = opener | |
30 | self._root = root |
|
30 | self._root = root | |
31 | self._dirty = False |
|
31 | self._dirty = False | |
32 | self._dirtypl = False |
|
32 | self._dirtypl = False | |
33 | self._ui = ui |
|
33 | self._ui = ui | |
34 |
|
34 | |||
35 | def __getattr__(self, name): |
|
35 | def __getattr__(self, name): | |
36 | if name == '_map': |
|
36 | if name == '_map': | |
37 | self._read() |
|
37 | self._read() | |
38 | return self._map |
|
38 | return self._map | |
39 | elif name == '_copymap': |
|
39 | elif name == '_copymap': | |
40 | self._read() |
|
40 | self._read() | |
41 | return self._copymap |
|
41 | return self._copymap | |
42 | elif name == '_foldmap': |
|
42 | elif name == '_foldmap': | |
43 | _foldmap = {} |
|
43 | _foldmap = {} | |
44 | for name in self._map: |
|
44 | for name in self._map: | |
45 | norm = os.path.normcase(os.path.normpath(name)) |
|
45 | norm = os.path.normcase(os.path.normpath(name)) | |
46 | _foldmap[norm] = name |
|
46 | _foldmap[norm] = name | |
47 | self._foldmap = _foldmap |
|
47 | self._foldmap = _foldmap | |
48 | return self._foldmap |
|
48 | return self._foldmap | |
49 | elif name == '_branch': |
|
49 | elif name == '_branch': | |
50 | try: |
|
50 | try: | |
51 | self._branch = (self._opener("branch").read().strip() |
|
51 | self._branch = (self._opener("branch").read().strip() | |
52 | or "default") |
|
52 | or "default") | |
53 | except IOError: |
|
53 | except IOError: | |
54 | self._branch = "default" |
|
54 | self._branch = "default" | |
55 | return self._branch |
|
55 | return self._branch | |
56 | elif name == '_pl': |
|
56 | elif name == '_pl': | |
57 | self._pl = [nullid, nullid] |
|
57 | self._pl = [nullid, nullid] | |
58 | try: |
|
58 | try: | |
59 | st = self._opener("dirstate").read(40) |
|
59 | st = self._opener("dirstate").read(40) | |
60 | if len(st) == 40: |
|
60 | if len(st) == 40: | |
61 | self._pl = st[:20], st[20:40] |
|
61 | self._pl = st[:20], st[20:40] | |
62 | except IOError, err: |
|
62 | except IOError, err: | |
63 | if err.errno != errno.ENOENT: raise |
|
63 | if err.errno != errno.ENOENT: raise | |
64 | return self._pl |
|
64 | return self._pl | |
65 | elif name == '_dirs': |
|
65 | elif name == '_dirs': | |
66 | dirs = {} |
|
66 | dirs = {} | |
67 | for f,s in self._map.items(): |
|
67 | for f,s in self._map.items(): | |
68 | if s[0] != 'r': |
|
68 | if s[0] != 'r': | |
69 | for base in _finddirs(f): |
|
69 | for base in _finddirs(f): | |
70 | dirs[base] = dirs.get(base, 0) + 1 |
|
70 | dirs[base] = dirs.get(base, 0) + 1 | |
71 | self._dirs = dirs |
|
71 | self._dirs = dirs | |
72 | return self._dirs |
|
72 | return self._dirs | |
73 | elif name == '_ignore': |
|
73 | elif name == '_ignore': | |
74 | files = [self._join('.hgignore')] |
|
74 | files = [self._join('.hgignore')] | |
75 | for name, path in self._ui.configitems("ui"): |
|
75 | for name, path in self._ui.configitems("ui"): | |
76 | if name == 'ignore' or name.startswith('ignore.'): |
|
76 | if name == 'ignore' or name.startswith('ignore.'): | |
77 | files.append(os.path.expanduser(path)) |
|
77 | files.append(os.path.expanduser(path)) | |
78 | self._ignore = ignore.ignore(self._root, files, self._ui.warn) |
|
78 | self._ignore = ignore.ignore(self._root, files, self._ui.warn) | |
79 | return self._ignore |
|
79 | return self._ignore | |
80 | elif name == '_slash': |
|
80 | elif name == '_slash': | |
81 | self._slash = self._ui.configbool('ui', 'slash') and os.sep != '/' |
|
81 | self._slash = self._ui.configbool('ui', 'slash') and os.sep != '/' | |
82 | return self._slash |
|
82 | return self._slash | |
83 | elif name == '_checklink': |
|
83 | elif name == '_checklink': | |
84 | self._checklink = util.checklink(self._root) |
|
84 | self._checklink = util.checklink(self._root) | |
85 | return self._checklink |
|
85 | return self._checklink | |
86 | elif name == '_checkexec': |
|
86 | elif name == '_checkexec': | |
87 | self._checkexec = util.checkexec(self._root) |
|
87 | self._checkexec = util.checkexec(self._root) | |
88 | return self._checkexec |
|
88 | return self._checkexec | |
89 | elif name == '_checkcase': |
|
89 | elif name == '_checkcase': | |
90 | self._checkcase = not util.checkcase(self._join('.hg')) |
|
90 | self._checkcase = not util.checkcase(self._join('.hg')) | |
91 | return self._checkcase |
|
91 | return self._checkcase | |
92 | elif name == 'normalize': |
|
92 | elif name == 'normalize': | |
93 | if self._checkcase: |
|
93 | if self._checkcase: | |
94 | self.normalize = self._normalize |
|
94 | self.normalize = self._normalize | |
95 | else: |
|
95 | else: | |
96 | self.normalize = lambda x: x |
|
96 | self.normalize = lambda x: x | |
97 | return self.normalize |
|
97 | return self.normalize | |
98 | else: |
|
98 | else: | |
99 | raise AttributeError, name |
|
99 | raise AttributeError, name | |
100 |
|
100 | |||
101 | def _join(self, f): |
|
101 | def _join(self, f): | |
102 | return os.path.join(self._root, f) |
|
102 | return os.path.join(self._root, f) | |
103 |
|
103 | |||
104 | def flagfunc(self, fallback): |
|
104 | def flagfunc(self, fallback): | |
105 | if self._checklink: |
|
105 | if self._checklink: | |
106 | if self._checkexec: |
|
106 | if self._checkexec: | |
107 | def f(x): |
|
107 | def f(x): | |
108 | p = os.path.join(self._root, x) |
|
108 | p = os.path.join(self._root, x) | |
109 | if os.path.islink(p): |
|
109 | if os.path.islink(p): | |
110 | return 'l' |
|
110 | return 'l' | |
111 | if util.is_exec(p): |
|
111 | if util.is_exec(p): | |
112 | return 'x' |
|
112 | return 'x' | |
113 | return '' |
|
113 | return '' | |
114 | return f |
|
114 | return f | |
115 | def f(x): |
|
115 | def f(x): | |
116 | if os.path.islink(os.path.join(self._root, x)): |
|
116 | if os.path.islink(os.path.join(self._root, x)): | |
117 | return 'l' |
|
117 | return 'l' | |
118 | if 'x' in fallback(x): |
|
118 | if 'x' in fallback(x): | |
119 | return 'x' |
|
119 | return 'x' | |
120 | return '' |
|
120 | return '' | |
121 | return f |
|
121 | return f | |
122 | if self._checkexec: |
|
122 | if self._checkexec: | |
123 | def f(x): |
|
123 | def f(x): | |
124 | if 'l' in fallback(x): |
|
124 | if 'l' in fallback(x): | |
125 | return 'l' |
|
125 | return 'l' | |
126 | if util.is_exec(os.path.join(self._root, x)): |
|
126 | if util.is_exec(os.path.join(self._root, x)): | |
127 | return 'x' |
|
127 | return 'x' | |
128 | return '' |
|
128 | return '' | |
129 | return f |
|
129 | return f | |
130 | return fallback |
|
130 | return fallback | |
131 |
|
131 | |||
132 | def getcwd(self): |
|
132 | def getcwd(self): | |
133 | cwd = os.getcwd() |
|
133 | cwd = os.getcwd() | |
134 | if cwd == self._root: return '' |
|
134 | if cwd == self._root: return '' | |
135 | # self._root ends with a path separator if self._root is '/' or 'C:\' |
|
135 | # self._root ends with a path separator if self._root is '/' or 'C:\' | |
136 | rootsep = self._root |
|
136 | rootsep = self._root | |
137 | if not util.endswithsep(rootsep): |
|
137 | if not util.endswithsep(rootsep): | |
138 | rootsep += os.sep |
|
138 | rootsep += os.sep | |
139 | if cwd.startswith(rootsep): |
|
139 | if cwd.startswith(rootsep): | |
140 | return cwd[len(rootsep):] |
|
140 | return cwd[len(rootsep):] | |
141 | else: |
|
141 | else: | |
142 | # we're outside the repo. return an absolute path. |
|
142 | # we're outside the repo. return an absolute path. | |
143 | return cwd |
|
143 | return cwd | |
144 |
|
144 | |||
145 | def pathto(self, f, cwd=None): |
|
145 | def pathto(self, f, cwd=None): | |
146 | if cwd is None: |
|
146 | if cwd is None: | |
147 | cwd = self.getcwd() |
|
147 | cwd = self.getcwd() | |
148 | path = util.pathto(self._root, cwd, f) |
|
148 | path = util.pathto(self._root, cwd, f) | |
149 | if self._slash: |
|
149 | if self._slash: | |
150 | return util.normpath(path) |
|
150 | return util.normpath(path) | |
151 | return path |
|
151 | return path | |
152 |
|
152 | |||
153 | def __getitem__(self, key): |
|
153 | def __getitem__(self, key): | |
154 | ''' current states: |
|
154 | ''' current states: | |
155 | n normal |
|
155 | n normal | |
156 | m needs merging |
|
156 | m needs merging | |
157 | r marked for removal |
|
157 | r marked for removal | |
158 | a marked for addition |
|
158 | a marked for addition | |
159 | ? not tracked''' |
|
159 | ? not tracked''' | |
160 | return self._map.get(key, ("?",))[0] |
|
160 | return self._map.get(key, ("?",))[0] | |
161 |
|
161 | |||
162 | def __contains__(self, key): |
|
162 | def __contains__(self, key): | |
163 | return key in self._map |
|
163 | return key in self._map | |
164 |
|
164 | |||
165 | def __iter__(self): |
|
165 | def __iter__(self): | |
166 | for x in util.sort(self._map): |
|
166 | for x in util.sort(self._map): | |
167 | yield x |
|
167 | yield x | |
168 |
|
168 | |||
169 | def parents(self): |
|
169 | def parents(self): | |
170 | return self._pl |
|
170 | return self._pl | |
171 |
|
171 | |||
172 | def branch(self): |
|
172 | def branch(self): | |
173 | return self._branch |
|
173 | return self._branch | |
174 |
|
174 | |||
175 | def setparents(self, p1, p2=nullid): |
|
175 | def setparents(self, p1, p2=nullid): | |
176 | self._dirty = self._dirtypl = True |
|
176 | self._dirty = self._dirtypl = True | |
177 | self._pl = p1, p2 |
|
177 | self._pl = p1, p2 | |
178 |
|
178 | |||
179 | def setbranch(self, branch): |
|
179 | def setbranch(self, branch): | |
180 | self._branch = branch |
|
180 | self._branch = branch | |
181 | self._opener("branch", "w").write(branch + '\n') |
|
181 | self._opener("branch", "w").write(branch + '\n') | |
182 |
|
182 | |||
183 | def _read(self): |
|
183 | def _read(self): | |
184 | self._map = {} |
|
184 | self._map = {} | |
185 | self._copymap = {} |
|
185 | self._copymap = {} | |
186 | if not self._dirtypl: |
|
186 | if not self._dirtypl: | |
187 | self._pl = [nullid, nullid] |
|
187 | self._pl = [nullid, nullid] | |
188 | try: |
|
188 | try: | |
189 | st = self._opener("dirstate").read() |
|
189 | st = self._opener("dirstate").read() | |
190 | except IOError, err: |
|
190 | except IOError, err: | |
191 | if err.errno != errno.ENOENT: raise |
|
191 | if err.errno != errno.ENOENT: raise | |
192 | return |
|
192 | return | |
193 | if not st: |
|
193 | if not st: | |
194 | return |
|
194 | return | |
195 |
|
195 | |||
196 | if not self._dirtypl: |
|
196 | if not self._dirtypl: | |
197 | self._pl = [st[:20], st[20: 40]] |
|
197 | self._pl = [st[:20], st[20: 40]] | |
198 |
|
198 | |||
199 | # deref fields so they will be local in loop |
|
199 | # deref fields so they will be local in loop | |
200 | dmap = self._map |
|
200 | dmap = self._map | |
201 | copymap = self._copymap |
|
201 | copymap = self._copymap | |
202 | unpack = struct.unpack |
|
202 | unpack = struct.unpack | |
203 | e_size = struct.calcsize(_format) |
|
203 | e_size = struct.calcsize(_format) | |
204 | pos1 = 40 |
|
204 | pos1 = 40 | |
205 | l = len(st) |
|
205 | l = len(st) | |
206 |
|
206 | |||
207 | # the inner loop |
|
207 | # the inner loop | |
208 | while pos1 < l: |
|
208 | while pos1 < l: | |
209 | pos2 = pos1 + e_size |
|
209 | pos2 = pos1 + e_size | |
210 | e = unpack(">cllll", st[pos1:pos2]) # a literal here is faster |
|
210 | e = unpack(">cllll", st[pos1:pos2]) # a literal here is faster | |
211 | pos1 = pos2 + e[4] |
|
211 | pos1 = pos2 + e[4] | |
212 | f = st[pos2:pos1] |
|
212 | f = st[pos2:pos1] | |
213 | if '\0' in f: |
|
213 | if '\0' in f: | |
214 | f, c = f.split('\0') |
|
214 | f, c = f.split('\0') | |
215 | copymap[f] = c |
|
215 | copymap[f] = c | |
216 | dmap[f] = e # we hold onto e[4] because making a subtuple is slow |
|
216 | dmap[f] = e # we hold onto e[4] because making a subtuple is slow | |
217 |
|
217 | |||
218 | def invalidate(self): |
|
218 | def invalidate(self): | |
219 | for a in "_map _copymap _foldmap _branch _pl _dirs _ignore".split(): |
|
219 | for a in "_map _copymap _foldmap _branch _pl _dirs _ignore".split(): | |
220 | if a in self.__dict__: |
|
220 | if a in self.__dict__: | |
221 | delattr(self, a) |
|
221 | delattr(self, a) | |
222 | self._dirty = False |
|
222 | self._dirty = False | |
223 |
|
223 | |||
224 | def copy(self, source, dest): |
|
224 | def copy(self, source, dest): | |
225 | if source == dest: |
|
225 | if source == dest: | |
226 | return |
|
226 | return | |
227 | self._dirty = True |
|
227 | self._dirty = True | |
228 | self._copymap[dest] = source |
|
228 | self._copymap[dest] = source | |
229 |
|
229 | |||
230 | def copied(self, file): |
|
230 | def copied(self, file): | |
231 | return self._copymap.get(file, None) |
|
231 | return self._copymap.get(file, None) | |
232 |
|
232 | |||
233 | def copies(self): |
|
233 | def copies(self): | |
234 | return self._copymap |
|
234 | return self._copymap | |
235 |
|
235 | |||
236 | def _droppath(self, f): |
|
236 | def _droppath(self, f): | |
237 | if self[f] not in "?r" and "_dirs" in self.__dict__: |
|
237 | if self[f] not in "?r" and "_dirs" in self.__dict__: | |
238 | dirs = self._dirs |
|
238 | dirs = self._dirs | |
239 | for base in _finddirs(f): |
|
239 | for base in _finddirs(f): | |
240 | if dirs[base] == 1: |
|
240 | if dirs[base] == 1: | |
241 | del dirs[base] |
|
241 | del dirs[base] | |
242 | else: |
|
242 | else: | |
243 | dirs[base] -= 1 |
|
243 | dirs[base] -= 1 | |
244 |
|
244 | |||
245 | def _addpath(self, f, check=False): |
|
245 | def _addpath(self, f, check=False): | |
246 | oldstate = self[f] |
|
246 | oldstate = self[f] | |
247 | if check or oldstate == "r": |
|
247 | if check or oldstate == "r": | |
248 | if '\r' in f or '\n' in f: |
|
248 | if '\r' in f or '\n' in f: | |
249 | raise util.Abort( |
|
249 | raise util.Abort( | |
250 | _("'\\n' and '\\r' disallowed in filenames: %r") % f) |
|
250 | _("'\\n' and '\\r' disallowed in filenames: %r") % f) | |
251 | if f in self._dirs: |
|
251 | if f in self._dirs: | |
252 | raise util.Abort(_('directory %r already in dirstate') % f) |
|
252 | raise util.Abort(_('directory %r already in dirstate') % f) | |
253 | # shadows |
|
253 | # shadows | |
254 | for d in _finddirs(f): |
|
254 | for d in _finddirs(f): | |
255 | if d in self._dirs: |
|
255 | if d in self._dirs: | |
256 | break |
|
256 | break | |
257 | if d in self._map and self[d] != 'r': |
|
257 | if d in self._map and self[d] != 'r': | |
258 | raise util.Abort( |
|
258 | raise util.Abort( | |
259 | _('file %r in dirstate clashes with %r') % (d, f)) |
|
259 | _('file %r in dirstate clashes with %r') % (d, f)) | |
260 | if oldstate in "?r" and "_dirs" in self.__dict__: |
|
260 | if oldstate in "?r" and "_dirs" in self.__dict__: | |
261 | dirs = self._dirs |
|
261 | dirs = self._dirs | |
262 | for base in _finddirs(f): |
|
262 | for base in _finddirs(f): | |
263 | dirs[base] = dirs.get(base, 0) + 1 |
|
263 | dirs[base] = dirs.get(base, 0) + 1 | |
264 |
|
264 | |||
265 | def normal(self, f): |
|
265 | def normal(self, f): | |
266 | 'mark a file normal and clean' |
|
266 | 'mark a file normal and clean' | |
267 | self._dirty = True |
|
267 | self._dirty = True | |
268 | self._addpath(f) |
|
268 | self._addpath(f) | |
269 | s = os.lstat(self._join(f)) |
|
269 | s = os.lstat(self._join(f)) | |
270 | self._map[f] = ('n', s.st_mode, s.st_size, s.st_mtime, 0) |
|
270 | self._map[f] = ('n', s.st_mode, s.st_size, s.st_mtime, 0) | |
271 | if f in self._copymap: |
|
271 | if f in self._copymap: | |
272 | del self._copymap[f] |
|
272 | del self._copymap[f] | |
273 |
|
273 | |||
274 | def normallookup(self, f): |
|
274 | def normallookup(self, f): | |
275 | 'mark a file normal, but possibly dirty' |
|
275 | 'mark a file normal, but possibly dirty' | |
276 | if self._pl[1] != nullid and f in self._map: |
|
276 | if self._pl[1] != nullid and f in self._map: | |
277 | # if there is a merge going on and the file was either |
|
277 | # if there is a merge going on and the file was either | |
278 | # in state 'm' or dirty before being removed, restore that state. |
|
278 | # in state 'm' or dirty before being removed, restore that state. | |
279 | entry = self._map[f] |
|
279 | entry = self._map[f] | |
280 | if entry[0] == 'r' and entry[2] in (-1, -2): |
|
280 | if entry[0] == 'r' and entry[2] in (-1, -2): | |
281 | source = self._copymap.get(f) |
|
281 | source = self._copymap.get(f) | |
282 | if entry[2] == -1: |
|
282 | if entry[2] == -1: | |
283 | self.merge(f) |
|
283 | self.merge(f) | |
284 | elif entry[2] == -2: |
|
284 | elif entry[2] == -2: | |
285 | self.normaldirty(f) |
|
285 | self.normaldirty(f) | |
286 | if source: |
|
286 | if source: | |
287 | self.copy(source, f) |
|
287 | self.copy(source, f) | |
288 | return |
|
288 | return | |
289 | if entry[0] == 'm' or entry[0] == 'n' and entry[2] == -2: |
|
289 | if entry[0] == 'm' or entry[0] == 'n' and entry[2] == -2: | |
290 | return |
|
290 | return | |
291 | self._dirty = True |
|
291 | self._dirty = True | |
292 | self._addpath(f) |
|
292 | self._addpath(f) | |
293 | self._map[f] = ('n', 0, -1, -1, 0) |
|
293 | self._map[f] = ('n', 0, -1, -1, 0) | |
294 | if f in self._copymap: |
|
294 | if f in self._copymap: | |
295 | del self._copymap[f] |
|
295 | del self._copymap[f] | |
296 |
|
296 | |||
297 | def normaldirty(self, f): |
|
297 | def normaldirty(self, f): | |
298 | 'mark a file normal, but dirty' |
|
298 | 'mark a file normal, but dirty' | |
299 | self._dirty = True |
|
299 | self._dirty = True | |
300 | self._addpath(f) |
|
300 | self._addpath(f) | |
301 | self._map[f] = ('n', 0, -2, -1, 0) |
|
301 | self._map[f] = ('n', 0, -2, -1, 0) | |
302 | if f in self._copymap: |
|
302 | if f in self._copymap: | |
303 | del self._copymap[f] |
|
303 | del self._copymap[f] | |
304 |
|
304 | |||
305 | def add(self, f): |
|
305 | def add(self, f): | |
306 | 'mark a file added' |
|
306 | 'mark a file added' | |
307 | self._dirty = True |
|
307 | self._dirty = True | |
308 | self._addpath(f, True) |
|
308 | self._addpath(f, True) | |
309 | self._map[f] = ('a', 0, -1, -1, 0) |
|
309 | self._map[f] = ('a', 0, -1, -1, 0) | |
310 | if f in self._copymap: |
|
310 | if f in self._copymap: | |
311 | del self._copymap[f] |
|
311 | del self._copymap[f] | |
312 |
|
312 | |||
313 | def remove(self, f): |
|
313 | def remove(self, f): | |
314 | 'mark a file removed' |
|
314 | 'mark a file removed' | |
315 | self._dirty = True |
|
315 | self._dirty = True | |
316 | self._droppath(f) |
|
316 | self._droppath(f) | |
317 | size = 0 |
|
317 | size = 0 | |
318 | if self._pl[1] != nullid and f in self._map: |
|
318 | if self._pl[1] != nullid and f in self._map: | |
319 | entry = self._map[f] |
|
319 | entry = self._map[f] | |
320 | if entry[0] == 'm': |
|
320 | if entry[0] == 'm': | |
321 | size = -1 |
|
321 | size = -1 | |
322 | elif entry[0] == 'n' and entry[2] == -2: |
|
322 | elif entry[0] == 'n' and entry[2] == -2: | |
323 | size = -2 |
|
323 | size = -2 | |
324 | self._map[f] = ('r', 0, size, 0, 0) |
|
324 | self._map[f] = ('r', 0, size, 0, 0) | |
325 | if size == 0 and f in self._copymap: |
|
325 | if size == 0 and f in self._copymap: | |
326 | del self._copymap[f] |
|
326 | del self._copymap[f] | |
327 |
|
327 | |||
328 | def merge(self, f): |
|
328 | def merge(self, f): | |
329 | 'mark a file merged' |
|
329 | 'mark a file merged' | |
330 | self._dirty = True |
|
330 | self._dirty = True | |
331 | s = os.lstat(self._join(f)) |
|
331 | s = os.lstat(self._join(f)) | |
332 | self._addpath(f) |
|
332 | self._addpath(f) | |
333 | self._map[f] = ('m', s.st_mode, s.st_size, s.st_mtime, 0) |
|
333 | self._map[f] = ('m', s.st_mode, s.st_size, s.st_mtime, 0) | |
334 | if f in self._copymap: |
|
334 | if f in self._copymap: | |
335 | del self._copymap[f] |
|
335 | del self._copymap[f] | |
336 |
|
336 | |||
337 | def forget(self, f): |
|
337 | def forget(self, f): | |
338 | 'forget a file' |
|
338 | 'forget a file' | |
339 | self._dirty = True |
|
339 | self._dirty = True | |
340 | try: |
|
340 | try: | |
341 | self._droppath(f) |
|
341 | self._droppath(f) | |
342 | del self._map[f] |
|
342 | del self._map[f] | |
343 | except KeyError: |
|
343 | except KeyError: | |
344 | self._ui.warn(_("not in dirstate: %s\n") % f) |
|
344 | self._ui.warn(_("not in dirstate: %s\n") % f) | |
345 |
|
345 | |||
346 | def _normalize(self, path): |
|
346 | def _normalize(self, path): | |
347 | if path not in self._foldmap: |
|
347 | if path not in self._foldmap: | |
348 | if not os.path.exists(path): |
|
348 | if not os.path.exists(path): | |
349 | return path |
|
349 | return path | |
350 | self._foldmap[path] = util.fspath(path, self._root) |
|
350 | self._foldmap[path] = util.fspath(path, self._root) | |
351 | return self._foldmap[path] |
|
351 | return self._foldmap[path] | |
352 |
|
352 | |||
353 | def clear(self): |
|
353 | def clear(self): | |
354 | self._map = {} |
|
354 | self._map = {} | |
355 | if "_dirs" in self.__dict__: |
|
355 | if "_dirs" in self.__dict__: | |
356 | delattr(self, "_dirs"); |
|
356 | delattr(self, "_dirs"); | |
357 | self._copymap = {} |
|
357 | self._copymap = {} | |
358 | self._pl = [nullid, nullid] |
|
358 | self._pl = [nullid, nullid] | |
359 | self._dirty = True |
|
359 | self._dirty = True | |
360 |
|
360 | |||
361 | def rebuild(self, parent, files): |
|
361 | def rebuild(self, parent, files): | |
362 | self.clear() |
|
362 | self.clear() | |
363 | for f in files: |
|
363 | for f in files: | |
364 | if 'x' in files.flags(f): |
|
364 | if 'x' in files.flags(f): | |
365 | self._map[f] = ('n', 0777, -1, 0, 0) |
|
365 | self._map[f] = ('n', 0777, -1, 0, 0) | |
366 | else: |
|
366 | else: | |
367 | self._map[f] = ('n', 0666, -1, 0, 0) |
|
367 | self._map[f] = ('n', 0666, -1, 0, 0) | |
368 | self._pl = (parent, nullid) |
|
368 | self._pl = (parent, nullid) | |
369 | self._dirty = True |
|
369 | self._dirty = True | |
370 |
|
370 | |||
371 | def write(self): |
|
371 | def write(self): | |
372 | if not self._dirty: |
|
372 | if not self._dirty: | |
373 | return |
|
373 | return | |
374 | st = self._opener("dirstate", "w", atomictemp=True) |
|
374 | st = self._opener("dirstate", "w", atomictemp=True) | |
375 |
|
375 | |||
376 | try: |
|
376 | try: | |
377 | gran = int(self._ui.config('dirstate', 'granularity', 1)) |
|
377 | gran = int(self._ui.config('dirstate', 'granularity', 1)) | |
378 | except ValueError: |
|
378 | except ValueError: | |
379 | gran = 1 |
|
379 | gran = 1 | |
380 | limit = sys.maxint |
|
380 | limit = sys.maxint | |
381 | if gran > 0: |
|
381 | if gran > 0: | |
382 | limit = util.fstat(st).st_mtime - gran |
|
382 | limit = util.fstat(st).st_mtime - gran | |
383 |
|
383 | |||
384 | cs = cStringIO.StringIO() |
|
384 | cs = cStringIO.StringIO() | |
385 | copymap = self._copymap |
|
385 | copymap = self._copymap | |
386 | pack = struct.pack |
|
386 | pack = struct.pack | |
387 | write = cs.write |
|
387 | write = cs.write | |
388 | write("".join(self._pl)) |
|
388 | write("".join(self._pl)) | |
389 | for f, e in self._map.iteritems(): |
|
389 | for f, e in self._map.iteritems(): | |
390 | if f in copymap: |
|
390 | if f in copymap: | |
391 | f = "%s\0%s" % (f, copymap[f]) |
|
391 | f = "%s\0%s" % (f, copymap[f]) | |
392 | if e[3] > limit and e[0] == 'n': |
|
392 | if e[3] > limit and e[0] == 'n': | |
393 | e = (e[0], 0, -1, -1, 0) |
|
393 | e = (e[0], 0, -1, -1, 0) | |
394 | e = pack(_format, e[0], e[1], e[2], e[3], len(f)) |
|
394 | e = pack(_format, e[0], e[1], e[2], e[3], len(f)) | |
395 | write(e) |
|
395 | write(e) | |
396 | write(f) |
|
396 | write(f) | |
397 | st.write(cs.getvalue()) |
|
397 | st.write(cs.getvalue()) | |
398 | st.rename() |
|
398 | st.rename() | |
399 | self._dirty = self._dirtypl = False |
|
399 | self._dirty = self._dirtypl = False | |
400 |
|
400 | |||
401 | def _dirignore(self, f): |
|
401 | def _dirignore(self, f): | |
402 | if f == '.': |
|
402 | if f == '.': | |
403 | return False |
|
403 | return False | |
404 | if self._ignore(f): |
|
404 | if self._ignore(f): | |
405 | return True |
|
405 | return True | |
406 | for p in _finddirs(f): |
|
406 | for p in _finddirs(f): | |
407 | if self._ignore(p): |
|
407 | if self._ignore(p): | |
408 | return True |
|
408 | return True | |
409 | return False |
|
409 | return False | |
410 |
|
410 | |||
411 | def walk(self, match, unknown, ignored): |
|
411 | def walk(self, match, unknown, ignored): | |
412 | ''' |
|
412 | ''' | |
413 | walk recursively through the directory tree, finding all files |
|
413 | walk recursively through the directory tree, finding all files | |
414 | matched by the match function |
|
414 | matched by the match function | |
415 |
|
415 | |||
416 | results are yielded in a tuple (filename, stat), where stat |
|
416 | results are yielded in a tuple (filename, stat), where stat | |
417 | and st is the stat result if the file was found in the directory. |
|
417 | and st is the stat result if the file was found in the directory. | |
418 | ''' |
|
418 | ''' | |
419 |
|
419 | |||
420 | def fwarn(f, msg): |
|
420 | def fwarn(f, msg): | |
421 | self._ui.warn('%s: %s\n' % (self.pathto(ff), msg)) |
|
421 | self._ui.warn('%s: %s\n' % (self.pathto(ff), msg)) | |
422 | return False |
|
422 | return False | |
423 | badfn = fwarn |
|
423 | badfn = fwarn | |
424 | if hasattr(match, 'bad'): |
|
424 | if hasattr(match, 'bad'): | |
425 | badfn = match.bad |
|
425 | badfn = match.bad | |
426 |
|
426 | |||
427 | def badtype(f, mode): |
|
427 | def badtype(f, mode): | |
428 | kind = 'unknown' |
|
428 | kind = 'unknown' | |
429 | if stat.S_ISCHR(mode): kind = _('character device') |
|
429 | if stat.S_ISCHR(mode): kind = _('character device') | |
430 | elif stat.S_ISBLK(mode): kind = _('block device') |
|
430 | elif stat.S_ISBLK(mode): kind = _('block device') | |
431 | elif stat.S_ISFIFO(mode): kind = _('fifo') |
|
431 | elif stat.S_ISFIFO(mode): kind = _('fifo') | |
432 | elif stat.S_ISSOCK(mode): kind = _('socket') |
|
432 | elif stat.S_ISSOCK(mode): kind = _('socket') | |
433 | elif stat.S_ISDIR(mode): kind = _('directory') |
|
433 | elif stat.S_ISDIR(mode): kind = _('directory') | |
434 | self._ui.warn(_('%s: unsupported file type (type is %s)\n') |
|
434 | self._ui.warn(_('%s: unsupported file type (type is %s)\n') | |
435 | % (self.pathto(f), kind)) |
|
435 | % (self.pathto(f), kind)) | |
436 |
|
436 | |||
437 | def imatch(f): |
|
|||
438 | return (f in dmap or not ignore(f)) and match(f) |
|
|||
439 |
|
||||
440 | # TODO: don't walk unknown directories if unknown and ignored are False |
|
437 | # TODO: don't walk unknown directories if unknown and ignored are False | |
441 | ignore = self._ignore |
|
438 | ignore = self._ignore | |
442 | dirignore = self._dirignore |
|
439 | dirignore = self._dirignore | |
443 | if ignored: |
|
440 | if ignored: | |
444 | imatch = match |
|
|||
445 | ignore = util.never |
|
441 | ignore = util.never | |
446 | dirignore = util.never |
|
442 | dirignore = util.never | |
447 |
|
443 | |||
448 | dmap = self._map |
|
444 | dmap = self._map | |
449 | normpath = util.normpath |
|
445 | normpath = util.normpath | |
450 | normalize = self.normalize |
|
446 | normalize = self.normalize | |
451 | listdir = osutil.listdir |
|
447 | listdir = osutil.listdir | |
452 | lstat = os.lstat |
|
448 | lstat = os.lstat | |
453 | bisect_left = bisect.bisect_left |
|
449 | bisect_left = bisect.bisect_left | |
454 | pconvert = util.pconvert |
|
450 | pconvert = util.pconvert | |
455 | getkind = stat.S_IFMT |
|
451 | getkind = stat.S_IFMT | |
456 | dirkind = stat.S_IFDIR |
|
452 | dirkind = stat.S_IFDIR | |
457 | regkind = stat.S_IFREG |
|
453 | regkind = stat.S_IFREG | |
458 | lnkkind = stat.S_IFLNK |
|
454 | lnkkind = stat.S_IFLNK | |
459 | join = self._join |
|
455 | join = self._join | |
460 | work = [] |
|
456 | work = [] | |
461 | wadd = work.append |
|
457 | wadd = work.append | |
462 |
|
458 | |||
463 | files = util.unique(match.files()) |
|
459 | files = util.unique(match.files()) | |
464 | if not files or '.' in files: |
|
460 | if not files or '.' in files: | |
465 | files = [''] |
|
461 | files = [''] | |
466 | results = {'.hg': None} |
|
462 | results = {'.hg': None} | |
467 |
|
463 | |||
468 | # step 1: find all explicit files |
|
464 | # step 1: find all explicit files | |
469 | for ff in util.sort(files): |
|
465 | for ff in util.sort(files): | |
470 | nf = normalize(normpath(ff)) |
|
466 | nf = normalize(normpath(ff)) | |
471 | if nf in results: |
|
467 | if nf in results: | |
472 | continue |
|
468 | continue | |
473 |
|
469 | |||
474 | try: |
|
470 | try: | |
475 | st = lstat(join(nf)) |
|
471 | st = lstat(join(nf)) | |
476 | kind = getkind(st.st_mode) |
|
472 | kind = getkind(st.st_mode) | |
477 | if kind == dirkind: |
|
473 | if kind == dirkind: | |
478 | if not dirignore(nf): |
|
474 | if not dirignore(nf): | |
479 | wadd(nf) |
|
475 | wadd(nf) | |
480 | elif kind == regkind or kind == lnkkind: |
|
476 | elif kind == regkind or kind == lnkkind: | |
481 | results[nf] = st |
|
477 | results[nf] = st | |
482 | else: |
|
478 | else: | |
483 | badtype(ff, kind) |
|
479 | badtype(ff, kind) | |
484 | if nf in dmap: |
|
480 | if nf in dmap: | |
485 | results[nf] = None |
|
481 | results[nf] = None | |
486 | except OSError, inst: |
|
482 | except OSError, inst: | |
487 | keep = False |
|
483 | keep = False | |
488 | prefix = nf + "/" |
|
484 | prefix = nf + "/" | |
489 | for fn in dmap: |
|
485 | for fn in dmap: | |
490 | if nf == fn or fn.startswith(prefix): |
|
486 | if nf == fn or fn.startswith(prefix): | |
491 | keep = True |
|
487 | keep = True | |
492 | break |
|
488 | break | |
493 | if not keep: |
|
489 | if not keep: | |
494 | if inst.errno != errno.ENOENT: |
|
490 | if inst.errno != errno.ENOENT: | |
495 | fwarn(ff, inst.strerror) |
|
491 | fwarn(ff, inst.strerror) | |
496 |
elif badfn(ff, inst.strerror) |
|
492 | elif badfn(ff, inst.strerror): | |
|
493 | if (nf in dmap or not ignore(nf)) and match(nf): | |||
497 | results[nf] = None |
|
494 | results[nf] = None | |
498 |
|
495 | |||
499 | # step 2: visit subdirectories |
|
496 | # step 2: visit subdirectories | |
500 | while work: |
|
497 | while work: | |
501 | nd = work.pop() |
|
498 | nd = work.pop() | |
502 | if hasattr(match, 'dir'): |
|
499 | if hasattr(match, 'dir'): | |
503 | match.dir(nd) |
|
500 | match.dir(nd) | |
504 | entries = listdir(join(nd), stat=True) |
|
501 | entries = listdir(join(nd), stat=True) | |
505 | if nd == '.': |
|
502 | if nd == '.': | |
506 | nd = '' |
|
503 | nd = '' | |
507 | else: |
|
504 | else: | |
508 | # do not recurse into a repo contained in this |
|
505 | # do not recurse into a repo contained in this | |
509 | # one. use bisect to find .hg directory so speed |
|
506 | # one. use bisect to find .hg directory so speed | |
510 | # is good on big directory. |
|
507 | # is good on big directory. | |
511 | hg = bisect_left(entries, ('.hg')) |
|
508 | hg = bisect_left(entries, ('.hg')) | |
512 | if hg < len(entries) and entries[hg][0] == '.hg' \ |
|
509 | if hg < len(entries) and entries[hg][0] == '.hg' \ | |
513 | and entries[hg][1] == dirkind: |
|
510 | and entries[hg][1] == dirkind: | |
514 | continue |
|
511 | continue | |
515 | for f, kind, st in entries: |
|
512 | for f, kind, st in entries: | |
516 | nf = normalize(nd and (nd + "/" + f) or f) |
|
513 | nf = normalize(nd and (nd + "/" + f) or f) | |
517 | if nf not in results: |
|
514 | if nf not in results: | |
518 | if kind == dirkind: |
|
515 | if kind == dirkind: | |
519 | if not ignore(nf): |
|
516 | if not ignore(nf): | |
520 | wadd(nf) |
|
517 | wadd(nf) | |
521 | if nf in dmap and match(nf): |
|
518 | if nf in dmap and match(nf): | |
522 | results[nf] = None |
|
519 | results[nf] = None | |
523 | elif imatch(nf): |
|
520 | elif kind == regkind or kind == lnkkind: | |
524 |
if |
|
521 | if nf in dmap: | |
|
522 | if match(nf): | |||
525 | results[nf] = st |
|
523 | results[nf] = st | |
526 |
elif nf |
|
524 | elif match(nf) and not ignore(nf): | |
|
525 | results[nf] = st | |||
|
526 | elif nf in dmap and match(nf): | |||
527 |
|
|
527 | results[nf] = None | |
528 |
|
528 | |||
529 | # step 3: report unseen items in the dmap hash |
|
529 | # step 3: report unseen items in the dmap hash | |
530 | for nf in util.sort(dmap): |
|
530 | for nf in util.sort(dmap): | |
531 | if nf not in results and match(nf): |
|
531 | if nf not in results and match(nf): | |
532 | results[nf] = None |
|
532 | results[nf] = None | |
533 | try: |
|
533 | try: | |
534 | st = lstat(join(nf)) |
|
534 | st = lstat(join(nf)) | |
535 | kind = getkind(st.st_mode) |
|
535 | kind = getkind(st.st_mode) | |
536 | if kind == regkind or kind == lnkkind: |
|
536 | if kind == regkind or kind == lnkkind: | |
537 | results[nf] = st |
|
537 | results[nf] = st | |
538 | except OSError, inst: |
|
538 | except OSError, inst: | |
539 | if inst.errno not in (errno.ENOENT, errno.ENOTDIR): |
|
539 | if inst.errno not in (errno.ENOENT, errno.ENOTDIR): | |
540 | raise |
|
540 | raise | |
541 |
|
541 | |||
542 | del results['.hg'] |
|
542 | del results['.hg'] | |
543 | return results |
|
543 | return results | |
544 |
|
544 | |||
545 | def status(self, match, ignored, clean, unknown): |
|
545 | def status(self, match, ignored, clean, unknown): | |
546 | listignored, listclean, listunknown = ignored, clean, unknown |
|
546 | listignored, listclean, listunknown = ignored, clean, unknown | |
547 | lookup, modified, added, unknown, ignored = [], [], [], [], [] |
|
547 | lookup, modified, added, unknown, ignored = [], [], [], [], [] | |
548 | removed, deleted, clean = [], [], [] |
|
548 | removed, deleted, clean = [], [], [] | |
549 |
|
549 | |||
550 | _join = self._join |
|
550 | _join = self._join | |
551 | lstat = os.lstat |
|
551 | lstat = os.lstat | |
552 | cmap = self._copymap |
|
552 | cmap = self._copymap | |
553 | dmap = self._map |
|
553 | dmap = self._map | |
554 | ladd = lookup.append |
|
554 | ladd = lookup.append | |
555 | madd = modified.append |
|
555 | madd = modified.append | |
556 | aadd = added.append |
|
556 | aadd = added.append | |
557 | uadd = unknown.append |
|
557 | uadd = unknown.append | |
558 | iadd = ignored.append |
|
558 | iadd = ignored.append | |
559 | radd = removed.append |
|
559 | radd = removed.append | |
560 | dadd = deleted.append |
|
560 | dadd = deleted.append | |
561 | cadd = clean.append |
|
561 | cadd = clean.append | |
562 |
|
562 | |||
563 | for fn, st in self.walk(match, listunknown, listignored).iteritems(): |
|
563 | for fn, st in self.walk(match, listunknown, listignored).iteritems(): | |
564 | if fn not in dmap: |
|
564 | if fn not in dmap: | |
565 | if (listignored or match.exact(fn)) and self._dirignore(fn): |
|
565 | if (listignored or match.exact(fn)) and self._dirignore(fn): | |
566 | if listignored: |
|
566 | if listignored: | |
567 | iadd(fn) |
|
567 | iadd(fn) | |
568 | elif listunknown: |
|
568 | elif listunknown: | |
569 | uadd(fn) |
|
569 | uadd(fn) | |
570 | continue |
|
570 | continue | |
571 |
|
571 | |||
572 | state, mode, size, time, foo = dmap[fn] |
|
572 | state, mode, size, time, foo = dmap[fn] | |
573 |
|
573 | |||
574 | if not st and state in "nma": |
|
574 | if not st and state in "nma": | |
575 | dadd(fn) |
|
575 | dadd(fn) | |
576 | elif state == 'n': |
|
576 | elif state == 'n': | |
577 | if (size >= 0 and |
|
577 | if (size >= 0 and | |
578 | (size != st.st_size |
|
578 | (size != st.st_size | |
579 | or ((mode ^ st.st_mode) & 0100 and self._checkexec)) |
|
579 | or ((mode ^ st.st_mode) & 0100 and self._checkexec)) | |
580 | or size == -2 |
|
580 | or size == -2 | |
581 | or fn in self._copymap): |
|
581 | or fn in self._copymap): | |
582 | madd(fn) |
|
582 | madd(fn) | |
583 | elif time != int(st.st_mtime): |
|
583 | elif time != int(st.st_mtime): | |
584 | ladd(fn) |
|
584 | ladd(fn) | |
585 | elif listclean: |
|
585 | elif listclean: | |
586 | cadd(fn) |
|
586 | cadd(fn) | |
587 | elif state == 'm': |
|
587 | elif state == 'm': | |
588 | madd(fn) |
|
588 | madd(fn) | |
589 | elif state == 'a': |
|
589 | elif state == 'a': | |
590 | aadd(fn) |
|
590 | aadd(fn) | |
591 | elif state == 'r': |
|
591 | elif state == 'r': | |
592 | radd(fn) |
|
592 | radd(fn) | |
593 |
|
593 | |||
594 | return (lookup, modified, added, removed, deleted, unknown, ignored, |
|
594 | return (lookup, modified, added, removed, deleted, unknown, ignored, | |
595 | clean) |
|
595 | clean) |
General Comments 0
You need to be logged in to leave comments.
Login now