Show More
@@ -69,6 +69,8 b' def rebase(ui, repo, **opts):' | |||
|
69 | 69 | |
|
70 | 70 | If a rebase is interrupted to manually resolve a merge, it can be |
|
71 | 71 | continued with --continue/-c or aborted with --abort/-a. |
|
72 | ||
|
73 | Returns 0 on success, 1 if nothing to rebase. | |
|
72 | 74 | """ |
|
73 | 75 | originalwd = target = None |
|
74 | 76 | external = nullrev |
@@ -115,8 +117,7 b' def rebase(ui, repo, **opts):' | |||
|
115 | 117 | (originalwd, target, state, collapsef, keepf, |
|
116 | 118 | keepbranchesf, external) = restorestatus(repo) |
|
117 | 119 | if abortf: |
|
118 | abort(repo, originalwd, target, state) | |
|
119 | return | |
|
120 | return abort(repo, originalwd, target, state) | |
|
120 | 121 | else: |
|
121 | 122 | if srcf and basef: |
|
122 | 123 | raise error.ParseError('rebase', _('cannot specify both a ' |
@@ -134,7 +135,7 b' def rebase(ui, repo, **opts):' | |||
|
134 | 135 | if not result: |
|
135 | 136 | # Empty state built, nothing to rebase |
|
136 | 137 | ui.status(_('nothing to rebase\n')) |
|
137 | return | |
|
138 | return 1 | |
|
138 | 139 | else: |
|
139 | 140 | originalwd, target, state = result |
|
140 | 141 | if collapsef: |
@@ -428,6 +429,7 b' def abort(repo, originalwd, target, stat' | |||
|
428 | 429 | if set(repo.changelog.descendants(target)) - set(state.values()): |
|
429 | 430 | repo.ui.warn(_("warning: new changesets detected on target branch, " |
|
430 | 431 | "can't abort\n")) |
|
432 | return -1 | |
|
431 | 433 | else: |
|
432 | 434 | # Strip from the first rebased revision |
|
433 | 435 | merge.update(repo, repo[originalwd].rev(), False, True, False) |
@@ -438,6 +440,7 b' def abort(repo, originalwd, target, stat' | |||
|
438 | 440 | repair.strip(repo.ui, repo, repo[strippoint].node()) |
|
439 | 441 | clearstatus(repo) |
|
440 | 442 | repo.ui.status(_('rebase aborted\n')) |
|
443 | return 0 | |
|
441 | 444 | |
|
442 | 445 | def buildstate(repo, dest, src, base, detach): |
|
443 | 446 | 'Define which revisions are going to be rebased and where' |
@@ -47,6 +47,8 b' move changeset (and descendants) to a di' | |||
|
47 | 47 | If a rebase is interrupted to manually resolve a merge, it can be |
|
48 | 48 | continued with --continue/-c or aborted with --abort/-a. |
|
49 | 49 | |
|
50 | Returns 0 on success, 1 if nothing to rebase. | |
|
51 | ||
|
50 | 52 | options: |
|
51 | 53 | |
|
52 | 54 | -s --source rebase from the specified changeset |
@@ -111,6 +113,8 b' move changeset (and descendants) to a di' | |||
|
111 | 113 | If a rebase is interrupted to manually resolve a merge, it can be |
|
112 | 114 | continued with --continue/-c or aborted with --abort/-a. |
|
113 | 115 | |
|
116 | Returns 0 on success, 1 if nothing to rebase. | |
|
117 | ||
|
114 | 118 | options: |
|
115 | 119 | |
|
116 | 120 | -s --source rebase from the specified changeset |
@@ -175,6 +179,8 b' move changeset (and descendants) to a di' | |||
|
175 | 179 | If a rebase is interrupted to manually resolve a merge, it can be |
|
176 | 180 | continued with --continue/-c or aborted with --abort/-a. |
|
177 | 181 | |
|
182 | Returns 0 on success, 1 if nothing to rebase. | |
|
183 | ||
|
178 | 184 | options: |
|
179 | 185 | |
|
180 | 186 | -s --source rebase from the specified changeset |
@@ -239,6 +245,8 b' move changeset (and descendants) to a di' | |||
|
239 | 245 | If a rebase is interrupted to manually resolve a merge, it can be |
|
240 | 246 | continued with --continue/-c or aborted with --abort/-a. |
|
241 | 247 | |
|
248 | Returns 0 on success, 1 if nothing to rebase. | |
|
249 | ||
|
242 | 250 | options: |
|
243 | 251 | |
|
244 | 252 | -s --source rebase from the specified changeset |
General Comments 0
You need to be logged in to leave comments.
Login now