Mercurial > hg
changeset 865:2d2fee33ec68
Cleanup after previous changes:
- there are only two states for the exec bit, so no need to override it.
- file_ variable is only once now, so it self.file(f) can be used directly.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 10 Aug 2005 08:41:23 +0100 |
| parents | 6225bd773c51 |
| children | 6d6095823b82 |
| files | mercurial/hg.py |
| diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hg.py Wed Aug 10 08:23:42 2005 +0100 +++ b/mercurial/hg.py Wed Aug 10 08:41:23 2005 +0100 @@ -407,10 +407,9 @@ self.map[f] = ('r', 0, 0, 0) else: s = os.stat(os.path.join(self.root, f)) - st_mode = kw.get('st_mode', s.st_mode) st_size = kw.get('st_size', s.st_size) st_mtime = kw.get('st_mtime', s.st_mtime) - self.map[f] = (state, st_mode, st_size, st_mtime) + self.map[f] = (state, s.st_mode, st_size, st_mtime) def forget(self, files): if not files: return @@ -1583,8 +1582,7 @@ # update dirstate from parent1's manifest m1n = self.changelog.read(p1)[0] m1 = self.manifest.read(m1n) - file_ = self.file(f) - f_len = len(file_.read(m1[f])) + f_len = len(self.file(f).read(m1[f])) self.dirstate.update([f], mode, st_size=f_len, st_mtime=0) else: self.ui.warn("Second parent without branch merge!?\n"