| changeset 2740 | 51afc979d88d |
| parent 2733 | adfbb984ebbb |
| child 2744 | ddfe336de779 |
| 2739:7d86594cb829 | 2740:51afc979d88d |
|---|---|
613 # if rebase is running and update the currenttopic to topic of new |
613 # if rebase is running and update the currenttopic to topic of new |
614 # rebased commit. We have explicitly stored in config if rebase is |
614 # rebased commit. We have explicitly stored in config if rebase is |
615 # running. |
615 # running. |
616 if repo.ui.hasconfig('experimental', 'topicrebase'): |
616 if repo.ui.hasconfig('experimental', 'topicrebase'): |
617 isrebase = True |
617 isrebase = True |
618 if repo.ui.configbool('_internal', 'updating-to-t0'): |
618 if repo.ui.configbool('_internal', 'keep-topic'): |
619 ist0 = True |
619 ist0 = True |
620 if ((not partial and not branchmerge) or isrebase) and not ist0: |
620 if ((not partial and not branchmerge) or isrebase) and not ist0: |
621 ot = repo.currenttopic |
621 ot = repo.currenttopic |
622 t = '' |
622 t = '' |
623 pctx = repo[node] |
623 pctx = repo[node] |
638 check=False, merge=None, tool=None): |
638 check=False, merge=None, tool=None): |
639 |
639 |
640 thezeros = set(['t0', 'b0']) |
640 thezeros = set(['t0', 'b0']) |
641 overrides = {} |
641 overrides = {} |
642 if node in thezeros or rev in thezeros: |
642 if node in thezeros or rev in thezeros: |
643 overrides[('_internal', 'updating-to-t0')] = 'yes' |
643 overrides[('_internal', 'keep-topic')] = 'yes' |
644 with repo.ui.configoverride(overrides, source='topic-extension'): |
644 with repo.ui.configoverride(overrides, source='topic-extension'): |
645 return orig(ui, repo, node, rev, clean, date, check, merge, tool) |
645 return orig(ui, repo, node, rev, clean, date, check, merge, tool) |
646 |
646 |
647 def _fixrebase(loaded): |
647 def _fixrebase(loaded): |
648 if not loaded: |
648 if not loaded: |