Mercurial > hg
comparison mercurial/dirstate.py @ 1510:755e7ac351ef
use self.{w,}join when possible
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 08 Nov 2005 10:34:50 -0800 |
parents | 91c0e8d7ddcf |
children | c13fce7167c2 |
comparison
equal
deleted
inserted
replaced
1509:46a07392cf28 | 1510:755e7ac351ef |
---|---|
173 self.markdirty() | 173 self.markdirty() |
174 for f in files: | 174 for f in files: |
175 if state == "r": | 175 if state == "r": |
176 self.map[f] = ('r', 0, 0, 0) | 176 self.map[f] = ('r', 0, 0, 0) |
177 else: | 177 else: |
178 s = os.lstat(os.path.join(self.root, f)) | 178 s = os.lstat(self.wjoin(f)) |
179 st_size = kw.get('st_size', s.st_size) | 179 st_size = kw.get('st_size', s.st_size) |
180 st_mtime = kw.get('st_mtime', s.st_mtime) | 180 st_mtime = kw.get('st_mtime', s.st_mtime) |
181 self.map[f] = (state, s.st_mode, st_size, st_mtime) | 181 self.map[f] = (state, s.st_mode, st_size, st_mtime) |
182 if self.copies.has_key(f): | 182 if self.copies.has_key(f): |
183 del self.copies[f] | 183 del self.copies[f] |
330 known[fn] = 1 | 330 known[fn] = 1 |
331 | 331 |
332 # step one, find all files that match our criteria | 332 # step one, find all files that match our criteria |
333 files.sort() | 333 files.sort() |
334 for ff in util.unique(files): | 334 for ff in util.unique(files): |
335 f = os.path.join(self.root, ff) | 335 f = self.wjoin(ff) |
336 try: | 336 try: |
337 st = os.lstat(f) | 337 st = os.lstat(f) |
338 except OSError, inst: | 338 except OSError, inst: |
339 if ff not in dc: self.ui.warn('%s: %s\n' % ( | 339 if ff not in dc: self.ui.warn('%s: %s\n' % ( |
340 util.pathto(self.getcwd(), ff), | 340 util.pathto(self.getcwd(), ff), |
378 continue | 378 continue |
379 if src == 'm': | 379 if src == 'm': |
380 nonexistent = True | 380 nonexistent = True |
381 if not st: | 381 if not st: |
382 try: | 382 try: |
383 f = os.path.join(self.root, fn) | 383 f = self.wjoin(fn) |
384 st = os.lstat(f) | 384 st = os.lstat(f) |
385 except OSError, inst: | 385 except OSError, inst: |
386 if inst.errno != errno.ENOENT: | 386 if inst.errno != errno.ENOENT: |
387 raise | 387 raise |
388 st = None | 388 st = None |