equal
deleted
inserted
replaced
33 copies, |
33 copies, |
34 destutil, |
34 destutil, |
35 dirstateguard, |
35 dirstateguard, |
36 error, |
36 error, |
37 extensions, |
37 extensions, |
|
38 logcmdutil, |
38 merge as mergemod, |
39 merge as mergemod, |
39 mergestate as mergestatemod, |
40 mergestate as mergestatemod, |
40 mergeutil, |
41 mergeutil, |
41 obsolete, |
42 obsolete, |
42 obsutil, |
43 obsutil, |
1300 ) |
1301 ) |
1301 |
1302 |
1302 dest = None |
1303 dest = None |
1303 |
1304 |
1304 if revf: |
1305 if revf: |
1305 rebaseset = scmutil.revrange(repo, revf) |
1306 rebaseset = logcmdutil.revrange(repo, revf) |
1306 if not rebaseset: |
1307 if not rebaseset: |
1307 ui.status(_(b'empty "rev" revision set - nothing to rebase\n')) |
1308 ui.status(_(b'empty "rev" revision set - nothing to rebase\n')) |
1308 return None |
1309 return None |
1309 elif srcf: |
1310 elif srcf: |
1310 src = scmutil.revrange(repo, srcf) |
1311 src = logcmdutil.revrange(repo, srcf) |
1311 if not src: |
1312 if not src: |
1312 ui.status(_(b'empty "source" revision set - nothing to rebase\n')) |
1313 ui.status(_(b'empty "source" revision set - nothing to rebase\n')) |
1313 return None |
1314 return None |
1314 # `+ (%ld)` to work around `wdir()::` being empty |
1315 # `+ (%ld)` to work around `wdir()::` being empty |
1315 rebaseset = repo.revs(b'(%ld):: + (%ld)', src, src) |
1316 rebaseset = repo.revs(b'(%ld):: + (%ld)', src, src) |
1316 else: |
1317 else: |
1317 base = scmutil.revrange(repo, basef or [b'.']) |
1318 base = logcmdutil.revrange(repo, basef or [b'.']) |
1318 if not base: |
1319 if not base: |
1319 ui.status( |
1320 ui.status( |
1320 _(b'empty "base" revision set - ' b"can't compute rebase set\n") |
1321 _(b'empty "base" revision set - ' b"can't compute rebase set\n") |
1321 ) |
1322 ) |
1322 return None |
1323 return None |