equal
deleted
inserted
replaced
172 'revision and a base')) |
172 'revision and a base')) |
173 if revf and srcf: |
173 if revf and srcf: |
174 raise util.Abort(_('cannot specify both a ' |
174 raise util.Abort(_('cannot specify both a ' |
175 'revision and a source')) |
175 'revision and a source')) |
176 |
176 |
|
177 cmdutil.checkunfinished(repo) |
177 cmdutil.bailifchanged(repo) |
178 cmdutil.bailifchanged(repo) |
178 |
179 |
179 if not destf: |
180 if not destf: |
180 # Destination defaults to the latest revision in the |
181 # Destination defaults to the latest revision in the |
181 # current branch |
182 # current branch |
796 entry[1].append(('', 'rebase', None, |
797 entry[1].append(('', 'rebase', None, |
797 _("rebase working directory to branch head"))) |
798 _("rebase working directory to branch head"))) |
798 entry[1].append(('t', 'tool', '', |
799 entry[1].append(('t', 'tool', '', |
799 _("specify merge tool for rebase"))) |
800 _("specify merge tool for rebase"))) |
800 cmdutil.summaryhooks.add('rebase', summaryhook) |
801 cmdutil.summaryhooks.add('rebase', summaryhook) |
|
802 cmdutil.unfinishedstates.append( |
|
803 ['rebasestate', False, _('rebase in progress'), |
|
804 _("use 'hg rebase --continue' or 'hg rebase --abort'")]) |