This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10000

tests: add a test to demonstrate a bug in `hg diff --git` (issue6486)
ClosedPublic

Authored by khanchi97 on Feb 16 2021, 5:26 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGdf44bac9413d: tests: add a test to demonstrate a bug in `hg diff --git` (issue6486)
Summary

Issue url: https://bz.mercurial-scm.org/show_bug.cgi?id=6486
This will be fixed in next patch.

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

khanchi97 created this revision.Feb 16 2021, 5:26 AM
pulkit added a subscriber: pulkit.Feb 16 2021, 6:42 AM

Nice differential number. Can you rebase these and send for stable branch instead?

khanchi97 added a comment.Feb 16 2021, 6:51 AM
In D10000#151561, @pulkit wrote:

Nice differential number. Can you rebase these and send for stable branch instead?

Sure. (I also noticed the differential number :D)

khanchi97 added a comment.EditedFeb 16 2021, 6:58 AM

I just phabsend after rebasing to stable but here in Phabricator UI, I still see the default branch. What's wrong? Is it just the UI issue?

pulkit added a comment.Feb 16 2021, 7:02 AM
In D10000#151563, @khanchi97 wrote:

I just phabsend after rebasing to stable but here in Phabricator UI, I still see the default branch. What's wrong? Is it just the UI issue?

Seems like a bug in phabsend to me.

khanchi97 added a comment.Feb 16 2021, 12:42 PM

Seems like a bug in phabsend to me.

Yeah, I think it's phabsend. I will look into it to see if it's a quick fix. For now, do you think I should abandon these and create new ones?

mharbison72 added a subscriber: mharbison72.Feb 16 2021, 1:25 PM
In D10000#151565, @khanchi97 wrote:

Seems like a bug in phabsend to me.

Yeah, I think it's phabsend. I will look into it to see if it's a quick fix. For now, do you think I should abandon these and create new ones?

You should be able to just rebase and phabsend again. The branch name in the UI is only cosmetic, but I'm assuming there are conflicts applying to stable.

Phabsend only sets the branch property when creating the differential. IDR if it was because the underlying API didn't support changing it on updates, or what. But feel encouraged to look into it.

Alphare added a subscriber: Alphare.Feb 18 2021, 3:42 AM

FWIW, I've never had a patch fail to get the stable branch tag on Phab after a phabsend.

khanchi97 added a comment.Feb 19 2021, 4:02 AM

Phabsend only sets the branch property when creating the differential. IDR if it was because the underlying API didn't support changing it on updates, or what.

Does this mean now the only option is to abandon? Or you meant this only for the Phab UI?

khanchi97 added a comment.Feb 19 2021, 4:05 AM
In D10000#151713, @Alphare wrote:

FWIW, I've never had a patch fail to get the stable branch tag on Phab after a phabsend.

I see. Also, did you ever have a scenario where you first phabsend a rev from default branch, then rebased to stable and phabsend again?

khanchi97 added a commit: rHGdf44bac9413d: tests: add a test to demonstrate a bug in `hg diff --git` (issue6486).Feb 24 2021, 11:07 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGdf44bac9413d: tests: add a test to demonstrate a bug in `hg diff --git` (issue6486) (authored by khanchi97). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-diff-unified.t (23 lines)

Diff 25866

tests/test-diff-unified.t

. .
- 0 a with grave (composition) - 0 a with grave (composition)
+ 1 a with grave (composition) + 1 a with grave (composition)
. .
. .
. .
$ cd .. $ cd ..
Make sure `hg diff --git` differentiate "file did not exists" and "file is empty"
for git blob oids
$ hg init bloboids
$ cd bloboids
$ touch a
$ hg ci -Am "empty a"
adding a
$ hg diff -c 0 --git --config experimental.extendedheader.index=full | grep index
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Make sure `hg diff --git` differentiate "file was empty" and "file is removed"
for git blob oids
$ rm a
$ hg ci -Am "removed a"
removing a
$ hg diff -c 1 --git --config experimental.extendedheader.index=full | grep index
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
$ cd ..