equal
deleted
inserted
replaced
196 # other extensions |
196 # other extensions |
197 keepopen = opts.get('keepopen', False) |
197 keepopen = opts.get('keepopen', False) |
198 |
198 |
199 if opts.get('interactive'): |
199 if opts.get('interactive'): |
200 msg = _("interactive history editing is supported by the " |
200 msg = _("interactive history editing is supported by the " |
201 "'histedit' extension (see 'hg help histedit')") |
201 "'histedit' extension (see \"hg help histedit\")") |
202 raise util.Abort(msg) |
202 raise util.Abort(msg) |
203 |
203 |
204 if collapsemsg and not collapsef: |
204 if collapsemsg and not collapsef: |
205 raise util.Abort( |
205 raise util.Abort( |
206 _('message can only be specified with collapse')) |
206 _('message can only be specified with collapse')) |
325 |
325 |
326 root = min(rebaseset) |
326 root = min(rebaseset) |
327 if not keepf and not repo[root].mutable(): |
327 if not keepf and not repo[root].mutable(): |
328 raise util.Abort(_("can't rebase immutable changeset %s") |
328 raise util.Abort(_("can't rebase immutable changeset %s") |
329 % repo[root], |
329 % repo[root], |
330 hint=_('see hg help phases for details')) |
330 hint=_('see "hg help phases" for details')) |
331 |
331 |
332 originalwd, target, state = result |
332 originalwd, target, state = result |
333 if collapsef: |
333 if collapsef: |
334 targetancestors = repo.changelog.ancestors([target], |
334 targetancestors = repo.changelog.ancestors([target], |
335 inclusive=True) |
335 inclusive=True) |
856 immutable = [d for d in dstates if not repo[d].mutable()] |
856 immutable = [d for d in dstates if not repo[d].mutable()] |
857 cleanup = True |
857 cleanup = True |
858 if immutable: |
858 if immutable: |
859 repo.ui.warn(_("warning: can't clean up immutable changesets %s\n") |
859 repo.ui.warn(_("warning: can't clean up immutable changesets %s\n") |
860 % ', '.join(str(repo[r]) for r in immutable), |
860 % ', '.join(str(repo[r]) for r in immutable), |
861 hint=_('see hg help phases for details')) |
861 hint=_('see "hg help phases" for details')) |
862 cleanup = False |
862 cleanup = False |
863 |
863 |
864 descendants = set() |
864 descendants = set() |
865 if dstates: |
865 if dstates: |
866 descendants = set(repo.changelog.descendants(dstates)) |
866 descendants = set(repo.changelog.descendants(dstates)) |