This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6309

tests: demonstrate `hg log -r . <file>` linkrev bug
ClosedPublic

Authored by martinvonz on Apr 24 2019, 2:18 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc96507f6875c: tests: demonstrate `hg log -r . <file>` linkrev bug
rHGeb68fd841984: tests: demonstrate `hg log -r . <file>` linkrev bug

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Apr 24 2019, 2:18 PM
Closed by commit rHGeb68fd841984: tests: demonstrate `hg log -r . <file>` linkrev bug (authored by martinvonz). · Explain WhyApr 24 2019, 7:29 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-log.t (15 lines)

Diff 14908

tests/test-log.t

b1 | 1 + b1 | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
$ cd .. $ cd ..
log --follow --patch FILE in repository where linkrev isn't trustworthy log --follow --patch FILE in repository where linkrev isn't trustworthy
(issue5376) (issue5376, issue6124)
$ hg init follow-dup $ hg init follow-dup
$ cd follow-dup $ cd follow-dup
$ cat <<EOF >> .hg/hgrc $ cat <<EOF >> .hg/hgrc
> [ui] > [ui]
> logtemplate = '=== {rev}: {desc}\n' > logtemplate = '=== {rev}: {desc}\n'
> [diff] > [diff]
> nodates = True > nodates = True
=== 0: a0 === 0: a0
diff -r 000000000000 -r 49b5e81287e2 a diff -r 000000000000 -r 49b5e81287e2 a
--- /dev/null --- /dev/null
+++ b/a +++ b/a
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+0 +0
$ hg log -pr . a
=== 3: a3
diff -r 4ea02ba94d66 -r e7a6331a34f0 a
--- a/a
+++ b/a
@@ -1,2 +1,3 @@
0
1
+3
fctx.introrev() == 2, but fctx.linkrev() == 1 fctx.introrev() == 2, but fctx.linkrev() == 1
$ hg up -q 2 $ hg up -q 2
$ hg log -pf a $ hg log -pf a
=== 2: a1 with b === 2: a1 with b
diff -r 49b5e81287e2 -r 4ea02ba94d66 a diff -r 49b5e81287e2 -r 4ea02ba94d66 a
--- a/a --- a/a
+++ b/a +++ b/a
@@ -1,1 +1,2 @@ @@ -1,1 +1,2 @@
0 0
+1 +1
=== 0: a0 === 0: a0
diff -r 000000000000 -r 49b5e81287e2 a diff -r 000000000000 -r 49b5e81287e2 a
--- /dev/null --- /dev/null
+++ b/a +++ b/a
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+0 +0
BROKEN: should show the same diff as for rev 2 above
$ hg log -pr . a
$ cd .. $ cd ..
Multiple copy sources of a file: Multiple copy sources of a file:
$ hg init follow-multi $ hg init follow-multi
$ cd follow-multi $ cd follow-multi
$ echo 0 >> a $ echo 0 >> a
$ hg ci -qAm 'a' $ hg ci -qAm 'a'