Show More
@@ -1036,7 +1036,6 b' def _histedit(ui, repo, state, *freeargs' | |||
|
1036 | 1036 | |
|
1037 | 1037 | |
|
1038 | 1038 | state.keep = opts.get('keep', False) |
|
1039 | supportsmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt) | |
|
1040 | 1039 | |
|
1041 | 1040 | # rebuild state |
|
1042 | 1041 | if goal == 'continue': |
@@ -1051,6 +1050,13 b' def _histedit(ui, repo, state, *freeargs' | |||
|
1051 | 1050 | else: |
|
1052 | 1051 | _newaction(ui, repo, state, revs, freeargs, opts) |
|
1053 | 1052 | |
|
1053 | _continueaction(ui, repo, state) | |
|
1054 | ||
|
1055 | def _continueaction(ui, repo, state): | |
|
1056 | """This action runs after either: | |
|
1057 | - bootstrapcontinue (if the goal is 'continue') | |
|
1058 | - _newaction (if the goal is 'new') | |
|
1059 | """ | |
|
1054 | 1060 | # preprocess rules so that we can hide inner folds from the user |
|
1055 | 1061 | # and only show one editor |
|
1056 | 1062 | actions = state.actions[:] |
@@ -1092,6 +1098,7 b' def _histedit(ui, repo, state, *freeargs' | |||
|
1092 | 1098 | for n in succs[1:]: |
|
1093 | 1099 | ui.debug(m % node.short(n)) |
|
1094 | 1100 | |
|
1101 | supportsmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt) | |
|
1095 | 1102 | if supportsmarkers: |
|
1096 | 1103 | # Only create markers if the temp nodes weren't already removed. |
|
1097 | 1104 | obsolete.createmarkers(repo, ((repo[t],()) for t in sorted(tmpnodes) |
General Comments 0
You need to be logged in to leave comments.
Login now