This is an archive of the discontinued Mercurial Phabricator instance.

Differential D596

amend: add tests for amending only some files from commit to be amended
ClosedPublic

Authored by singhsrb on Aug 31 2017, 10:01 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6fb5a06b92c6: amend: add tests for amending only some files from commit to be amended
Summary

We do not have robust enough tests for scenarios where only some files in a
changeset are amended. This presents an interesting scenario because the
working copy could have modified versions of the remaining files in the
pre-amend changeset. Therefore, I have added some tests to ensure that amend
behaves as expected in these scenarios.

Test Plan

Ensured that the test "test-commit-amend.t" passes.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

singhsrb created this revision.Aug 31 2017, 10:01 PM
singhsrb added inline comments.Aug 31 2017, 10:04 PM
tests/test-commit-amend.t
1227

I will add a newline before this line!

durham added a subscriber: durham.Sep 1 2017, 3:27 PM
durham added inline comments.
tests/test-commit-amend.t
1185

I think you're inside a repo at this point. You may need to cd ../ to get out of it before you init a new one.

singhsrb updated this revision to Diff 1565.Sep 1 2017, 6:18 PM
Closed by commit rHG6fb5a06b92c6: amend: add tests for amending only some files from commit to be amended (authored by singhsrb). · Explain WhySep 3 2017, 10:20 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-commit-amend.t (91 lines)

Diff 1528

tests/test-commit-amend.t

date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: chmod amended second time summary: chmod amended second time
diff --git a/newdirname/commonfile.py b/newdirname/commonfile.py diff --git a/newdirname/commonfile.py b/newdirname/commonfile.py
old mode 100644 old mode 100644
new mode 100755 new mode 100755
#endif #endif
Test amend with file inclusion options
--------------------------------------
These tests ensure that we are always amending some files that were part of the
pre-amend commit. We want to test that the remaining files in the pre-amend
commit were not changed in the amended commit. We do so by performing a diff of
the amended commit against its parent commit.
$ hg init testfileinclusions
durhamUnsubmitted
Not Done

I think you're inside a repo at this point. You may need to cd ../ to get out of it before you init a new one.

durham: I think you're inside a repo at this point. You may need to `cd ../` to get out of it before…
$ cd testfileinclusions
$ echo a > a
$ echo b > b
$ hg commit -Aqm "Adding a and b"
Only add changes to a particular file
$ echo a >> a
$ echo b >> b
$ hg commit --amend -I a
$ hg diff --git -r null -r .
diff --git a/a b/a
new file mode 100644
--- /dev/null
+++ b/a
@@ -0,0 +1,2 @@
+a
+a
diff --git a/b b/b
new file mode 100644
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+b
$ echo a >> a
$ hg commit --amend b
$ hg diff --git -r null -r .
diff --git a/a b/a
new file mode 100644
--- /dev/null
+++ b/a
@@ -0,0 +1,2 @@
+a
+a
diff --git a/b b/b
new file mode 100644
--- /dev/null
+++ b/b
@@ -0,0 +1,2 @@
+b
+b
Exclude changes to a particular file
singhsrbAuthorUnsubmitted
Not Done

I will add a newline before this line!

singhsrb: I will add a newline before this line!
$ echo b >> b
$ hg commit --amend -X a
$ hg diff --git -r null -r .
diff --git a/a b/a
new file mode 100644
--- /dev/null
+++ b/a
@@ -0,0 +1,2 @@
+a
+a
diff --git a/b b/b
new file mode 100644
--- /dev/null
+++ b/b
@@ -0,0 +1,3 @@
+b
+b
+b
Check the addremove flag
$ echo c > c
$ rm a
$ hg commit --amend -A
removing a
adding c
$ hg diff --git -r null -r .
diff --git a/b b/b
new file mode 100644
--- /dev/null
+++ b/b
@@ -0,0 +1,3 @@
+b
+b
+b
diff --git a/c b/c
new file mode 100644
--- /dev/null
+++ b/c
@@ -0,0 +1,1 @@
+c