tests/test-removeemptydirs.t

39461:7df9ae38c75c

  $ echo hi > somedir/baz
  $ hg ci -qAm second_rebase_dest
  $ hg co -qr 'desc(first_rebase_source)'
  $ cd $TESTTMP/hgrebase/somedir
  $ hg --config extensions.rebase= rebase -qr . -d 'desc(first_rebase_dest)'
  current directory was removed
  (consider changing to repo root: $TESTTMP/hgrebase)
  $ cd $TESTTMP/hgrebase/somedir
(The current node is the rebased first_rebase_source on top of
first_rebase_dest)
This should not output anything about current directory being removed:
  $ hg $NO_RM --config extensions.rebase= rebase -qr . -d 'desc(second_rebase_dest)'

  $ cd foo

Histedit doing 'pick, pick, fold':

  $ hg histedit --commands /dev/stdin <<EOF
  > pick 6274c77c93c3 1 add bar
  > pick ff70a87b588f 0 add foo
  > fold 9992bb0ac0db 2 add baz
  > EOF
  abort: $ENOENT$

  $ hg log -T '{rev}:{node|short} {desc}\n'
  2:94e3f9fae1d6 fold-temp-revision 9992bb0ac0db
  1:5c806432464a add foo
  0:d17db4b0303a add bar

Now test that again with experimental.removeemptydirs=false:
  $ hg init issue5826_norm
  $ cd issue5826_norm

  $ cd foo

Histedit doing 'pick, pick, fold':

  $ hg histedit --commands /dev/stdin <<EOF
  > pick 6274c77c93c3 1 add bar
  > pick ff70a87b588f 0 add foo
  > fold 9992bb0ac0db 2 add baz
  > EOF
  saved backup bundle to $TESTTMP/issue5826_withrm/issue5826_norm/.hg/strip-backup/5c806432464a-cd4c8d86-histedit.hg

  > n
  > y
  > y
  > a
  > EOF
  $ cat ../split_commands | hg split
  current directory was removed
  (consider changing to repo root: $TESTTMP/hgsplit)
  diff --git a/otherfile_in_root b/otherfile_in_root
  new file mode 100644

  +hi
  record change 2/2 to 'somedir/foo'? [Ynesfdaq?] y
  
  abort: $ENOENT$
  [255]

Let's try that again without the rmdir
  $ cd $TESTTMP/hgsplit/somedir
Show that the previous split didn't do anything
  $ hg log -T '{rev}:{node|short} {desc}\n'

39462:e5449ff273d6

  $ echo hi > somedir/baz
  $ hg ci -qAm second_rebase_dest
  $ hg co -qr 'desc(first_rebase_source)'
  $ cd $TESTTMP/hgrebase/somedir
  $ hg --config extensions.rebase= rebase -qr . -d 'desc(first_rebase_dest)'
  current directory was removed (rmcwd !)
  (consider changing to repo root: $TESTTMP/hgrebase) (rmcwd !)
  $ cd $TESTTMP/hgrebase/somedir
(The current node is the rebased first_rebase_source on top of
first_rebase_dest)
This should not output anything about current directory being removed:
  $ hg $NO_RM --config extensions.rebase= rebase -qr . -d 'desc(second_rebase_dest)'

  $ cd foo

Histedit doing 'pick, pick, fold':

#if rmcwd

  $ hg histedit --commands - <<EOF
  > pick 6274c77c93c3 1 add bar
  > pick ff70a87b588f 0 add foo
  > fold 9992bb0ac0db 2 add baz
  > EOF
  abort: $ENOENT$

  $ hg log -T '{rev}:{node|short} {desc}\n'
  2:94e3f9fae1d6 fold-temp-revision 9992bb0ac0db
  1:5c806432464a add foo
  0:d17db4b0303a add bar

#else

  $ cd $TESTTMP/issue5826_withrm

  $ hg histedit --commands - <<EOF
  > pick 6274c77c93c3 1 add bar
  > pick ff70a87b588f 0 add foo
  > fold 9992bb0ac0db 2 add baz
  > EOF
  saved backup bundle to $TESTTMP/issue5826_withrm/.hg/strip-backup/5c806432464a-cd4c8d86-histedit.hg

  $ hg log -T '{rev}:{node|short} {desc}\n'
  1:b9eddaa97cbc add foo
  ***
  add baz
  0:d17db4b0303a add bar

#endif

Now test that again with experimental.removeemptydirs=false:
  $ hg init issue5826_norm
  $ cd issue5826_norm

  $ cd foo

Histedit doing 'pick, pick, fold':

  $ hg histedit --commands - <<EOF
  > pick 6274c77c93c3 1 add bar
  > pick ff70a87b588f 0 add foo
  > fold 9992bb0ac0db 2 add baz
  > EOF
  saved backup bundle to $TESTTMP/issue5826_withrm/issue5826_norm/.hg/strip-backup/5c806432464a-cd4c8d86-histedit.hg

  > n
  > y
  > y
  > a
  > EOF

The split succeeds on no-rmcwd platforms, which alters the rest of the tests
#if rmcwd
  $ cat ../split_commands | hg split
  current directory was removed
  (consider changing to repo root: $TESTTMP/hgsplit)
  diff --git a/otherfile_in_root b/otherfile_in_root
  new file mode 100644

  +hi
  record change 2/2 to 'somedir/foo'? [Ynesfdaq?] y
  
  abort: $ENOENT$
  [255]
#endif

Let's try that again without the rmdir
  $ cd $TESTTMP/hgsplit/somedir
Show that the previous split didn't do anything
  $ hg log -T '{rev}:{node|short} {desc}\n'