comparison tests/test-rebase-obsolete.t @ 37787:92213f6745ed

rebase: introduce support for automatically rebasing orphan changes

_destautorebase(SRC) is based on the _destrestack(SRC) revset from
fbamend. The supporting _possibledestination function is extracted
from evolve, with minor cleanups.

We've considered some alternatives here:
 * This change, but with --auto as the flag name. We're hedging our bets
   on this a little in this change so that if this ends up being the wrong
   direction we haven't burned the valauble --auto name on rebase.
 * --destination auto: I've got reservations about the discoverability of this,
   and we don't currently have a good story for a revset alias of sorts that
   changes behavior depending on the context in which it's used.
 * A "rebase presets" feature, where we could use the currently-an-error
   positional argument space for the rebase command to define presets, so that
   users could define a 'linearize' preset that specifies
   --revision='orphan()-obsolete()' and --dest=_destautoorphanrebase(SRC).

Personally, I find the third option somewhat appealing, but am
hesitant to "spend" the functionality space of positional arguments to
the rebase command. We should revisit the way we expose this
functionality sometime in the 4.7 cycle once we've had a chance to vet
the implementation of the functionality.

Differential Revision: https://phab.mercurial-scm.org/D2668

37786:cc932c15b9ee

  | |
  | o  4:9520eea781bc E
  |/
  o  0:cd010b8cd998 A
  


Test multiple root handling
------------------------------------

  $ hg rebase --dest 4 --rev '7+11+9'

37787:92213f6745ed

  | |
  | o  4:9520eea781bc E
  |/
  o  0:cd010b8cd998 A
  
  $ cd ..
  $ cp -R hidden stabilize
  $ cd stabilize
  $ hg rebase --auto-orphans '0::' -d 10
  abort: --auto-orphans is incompatible with --dest
  [255]
  $ hg rebase --auto-orphans '0::'
  rebasing 9:cf44d2f5a9f4 "D"
  $ hg log -G
  o  12:7e3935feaa68 D
  |
  o  11:0d8f238b634c C
  |
  o  10:7c6027df6a99 B
  |
  @  7:02de42196ebe H
  |
  | o  6:eea13746799a G
  |/|
  o |  5:24b6387c8c8c F
  | |
  | o  4:9520eea781bc E
  |/
  o  0:cd010b8cd998 A
  

  $ cd ../hidden
  $ rm -r ../stabilize

Test multiple root handling
------------------------------------

  $ hg rebase --dest 4 --rev '7+11+9'