equal
deleted
inserted
replaced
11 from mercurial.i18n import _ |
11 from mercurial.i18n import _ |
12 from mercurial import ( |
12 from mercurial import ( |
13 config, |
13 config, |
14 error, |
14 error, |
15 node as nodemod, |
15 node as nodemod, |
|
16 pycompat, |
16 ) |
17 ) |
17 |
18 |
18 from . import ( |
19 from . import ( |
19 common, |
20 common, |
20 ) |
21 ) |
173 raise IOError |
174 raise IOError |
174 self.catfilepipe[0].write(rev+'\n') |
175 self.catfilepipe[0].write(rev+'\n') |
175 self.catfilepipe[0].flush() |
176 self.catfilepipe[0].flush() |
176 info = self.catfilepipe[1].readline().split() |
177 info = self.catfilepipe[1].readline().split() |
177 if info[1] != ftype: |
178 if info[1] != ftype: |
178 raise error.Abort(_('cannot read %r object at %s') % (ftype, rev)) |
179 raise error.Abort(_('cannot read %r object at %s') % ( |
|
180 pycompat.bytestr(ftype), rev)) |
179 size = int(info[2]) |
181 size = int(info[2]) |
180 data = self.catfilepipe[1].read(size) |
182 data = self.catfilepipe[1].read(size) |
181 if len(data) < size: |
183 if len(data) < size: |
182 raise error.Abort(_('cannot read %r object at %s: unexpected size') |
184 raise error.Abort(_('cannot read %r object at %s: unexpected size') |
183 % (ftype, rev)) |
185 % (ftype, rev)) |
292 l = difftree[i] |
294 l = difftree[i] |
293 i += 1 |
295 i += 1 |
294 if not entry: |
296 if not entry: |
295 if not l.startswith(':'): |
297 if not l.startswith(':'): |
296 continue |
298 continue |
297 entry = l.split() |
299 entry = tuple(pycompat.bytestr(p) for p in l.split()) |
298 continue |
300 continue |
299 f = l |
301 f = l |
300 if entry[4][0] == 'C': |
302 if entry[4][0] == 'C': |
301 copysrc = f |
303 copysrc = f |
302 copydest = difftree[i] |
304 copydest = difftree[i] |