Show More
@@ -1096,6 +1096,7 def clearrebased(ui, repo, state, skippe | |||
|
1096 | 1096 | |
|
1097 | 1097 | def pullrebase(orig, ui, repo, *args, **opts): |
|
1098 | 1098 | 'Call rebase after pull if the latter has been invoked with --rebase' |
|
1099 | ret = None | |
|
1099 | 1100 | if opts.get('rebase'): |
|
1100 | 1101 | wlock = lock = None |
|
1101 | 1102 | try: |
@@ -1113,7 +1114,7 def pullrebase(orig, ui, repo, *args, ** | |||
|
1113 | 1114 | pass |
|
1114 | 1115 | commands.postincoming = _dummy |
|
1115 | 1116 | try: |
|
1116 | orig(ui, repo, *args, **opts) | |
|
1117 | ret = orig(ui, repo, *args, **opts) | |
|
1117 | 1118 | finally: |
|
1118 | 1119 | commands.postincoming = origpostincoming |
|
1119 | 1120 | revspostpull = len(repo) |
@@ -1140,7 +1141,9 def pullrebase(orig, ui, repo, *args, ** | |||
|
1140 | 1141 | else: |
|
1141 | 1142 | if opts.get('tool'): |
|
1142 | 1143 | raise error.Abort(_('--tool can only be used with --rebase')) |
|
1143 | orig(ui, repo, *args, **opts) | |
|
1144 | ret = orig(ui, repo, *args, **opts) | |
|
1145 | ||
|
1146 | return ret | |
|
1144 | 1147 | |
|
1145 | 1148 | def _setrebasesetvisibility(repo, revs): |
|
1146 | 1149 | """store the currently rebased set on the repo object |
General Comments 0
You need to be logged in to leave comments.
Login now