Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/dirstate.py @ 1230:6eac821c202c
dirstate: two more stat -> lstat changes
| author | mpm@selenic.com |
|---|---|
| date | Fri, 09 Sep 2005 12:17:51 -0700 |
| parents | db950da49539 |
| children | d0a960b437a8 |
comparison
equal
deleted
inserted
replaced
| 1229:2eb1cd695dd2 | 1230:6eac821c202c |
|---|---|
| 138 self.markdirty() | 138 self.markdirty() |
| 139 for f in files: | 139 for f in files: |
| 140 if state == "r": | 140 if state == "r": |
| 141 self.map[f] = ('r', 0, 0, 0) | 141 self.map[f] = ('r', 0, 0, 0) |
| 142 else: | 142 else: |
| 143 s = os.stat(os.path.join(self.root, f)) | 143 s = os.lstat(os.path.join(self.root, f)) |
| 144 st_size = kw.get('st_size', s.st_size) | 144 st_size = kw.get('st_size', s.st_size) |
| 145 st_mtime = kw.get('st_mtime', s.st_mtime) | 145 st_mtime = kw.get('st_mtime', s.st_mtime) |
| 146 self.map[f] = (state, s.st_mode, st_size, st_mtime) | 146 self.map[f] = (state, s.st_mode, st_size, st_mtime) |
| 147 if self.copies.has_key(f): | 147 if self.copies.has_key(f): |
| 148 del self.copies[f] | 148 del self.copies[f] |
| 270 # step one, find all files that match our criteria | 270 # step one, find all files that match our criteria |
| 271 files.sort() | 271 files.sort() |
| 272 for ff in util.unique(files): | 272 for ff in util.unique(files): |
| 273 f = os.path.join(self.root, ff) | 273 f = os.path.join(self.root, ff) |
| 274 try: | 274 try: |
| 275 st = os.stat(f) | 275 st = os.lstat(f) |
| 276 except OSError, inst: | 276 except OSError, inst: |
| 277 if ff not in dc: self.ui.warn('%s: %s\n' % ( | 277 if ff not in dc: self.ui.warn('%s: %s\n' % ( |
| 278 util.pathto(self.getcwd(), ff), | 278 util.pathto(self.getcwd(), ff), |
| 279 inst.strerror)) | 279 inst.strerror)) |
| 280 continue | 280 continue |