This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9081

git: add test showing `hg commit -i` working on a git repo
ClosedPublic

Authored by sheehan on Sep 24 2020, 12:37 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf9a3edf2dee4: git: add test showing `hg commit -i` working on a git repo
Summary

Shows hg commit -i working on a git repo via the git
extension. Adds working directory changes to files alpha and
beta, then selects only alpha changes and commits them.

As of now this would fail for a filename that
includes uppercase characters due to the lack of case folding
support in the extension.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

sheehan created this revision.Sep 24 2020, 12:37 PM
sheehan added inline comments.Sep 24 2020, 12:44 PM
tests/test-git-interop.t
305

Not sure about this line.

319

There's probably a better way than printing the full patch, if you have a preference.

pulkit accepted this revision.Sep 26 2020, 6:35 AM
This revision is now accepted and ready to land.Sep 26 2020, 6:35 AM

Revision Contents
Changeset List

PathPackages
Mtests/test-git-interop.t (81 lines)

Diff 22835

tests/test-git-interop.t

$ hg diff -c 3d9be8deba43 $ hg diff -c 3d9be8deba43
diff -r c5864c9d16fb -r 3d9be8deba43 beta diff -r c5864c9d16fb -r 3d9be8deba43 beta
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/beta Mon Jan 01 00:00:11 2007 +0000 +++ b/beta Mon Jan 01 00:00:11 2007 +0000
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+beta +beta
Interactive commit should work as expected
$ echo bar >> alpha
$ echo bar >> beta
$ hg commit -m "test interactive commit" -i --config ui.interactive=true --config ui.interface=text << EOF
> y
> y
> n
> EOF
diff --git a/alpha b/alpha
1 hunks, 1 lines changed
examine changes to 'alpha'?
(enter ? for help) [Ynesfdaq?] y
@@ -1,3 +1,4 @@
alpha
a
a
+bar
record change 1/2 to 'alpha'?
(enter ? for help) [Ynesfdaq?] y
diff --git a/beta b/beta
1 hunks, 1 lines changed
examine changes to 'beta'?
(enter ? for help) [Ynesfdaq?] n
Status should be consistent for both systems
$ hg status
heads mismatch, rebuilding dagcache
sheehanAuthorUnsubmitted
Done

Not sure about this line.

sheehan: Not sure about this line.
M beta
$ git status
On branch master
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: beta
no changes added to commit (use "git add" and/or "git commit -a")
Contents of each commit should be the same
$ hg ex -r .
sheehanAuthorUnsubmitted
Done

There's probably a better way than printing the full patch, if you have a preference.

sheehan: There's probably a better way than printing the full patch, if you have a preference.
# HG changeset patch
# User test <test>
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 80adc61cf57e99f6a412d83fee6239d1556cefcf
# Parent ae1ab744f95bfd5b07cf573baef98a778058537b
test interactive commit
diff -r ae1ab744f95b -r 80adc61cf57e alpha
--- a/alpha Thu Jan 01 00:00:00 1970 +0000
+++ b/alpha Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +1,4 @@
alpha
a
a
+bar
$ git show
commit 80adc61cf57e99f6a412d83fee6239d1556cefcf
Author: test <test>
Date: Thu Jan 1 00:00:00 1970 +0000
test interactive commit
diff --git a/alpha b/alpha
index d112a75..d2a2e9a 100644
--- a/alpha
+++ b/alpha
@@ -1,3 +1,4 @@
alpha
a
a
+bar
Deleting files should also work (this was issue6398) Deleting files should also work (this was issue6398)
$ hg revert -r . --all
reverting beta
$ hg rm beta $ hg rm beta
$ hg ci -m 'remove beta' $ hg ci -m 'remove beta'