equal
deleted
inserted
replaced
2528 # `logmessage` anyway. |
2528 # `logmessage` anyway. |
2529 opts.pop('logfile') |
2529 opts.pop('logfile') |
2530 # First, do a regular commit to record all changes in the working |
2530 # First, do a regular commit to record all changes in the working |
2531 # directory (if there are any) |
2531 # directory (if there are any) |
2532 ui.callhooks = False |
2532 ui.callhooks = False |
2533 activebookmark = repo._activebookmark |
2533 activebookmark = repo._bookmarks.active |
2534 try: |
2534 try: |
2535 repo._activebookmark = None |
2535 repo._bookmarks.active = None |
2536 opts['message'] = 'temporary amend commit for %s' % old |
2536 opts['message'] = 'temporary amend commit for %s' % old |
2537 node = commit(ui, repo, commitfunc, pats, opts) |
2537 node = commit(ui, repo, commitfunc, pats, opts) |
2538 finally: |
2538 finally: |
2539 repo._activebookmark = activebookmark |
2539 repo._bookmarks.active = activebookmark |
|
2540 repo._bookmarks.recordchange(tr) |
2540 ui.callhooks = True |
2541 ui.callhooks = True |
2541 ctx = repo[node] |
2542 ctx = repo[node] |
2542 |
2543 |
2543 # Participating changesets: |
2544 # Participating changesets: |
2544 # |
2545 # |