equal
deleted
inserted
replaced
354 path = '/'.join(filter(None, path)) |
354 path = '/'.join(filter(None, path)) |
355 data = '\n'.join(makeline() |
355 data = '\n'.join(makeline() |
356 for __ in xrange(pick(linesinfilesadded))) + '\n' |
356 for __ in xrange(pick(linesinfilesadded))) + '\n' |
357 changes[path] = context.memfilectx(repo, path, data) |
357 changes[path] = context.memfilectx(repo, path, data) |
358 def filectxfn(repo, memctx, path): |
358 def filectxfn(repo, memctx, path): |
359 data = changes[path] |
359 return changes[path] |
360 if data is None: |
|
361 raise IOError |
|
362 return data |
|
363 if not changes: |
360 if not changes: |
364 continue |
361 continue |
365 if revs: |
362 if revs: |
366 date = repo['tip'].date()[0] + pick(interarrival) |
363 date = repo['tip'].date()[0] + pick(interarrival) |
367 else: |
364 else: |