Show More
@@ -23,7 +23,7 b' class dirstate(object):' | |||||
23 | self.map = None |
|
23 | self.map = None | |
24 | self.pl = None |
|
24 | self.pl = None | |
25 | self.dirs = None |
|
25 | self.dirs = None | |
26 |
self.cop |
|
26 | self.copymap = {} | |
27 | self.ignorefunc = None |
|
27 | self.ignorefunc = None | |
28 | self.blockignore = False |
|
28 | self.blockignore = False | |
29 |
|
29 | |||
@@ -160,7 +160,7 b' class dirstate(object):' | |||||
160 |
|
160 | |||
161 | # deref fields so they will be local in loop |
|
161 | # deref fields so they will be local in loop | |
162 | map = self.map |
|
162 | map = self.map | |
163 |
cop |
|
163 | copymap = self.copymap | |
164 | format = self.format |
|
164 | format = self.format | |
165 | unpack = struct.unpack |
|
165 | unpack = struct.unpack | |
166 |
|
166 | |||
@@ -176,7 +176,7 b' class dirstate(object):' | |||||
176 | f = st[pos:newpos] |
|
176 | f = st[pos:newpos] | |
177 | if '\0' in f: |
|
177 | if '\0' in f: | |
178 | f, c = f.split('\0') |
|
178 | f, c = f.split('\0') | |
179 |
cop |
|
179 | copymap[f] = c | |
180 | map[f] = e[:4] |
|
180 | map[f] = e[:4] | |
181 | pos = newpos |
|
181 | pos = newpos | |
182 |
|
182 | |||
@@ -193,10 +193,13 b' class dirstate(object):' | |||||
193 | def copy(self, source, dest): |
|
193 | def copy(self, source, dest): | |
194 | self.lazyread() |
|
194 | self.lazyread() | |
195 | self.markdirty() |
|
195 | self.markdirty() | |
196 |
self.cop |
|
196 | self.copymap[dest] = source | |
197 |
|
197 | |||
198 | def copied(self, file): |
|
198 | def copied(self, file): | |
199 |
return self.cop |
|
199 | return self.copymap.get(file, None) | |
|
200 | ||||
|
201 | def copies(self): | |||
|
202 | return self.copymap | |||
200 |
|
203 | |||
201 | def initdirs(self): |
|
204 | def initdirs(self): | |
202 | if self.dirs is None: |
|
205 | if self.dirs is None: | |
@@ -254,8 +257,8 b' class dirstate(object):' | |||||
254 | st_size = kw.get('st_size', s.st_size) |
|
257 | st_size = kw.get('st_size', s.st_size) | |
255 | st_mtime = kw.get('st_mtime', s.st_mtime) |
|
258 | st_mtime = kw.get('st_mtime', s.st_mtime) | |
256 | self.map[f] = (state, s.st_mode, st_size, st_mtime) |
|
259 | self.map[f] = (state, s.st_mode, st_size, st_mtime) | |
257 |
if self.cop |
|
260 | if self.copymap.has_key(f): | |
258 |
del self.cop |
|
261 | del self.copymap[f] | |
259 |
|
262 | |||
260 | def forget(self, files): |
|
263 | def forget(self, files): | |
261 | if not files: return |
|
264 | if not files: return | |
@@ -272,7 +275,7 b' class dirstate(object):' | |||||
272 |
|
275 | |||
273 | def clear(self): |
|
276 | def clear(self): | |
274 | self.map = {} |
|
277 | self.map = {} | |
275 |
self.cop |
|
278 | self.copymap = {} | |
276 | self.dirs = None |
|
279 | self.dirs = None | |
277 | self.markdirty() |
|
280 | self.markdirty() | |
278 |
|
281 |
General Comments 0
You need to be logged in to leave comments.
Login now