( )⚙ D6078 tests: clarify test setup test in test-uncommit.t

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6078

tests: clarify test setup test in test-uncommit.t
ClosedPublic

Authored by martinvonz on Mar 6 2019, 6:49 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG6a944bf4c43a: tests: clarify test setup test in test-uncommit.t
Summary

I assume the "hg uncommit b" is there to prove that the working copy
is dirty before we try "hg uncommit --allow-dirty-working-copy b". It
seems clearer to put that check just before we run the actual test.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Mar 6 2019, 6:49 PM
pulkit accepted this revision.Mar 7 2019, 7:27 AM
Closed by commit rHG6a944bf4c43a: tests: clarify test setup test in test-uncommit.t (authored by martinvonz). · Explain WhyMar 7 2019, 7:54 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-uncommit.t (8 lines)

Diff 14377

tests/test-uncommit.t

$ hg ci -Am 'add a' $ hg ci -Am 'add a'
adding a adding a
$ echo 'foo' > b $ echo 'foo' > b
$ hg add b $ hg add b
$ hg status $ hg status
A b A b
$ hg unc a $ hg unc a
note: keeping empty commit note: keeping empty commit
$ hg unc b
abort: uncommitted changes
(requires --allow-dirty-working-copy to uncommit)
[255]
$ cat a $ cat a
super critical info! super critical info!
$ hg log $ hg log
changeset: 1:656ba143d384 changeset: 1:656ba143d384
tag: tip tag: tip
parent: -1:000000000000 parent: -1:000000000000
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: add a summary: add a
$ hg ci -Am 'add b' $ hg ci -Am 'add b'
$ echo 'foo bar' > b $ echo 'foo bar' > b
$ hg unc b
abort: uncommitted changes
(requires --allow-dirty-working-copy to uncommit)
[255]
$ hg unc --allow-dirty-working-copy b $ hg unc --allow-dirty-working-copy b
$ hg log $ hg log
changeset: 3:30fa958635b2 changeset: 3:30fa958635b2
tag: tip tag: tip
parent: 1:656ba143d384 parent: 1:656ba143d384
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: add b summary: add b
changeset: 1:656ba143d384 changeset: 1:656ba143d384
parent: -1:000000000000 parent: -1:000000000000
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: add a summary: add a