This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11055

test-removeemptydirs: adjust to Windows behavior for the `histedit` case
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5f836c10ed3d: test-removeemptydirs: adjust to Windows behavior for the `histedit` case
Summary

Windows stay in the "same" directory and the warning message is not applicable.

This make tests/test-removeemptydirs.t pass 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 29090.Jul 9 2021, 9:22 PM

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

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

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

marmoute edited the summary of this revision. (Show Details)Jul 10 2021, 1:47 PM
marmoute added a commit: rHG5f836c10ed3d: test-removeemptydirs: adjust to Windows behavior for 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 rHG5f836c10ed3d: test-removeemptydirs: adjust to Windows behavior for 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 (7 lines)

Diff 29195

tests/test-removeemptydirs.t

$ 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 A directory with the right pass exists at the end of the run, but it is a
different directory than the current one. different directory than the current one.
Windows is not affected
$ 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 $DO_RM --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 (no-windows !)
(consider changing to repo root: $TESTTMP/hghistedit) (consider changing to repo root: $TESTTMP/hghistedit) (no-windows !)
$ ls -1 $TESTTMP/hghistedit/ $ ls -1 $TESTTMP/hghistedit/
histedit_commands histedit_commands
r0 r0
r1 r1
r2 r2
somedir somedir
$ pwd $ pwd
$TESTTMP/hghistedit/somedir $TESTTMP/hghistedit/somedir
$ ls -1 $TESTTMP/hghistedit/somedir $ ls -1 $TESTTMP/hghistedit/somedir
foo foo
$ ls -1 $ ls -1
foo (windows !)
Get out of the doomed directory Get out of the doomed directory
$ cd $TESTTMP/hghistedit $ cd $TESTTMP/hghistedit
$ hg files --rev . | grep somedir/ $ hg files --rev . | grep somedir/
somedir/foo somedir/foo