view tests/test-rebase-empty-successor.t @ 45956:40f79997e81f

rust: fix non-utf8 char in requirements.rs

Apparently Phabricator detect `rust/hg-core/src/requirements.rs` file as non
utf8 ‽, and mark it as binary.  During application it ended up being non-utf8
and this made Rust (and as a result heptapod) very angry::

    error: couldn't read hg-core/src/requirements.rs: stream did not contain valid UTF-8
      --> hg-core/src/lib.rs:11:9
       |
    11 | pub mod requirements;
       |         ^^^^^^^^^^^^

    error: aborting due to previous error

    error: could not compile `hg-core`.

The after "fixing", the file content has no character matching the following
regexp:

  [^0-9-a-zA-Z /(|).,{}!\[\]:"&=>?_*-;<`'#]

So we should be fine, unless Phabricator does something funny again.

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

  $ cat << EOF >> $HGRCPATH
  > [extensions]
  > rebase=
  > [alias]
  > tglog = log -G -T "{rev} '{desc}'\n"
  > EOF

  $ hg init

  $ echo a > a; hg add a; hg ci -m a
  $ echo b > b; hg add b; hg ci -m b1
  $ hg up 0 -q
  $ echo b > b; hg add b; hg ci -m b2 -q

  $ hg tglog
  @  2 'b2'
  |
  | o  1 'b1'
  |/
  o  0 'a'
  

With rewrite.empty-successor=skip, b2 is skipped because it would become empty.

  $ hg rebase -s 2 -d 1 --config rewrite.empty-successor=skip --dry-run
  starting dry-run rebase; repository will not be changed
  rebasing 2:6e2aad5e0f3c tip "b2"
  note: not rebasing 2:6e2aad5e0f3c tip "b2", its destination already has all its changes
  dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase

With rewrite.empty-successor=keep, b2 will be recreated although it became empty.

  $ hg rebase -s 2 -d 1 --config rewrite.empty-successor=keep
  rebasing 2:6e2aad5e0f3c tip "b2"
  note: created empty successor for 2:6e2aad5e0f3c tip "b2", its destination already has all its changes
  saved backup bundle to $TESTTMP/.hg/strip-backup/6e2aad5e0f3c-7d7c8801-rebase.hg

  $ hg tglog
  @  2 'b2'
  |
  o  1 'b1'
  |
  o  0 'a'