Show More
@@ -3454,7 +3454,6 b' def graft(ui, repo, *revs, **opts):' | |||||
3454 |
|
3454 | |||
3455 | wlock = repo.wlock() |
|
3455 | wlock = repo.wlock() | |
3456 | try: |
|
3456 | try: | |
3457 | current = repo['.'] |
|
|||
3458 | for pos, ctx in enumerate(repo.set("%ld", revs)): |
|
3457 | for pos, ctx in enumerate(repo.set("%ld", revs)): | |
3459 |
|
3458 | |||
3460 | ui.status(_('grafting revision %s\n') % ctx.rev()) |
|
3459 | ui.status(_('grafting revision %s\n') % ctx.rev()) | |
@@ -3482,16 +3481,8 b' def graft(ui, repo, *revs, **opts):' | |||||
3482 | # ui.forcemerge is an internal variable, do not document |
|
3481 | # ui.forcemerge is an internal variable, do not document | |
3483 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
3482 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
3484 | 'graft') |
|
3483 | 'graft') | |
3485 |
stats = mergemod. |
|
3484 | stats = mergemod.graft(repo, ctx, ctx.p1(), | |
3486 |
|
|
3485 | ['local', 'graft']) | |
3487 | labels=['local', 'graft']) |
|
|||
3488 | # drop the second merge parent |
|
|||
3489 | repo.dirstate.beginparentchange() |
|
|||
3490 | repo.setparents(current.node(), nullid) |
|
|||
3491 | repo.dirstate.write() |
|
|||
3492 | # fix up dirstate for copies and renames |
|
|||
3493 | copies.duplicatecopies(repo, ctx.rev(), ctx.p1().rev()) |
|
|||
3494 | repo.dirstate.endparentchange() |
|
|||
3495 | finally: |
|
3486 | finally: | |
3496 | repo.ui.setconfig('ui', 'forcemerge', '', 'graft') |
|
3487 | repo.ui.setconfig('ui', 'forcemerge', '', 'graft') | |
3497 | # report any conflicts |
|
3488 | # report any conflicts | |
@@ -3510,8 +3501,6 b' def graft(ui, repo, *revs, **opts):' | |||||
3510 | date=date, extra=extra, editor=editor) |
|
3501 | date=date, extra=extra, editor=editor) | |
3511 | if node is None: |
|
3502 | if node is None: | |
3512 | ui.status(_('graft for revision %s is empty\n') % ctx.rev()) |
|
3503 | ui.status(_('graft for revision %s is empty\n') % ctx.rev()) | |
3513 | else: |
|
|||
3514 | current = repo[node] |
|
|||
3515 | finally: |
|
3504 | finally: | |
3516 | wlock.release() |
|
3505 | wlock.release() | |
3517 |
|
3506 |
General Comments 0
You need to be logged in to leave comments.
Login now