D2668: rebase: introduce support for automatically rebasing orphan changes

krbullock (Kevin Bullock) phabricator at mercurial-scm.org
Wed Apr 18 14:40:57 EDT 2018


krbullock requested changes to this revision.
krbullock added a comment.
This revision now requires changes to proceed.


  Looks like a couple unresolved comments on _possibledestination, plus one nitpick. I think we can clean those things up easily and then land this though.

INLINE COMMENTS

> rebase.py:840
> +                raise error.Abort(_('--auto-orphans is incompatible with %s') %
> +                                  ('--' + key))
> +        userrevs = list(repo.revs(opts.get('auto_orphans')))

Would be nice to see test coverage of this... it looks to me like we could end up spitting out an error like `incompatible with --foo_bar` (with an underscore) accidentally. That isn't itself a problem now, but could be in the future. We should at least test the mutual exclusion with other options.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2668

To: durin42, #hg-reviewers, indygreg, krbullock
Cc: krbullock, mbthomas, spectral, quark, indygreg, mercurial-devel


More information about the Mercurial-devel mailing list