Mercurial > hg > pyhgsh
comparison mercurial/dirstate.py @ 1117:30ab5b8ee8ec
fix some rename/copy bugs
- delete copy information when we update dirstate
hg was keeping the copy state and marking things as copied on
multiple commits
- files that are renamed should have no parents
if you do a rename/copy to an existing file, it should not be marked
as descending from its previous revisions.
- remove spurious print from filelog.renamed
- add some more copy tests
| author | mpm@selenic.com |
|---|---|
| date | Sat, 27 Aug 2005 22:04:17 -0700 |
| parents | 98988cc3723a |
| children | d9e85a75dbda |
comparison
equal
deleted
inserted
replaced
| 1116:0cdd73b0767c | 1117:30ab5b8ee8ec |
|---|---|
| 139 else: | 139 else: |
| 140 s = os.stat(os.path.join(self.root, f)) | 140 s = os.stat(os.path.join(self.root, f)) |
| 141 st_size = kw.get('st_size', s.st_size) | 141 st_size = kw.get('st_size', s.st_size) |
| 142 st_mtime = kw.get('st_mtime', s.st_mtime) | 142 st_mtime = kw.get('st_mtime', s.st_mtime) |
| 143 self.map[f] = (state, s.st_mode, st_size, st_mtime) | 143 self.map[f] = (state, s.st_mode, st_size, st_mtime) |
| 144 if self.copies.has_key(f): | |
| 145 del self.copies[f] | |
| 144 | 146 |
| 145 def forget(self, files): | 147 def forget(self, files): |
| 146 if not files: return | 148 if not files: return |
| 147 self.read() | 149 self.read() |
| 148 self.markdirty() | 150 self.markdirty() |