This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11054

test-removeemptydirs: clarify the state of things in the `histedit` case
ClosedPublic

Authored by marmoute on Jul 9 2021, 8:35 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGf2846abd9e21: test-removeemptydirs: clarify the state of things in the `histedit` case
Summary

This make the test easier to follow and will help to compare with the behavior
on windows.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Jul 9 2021, 8:35 PM
baymax updated this revision to Diff 29089.Jul 9 2021, 9:22 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 29109.Jul 9 2021, 11:41 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHGf2846abd9e21: test-removeemptydirs: clarify the state of things in the `histedit` case.Jul 11 2021, 10:48 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGf2846abd9e21: test-removeemptydirs: clarify the state of things in the `histedit` case (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-removeemptydirs.t (25 lines)

Diff 29194

tests/test-removeemptydirs.t

Tests for experimental.removeemptydirs Tests for experimental.removeemptydirs
$ NO_RM=--config=experimental.removeemptydirs=0 $ NO_RM=--config=experimental.removeemptydirs=0
$ DO_RM=--config=experimental.removeemptydirs=1
$ isdir() { if [ -d $1 ]; then echo yes; else echo no; fi } $ isdir() { if [ -d $1 ]; then echo yes; else echo no; fi }
$ isfile() { if [ -f $1 ]; then echo yes; else echo no; fi } $ isfile() { if [ -f $1 ]; then echo yes; else echo no; fi }
`hg rm` of the last file in a directory: `hg rm` of the last file in a directory:
$ hg init hgrm $ hg init hgrm
$ cd hgrm $ cd hgrm
$ mkdir somedir $ mkdir somedir
$ echo hi > somedir/foo $ echo hi > somedir/foo
(The current node is the rebased first_rebase_source on top of (The current node is the rebased first_rebase_source on top of
first_rebase_dest) first_rebase_dest)
This should not output anything about current directory being removed: This should not output anything about current directory being removed:
$ hg $NO_RM --config extensions.rebase= rebase -qr . -d 'desc(second_rebase_dest)' $ hg $NO_RM --config extensions.rebase= rebase -qr . -d 'desc(second_rebase_dest)'
$ cd $TESTTMP $ cd $TESTTMP
Histediting across a commit that doesn't have the directory, from inside the Histediting across a commit that doesn't have the directory, from inside the
directory (reordering nodes): directory (reordering nodes):
A directory with the right pass exists at the end of the run, but it is a
different directory than the current one.
$ hg init hghistedit $ hg init hghistedit
$ cd hghistedit $ cd hghistedit
$ echo hi > r0 $ echo hi > r0
$ hg ci -qAm r0 $ hg ci -qAm r0
$ echo hi > r1 $ echo hi > r1
$ hg ci -qAm r1 $ hg ci -qAm r1
$ echo hi > r2 $ echo hi > r2
$ hg ci -qAm r2 $ hg ci -qAm r2
$ mkdir somedir $ mkdir somedir
$ echo hi > somedir/foo $ echo hi > somedir/foo
$ hg ci -qAm migrating_revision $ hg ci -qAm migrating_revision
$ cat > histedit_commands <<EOF $ cat > histedit_commands <<EOF
> pick 89079fab8aee 0 r0 > pick 89079fab8aee 0 r0
> pick e6d271df3142 1 r1 > pick e6d271df3142 1 r1
> pick 89e25aa83f0f 3 migrating_revision > pick 89e25aa83f0f 3 migrating_revision
> pick b550aa12d873 2 r2 > pick b550aa12d873 2 r2
> EOF > EOF
$ cd $TESTTMP/hghistedit/somedir $ cd $TESTTMP/hghistedit/somedir
$ hg --config extensions.histedit= histedit -q --commands ../histedit_commands $ hg $DO_RM --config extensions.histedit= histedit -q --commands ../histedit_commands
current directory was removed current directory was removed
(consider changing to repo root: $TESTTMP/hghistedit) (consider changing to repo root: $TESTTMP/hghistedit)
$ ls -1 $TESTTMP/hghistedit/
histedit_commands
r0
r1
r2
somedir
$ pwd
$TESTTMP/hghistedit/somedir
$ ls -1 $TESTTMP/hghistedit/somedir
foo
$ ls -1
Get out of the doomed directory
$ cd $TESTTMP/hghistedit $ cd $TESTTMP/hghistedit
$ hg files --rev . | grep somedir/
somedir/foo
$ cat > histedit_commands <<EOF $ cat > histedit_commands <<EOF
> pick 89079fab8aee 0 r0 > pick 89079fab8aee 0 r0
> pick 7c7a22c6009f 3 migrating_revision > pick 7c7a22c6009f 3 migrating_revision
> pick e6d271df3142 1 r1 > pick e6d271df3142 1 r1
> pick 40a53c2d4276 2 r2 > pick 40a53c2d4276 2 r2
> EOF > EOF
$ cd $TESTTMP/hghistedit/somedir $ cd $TESTTMP/hghistedit/somedir
$ hg $NO_RM --config extensions.histedit= histedit -q --commands ../histedit_commands $ hg $NO_RM --config extensions.histedit= histedit -q --commands ../histedit_commands