Show More
@@ -497,7 +497,7 b' class queue:' | |||||
497 | removed = [] |
|
497 | removed = [] | |
498 | merged = [] |
|
498 | merged = [] | |
499 | for f in files: |
|
499 | for f in files: | |
500 |
if os.path.exists(repo. |
|
500 | if os.path.exists(repo.wjoin(f)): | |
501 | merged.append(f) |
|
501 | merged.append(f) | |
502 | else: |
|
502 | else: | |
503 | removed.append(f) |
|
503 | removed.append(f) |
@@ -52,7 +52,7 b' class dirstate(object):' | |||||
52 | self._incpath(f) |
|
52 | self._incpath(f) | |
53 | return self._dirs |
|
53 | return self._dirs | |
54 | elif name == '_ignore': |
|
54 | elif name == '_ignore': | |
55 |
files = [self. |
|
55 | files = [self._join('.hgignore')] | |
56 | for name, path in self._ui.configitems("ui"): |
|
56 | for name, path in self._ui.configitems("ui"): | |
57 | if name == 'ignore' or name.startswith('ignore.'): |
|
57 | if name == 'ignore' or name.startswith('ignore.'): | |
58 | files.append(os.path.expanduser(path)) |
|
58 | files.append(os.path.expanduser(path)) | |
@@ -64,7 +64,7 b' class dirstate(object):' | |||||
64 | else: |
|
64 | else: | |
65 | raise AttributeError, name |
|
65 | raise AttributeError, name | |
66 |
|
66 | |||
67 |
def |
|
67 | def _join(self, f): | |
68 | return os.path.join(self._root, f) |
|
68 | return os.path.join(self._root, f) | |
69 |
|
69 | |||
70 | def getcwd(self): |
|
70 | def getcwd(self): | |
@@ -205,7 +205,7 b' class dirstate(object):' | |||||
205 | def normal(self, f): |
|
205 | def normal(self, f): | |
206 | 'mark a file normal' |
|
206 | 'mark a file normal' | |
207 | self._dirty = True |
|
207 | self._dirty = True | |
208 |
s = os.lstat(self. |
|
208 | s = os.lstat(self._join(f)) | |
209 | self._map[f] = ('n', s.st_mode, s.st_size, s.st_mtime) |
|
209 | self._map[f] = ('n', s.st_mode, s.st_size, s.st_mtime) | |
210 | if self._copymap.has_key(f): |
|
210 | if self._copymap.has_key(f): | |
211 | del self._copymap[f] |
|
211 | del self._copymap[f] | |
@@ -213,7 +213,7 b' class dirstate(object):' | |||||
213 | def normaldirty(self, f): |
|
213 | def normaldirty(self, f): | |
214 | 'mark a file normal, but possibly dirty' |
|
214 | 'mark a file normal, but possibly dirty' | |
215 | self._dirty = True |
|
215 | self._dirty = True | |
216 |
s = os.lstat(self. |
|
216 | s = os.lstat(self._join(f)) | |
217 | self._map[f] = ('n', s.st_mode, -1, -1) |
|
217 | self._map[f] = ('n', s.st_mode, -1, -1) | |
218 | if f in self._copymap: |
|
218 | if f in self._copymap: | |
219 | del self._copymap[f] |
|
219 | del self._copymap[f] | |
@@ -222,7 +222,7 b' class dirstate(object):' | |||||
222 | 'mark a file added' |
|
222 | 'mark a file added' | |
223 | self._dirty = True |
|
223 | self._dirty = True | |
224 | self._incpathcheck(f) |
|
224 | self._incpathcheck(f) | |
225 |
s = os.lstat(self. |
|
225 | s = os.lstat(self._join(f)) | |
226 | self._map[f] = ('a', s.st_mode, s.st_size, s.st_mtime) |
|
226 | self._map[f] = ('a', s.st_mode, s.st_size, s.st_mtime) | |
227 | if f in self._copymap: |
|
227 | if f in self._copymap: | |
228 | del self._copymap[f] |
|
228 | del self._copymap[f] | |
@@ -238,7 +238,7 b' class dirstate(object):' | |||||
238 | def merge(self, f): |
|
238 | def merge(self, f): | |
239 | 'mark a file merged' |
|
239 | 'mark a file merged' | |
240 | self._dirty = True |
|
240 | self._dirty = True | |
241 |
s = os.lstat(self. |
|
241 | s = os.lstat(self._join(f)) | |
242 | self._map[f] = ('m', s.st_mode, s.st_size, s.st_mtime) |
|
242 | self._map[f] = ('m', s.st_mode, s.st_size, s.st_mtime) | |
243 | if f in self._copymap: |
|
243 | if f in self._copymap: | |
244 | del self._copymap[f] |
|
244 | del self._copymap[f] | |
@@ -416,7 +416,7 b' class dirstate(object):' | |||||
416 | files.sort() |
|
416 | files.sort() | |
417 | for ff in files: |
|
417 | for ff in files: | |
418 | nf = util.normpath(ff) |
|
418 | nf = util.normpath(ff) | |
419 |
f = self. |
|
419 | f = self._join(ff) | |
420 | try: |
|
420 | try: | |
421 | st = os.lstat(f) |
|
421 | st = os.lstat(f) | |
422 | except OSError, inst: |
|
422 | except OSError, inst: | |
@@ -471,7 +471,7 b' class dirstate(object):' | |||||
471 | nonexistent = True |
|
471 | nonexistent = True | |
472 | if not st: |
|
472 | if not st: | |
473 | try: |
|
473 | try: | |
474 |
st = os.lstat(self. |
|
474 | st = os.lstat(self._join(fn)) | |
475 | except OSError, inst: |
|
475 | except OSError, inst: | |
476 | if inst.errno != errno.ENOENT: |
|
476 | if inst.errno != errno.ENOENT: | |
477 | raise |
|
477 | raise | |
@@ -487,7 +487,7 b' class dirstate(object):' | |||||
487 | # check the common case first |
|
487 | # check the common case first | |
488 | if type_ == 'n': |
|
488 | if type_ == 'n': | |
489 | if not st: |
|
489 | if not st: | |
490 |
st = os.lstat(self. |
|
490 | st = os.lstat(self._join(fn)) | |
491 | if (size >= 0 and (size != st.st_size |
|
491 | if (size >= 0 and (size != st.st_size | |
492 | or (mode ^ st.st_mode) & 0100) |
|
492 | or (mode ^ st.st_mode) & 0100) | |
493 | or fn in self._copymap): |
|
493 | or fn in self._copymap): |
General Comments 0
You need to be logged in to leave comments.
Login now