Mercurial > hg
changeset 2426:fb942bc15ef9
merge with crew.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Mon, 12 Jun 2006 09:36:44 -0700 |
parents | be2fd6398d50 (diff) 092039246d73 (current diff) |
children | 150cde10ea21 |
files | |
diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/dirstate.py Sat Jun 10 17:39:29 2006 +0200 +++ b/mercurial/dirstate.py Mon Jun 12 09:36:44 2006 -0700 @@ -168,15 +168,17 @@ pos = 40 e_size = struct.calcsize(self.format) while pos < len(st): - e = struct.unpack(self.format, st[pos:pos+e_size]) + newpos = pos + e_size + e = struct.unpack(self.format, st[pos:newpos]) l = e[4] - pos += e_size - f = st[pos:pos + l] + pos = newpos + newpos = pos + l + f = st[pos:newpos] if '\0' in f: f, c = f.split('\0') self.copies[f] = c self.map[f] = e[:4] - pos += l + pos = newpos def copy(self, source, dest): self.lazyread()