equal
deleted
inserted
replaced
820 _(b'REV'), |
820 _(b'REV'), |
821 ), |
821 ), |
822 ( |
822 ( |
823 b'b', |
823 b'b', |
824 b'base', |
824 b'base', |
825 b'', |
825 [], |
826 _(b'rebase everything from branching point of specified changeset'), |
826 _(b'rebase everything from branching point of specified changeset'), |
827 _(b'REV'), |
827 _(b'REV'), |
828 ), |
828 ), |
829 (b'r', b'rev', [], _(b'rebase these revisions'), _(b'REV')), |
829 (b'r', b'rev', [], _(b'rebase these revisions'), _(b'REV')), |
830 ( |
830 ( |
869 ), |
869 ), |
870 ] |
870 ] |
871 + cmdutil.dryrunopts |
871 + cmdutil.dryrunopts |
872 + cmdutil.formatteropts |
872 + cmdutil.formatteropts |
873 + cmdutil.confirmopts, |
873 + cmdutil.confirmopts, |
874 _(b'[[-s REV]... | -b REV | [-r REV]...] [-d REV] [OPTION]...'), |
874 _(b'[[-s REV]... | [-b REV]... | [-r REV]...] [-d REV] [OPTION]...'), |
875 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, |
875 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, |
876 ) |
876 ) |
877 def rebase(ui, repo, **opts): |
877 def rebase(ui, repo, **opts): |
878 """move changeset (and descendants) to a different branch |
878 """move changeset (and descendants) to a different branch |
879 |
879 |
1185 ui, |
1185 ui, |
1186 repo, |
1186 repo, |
1187 inmemory, |
1187 inmemory, |
1188 opts.get(b'dest', None), |
1188 opts.get(b'dest', None), |
1189 opts.get(b'source', []), |
1189 opts.get(b'source', []), |
1190 opts.get(b'base', None), |
1190 opts.get(b'base', []), |
1191 opts.get(b'rev', []), |
1191 opts.get(b'rev', []), |
1192 destspace=destspace, |
1192 destspace=destspace, |
1193 ) |
1193 ) |
1194 retcode = rbsrt._preparenewrebase(destmap) |
1194 retcode = rbsrt._preparenewrebase(destmap) |
1195 if retcode is not None: |
1195 if retcode is not None: |
1248 ui.status(_(b'empty "source" revision set - nothing to rebase\n')) |
1248 ui.status(_(b'empty "source" revision set - nothing to rebase\n')) |
1249 return None |
1249 return None |
1250 # `+ (%ld)` to work around `wdir()::` being empty |
1250 # `+ (%ld)` to work around `wdir()::` being empty |
1251 rebaseset = repo.revs(b'(%ld):: + (%ld)', src, src) |
1251 rebaseset = repo.revs(b'(%ld):: + (%ld)', src, src) |
1252 else: |
1252 else: |
1253 base = scmutil.revrange(repo, [basef or b'.']) |
1253 base = scmutil.revrange(repo, basef or [b'.']) |
1254 if not base: |
1254 if not base: |
1255 ui.status( |
1255 ui.status( |
1256 _(b'empty "base" revision set - ' b"can't compute rebase set\n") |
1256 _(b'empty "base" revision set - ' b"can't compute rebase set\n") |
1257 ) |
1257 ) |
1258 return None |
1258 return None |