equal
deleted
inserted
replaced
1820 if opts.get(r'update'): |
1820 if opts.get(r'update'): |
1821 del opts[r'update'] |
1821 del opts[r'update'] |
1822 ui.debug('--update and --rebase are not compatible, ignoring ' |
1822 ui.debug('--update and --rebase are not compatible, ignoring ' |
1823 'the update flag\n') |
1823 'the update flag\n') |
1824 |
1824 |
1825 cmdutil.checkunfinished(repo) |
1825 cmdutil.checkunfinished(repo, skipmerge=True) |
1826 cmdutil.bailifchanged(repo, hint=_('cannot pull with rebase: ' |
1826 cmdutil.bailifchanged(repo, hint=_('cannot pull with rebase: ' |
1827 'please commit or shelve your changes first')) |
1827 'please commit or shelve your changes first')) |
1828 |
1828 |
1829 revsprepull = len(repo) |
1829 revsprepull = len(repo) |
1830 origpostincoming = commands.postincoming |
1830 origpostincoming = commands.postincoming |
1948 entry[1].append(('', 'rebase', None, |
1948 entry[1].append(('', 'rebase', None, |
1949 _("rebase working directory to branch head"))) |
1949 _("rebase working directory to branch head"))) |
1950 entry[1].append(('t', 'tool', '', |
1950 entry[1].append(('t', 'tool', '', |
1951 _("specify merge tool for rebase"))) |
1951 _("specify merge tool for rebase"))) |
1952 cmdutil.summaryhooks.add('rebase', summaryhook) |
1952 cmdutil.summaryhooks.add('rebase', summaryhook) |
1953 statemod.addunfinished('rebase', fname='rebasestate') |
1953 statemod.addunfinished('rebase', fname='rebasestate', stopflag=True) |
1954 cmdutil.afterresolvedstates.append( |
1954 cmdutil.afterresolvedstates.append( |
1955 ['rebasestate', _('hg rebase --continue')]) |
1955 ['rebasestate', _('hg rebase --continue')]) |