equal
deleted
inserted
replaced
246 total += 1 |
246 total += 1 |
247 |
247 |
248 if mergeable_file: |
248 if mergeable_file: |
249 linesperrev = 2 |
249 linesperrev = 2 |
250 # make a file with k lines per rev |
250 # make a file with k lines per rev |
251 initialmergedlines = [ |
251 initialmergedlines = [b'%d' % i for i in range(0, total * linesperrev)] |
252 b'%d' % i for i in pycompat.xrange(0, total * linesperrev) |
|
253 ] |
|
254 initialmergedlines.append(b"") |
252 initialmergedlines.append(b"") |
255 |
253 |
256 tags = [] |
254 tags = [] |
257 progress = ui.makeprogress( |
255 progress = ui.makeprogress( |
258 _(b'building'), unit=_(b'revisions'), total=total |
256 _(b'building'), unit=_(b'revisions'), total=total |
3191 ) |
3189 ) |
3192 ) |
3190 ) |
3193 ts = 0 |
3191 ts = 0 |
3194 heads = set() |
3192 heads = set() |
3195 |
3193 |
3196 for rev in pycompat.xrange(numrevs): |
3194 for rev in range(numrevs): |
3197 dbase = r.deltaparent(rev) |
3195 dbase = r.deltaparent(rev) |
3198 if dbase == -1: |
3196 if dbase == -1: |
3199 dbase = rev |
3197 dbase = rev |
3200 cbase = r.chainbase(rev) |
3198 cbase = r.chainbase(rev) |
3201 clen = r.chainlen(rev) |
3199 clen = r.chainlen(rev) |
3289 if size > l[1]: |
3287 if size > l[1]: |
3290 l[1] = size |
3288 l[1] = size |
3291 l[2] += size |
3289 l[2] += size |
3292 |
3290 |
3293 numrevs = len(r) |
3291 numrevs = len(r) |
3294 for rev in pycompat.xrange(numrevs): |
3292 for rev in range(numrevs): |
3295 p1, p2 = r.parentrevs(rev) |
3293 p1, p2 = r.parentrevs(rev) |
3296 delta = r.deltaparent(rev) |
3294 delta = r.deltaparent(rev) |
3297 if format > 0: |
3295 if format > 0: |
3298 addsize(r.rawsize(rev), datasize) |
3296 addsize(r.rawsize(rev), datasize) |
3299 if p2 != nullrev: |
3297 if p2 != nullrev: |