This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6079

tests: simplify test-uncommit.t by removing an unnecessary commit
AbandonedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

I don't see what value the first commit adds in the test for issue
5977, so let's remove it.

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 added a subscriber: pulkit.Mar 7 2019, 7:30 AM
pulkit added inline comments.
tests/test-uncommit.t
483

I skimmed through the whole file and could not find a case where we do hg uncommit PATH on a dirty wdir and PATH is not dirty in wdir. So I think it's better to have this test.

martinvonz added inline comments.Mar 7 2019, 11:41 AM
tests/test-uncommit.t
483

Ohh, I didn't even realize that was allowed! :) And I obviously agree with testing that in that case. Could we have a separate test description for that then (so it's not just part of "--allow-dirty-working-copy should also work on a dirty PATH")?

martinvonz abandoned this revision.Mar 8 2019, 12:09 PM

Revision Contents
Changeset List

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

Diff 14378

tests/test-uncommit.t

a a
$ cd .. $ cd ..
--allow-dirty-working-copy should also work on a dirty PATH --allow-dirty-working-copy should also work on a dirty PATH
$ hg init issue5977 $ hg init issue5977
$ cd issue5977 $ cd issue5977
$ echo 'super critical info!' > a $ echo 'super critical info!' > a
$ hg ci -Am 'add a'
adding a
$ echo 'foo' > b $ echo 'foo' > b
$ hg add b
$ hg status
A b
$ hg unc a
pulkitUnsubmitted
Not Done

I skimmed through the whole file and could not find a case where we do hg uncommit PATH on a dirty wdir and PATH is not dirty in wdir. So I think it's better to have this test.

pulkit: I skimmed through the whole file and could not find a case where we do `hg uncommit PATH` on a…
martinvonzAuthorUnsubmitted
Not Done

Ohh, I didn't even realize that was allowed! :) And I obviously agree with testing that in that case. Could we have a separate test description for that then (so it's not just part of "--allow-dirty-working-copy should also work on a dirty PATH")?

martinvonz: Ohh, I didn't even realize that was allowed! :) And I obviously agree with testing that in that…
note: keeping empty commit
$ cat a
super critical info!
$ hg log
changeset: 1:656ba143d384
tag: tip
parent: -1:000000000000
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add a
$ hg ci -Am 'add b' $ hg ci -Am 'add b'
adding a
adding b
$ echo 'foo bar' > b $ echo 'foo bar' > b
$ hg unc b $ hg unc b
abort: uncommitted changes abort: uncommitted changes
(requires --allow-dirty-working-copy to uncommit) (requires --allow-dirty-working-copy to uncommit)
[255] [255]
$ hg unc --allow-dirty-working-copy b $ hg unc --allow-dirty-working-copy b
$ hg log $ hg log
changeset: 3:30fa958635b2 changeset: 1:0aa852043fdc
tag: tip tag: tip
parent: 1:656ba143d384
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add b
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 b