facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2025-01-04 03:06:30 +03:00
Code Issues Projects Releases Wiki Activity

test-fastannotate-hg: fix compatibility with upstream

Browse Source 
Summary:
The recent bdiff behavior change affects us. Document why and update the test
so it works with both the old and new (less optimal imo) bdiff behavior.

Test Plan: Updated the test

Reviewers: #sourcecontrol, simonfar, rmcelroy

Reviewed By: simonfar, rmcelroy

Subscribers: rmcelroy, mjpieters

Differential Revision: https://phabricator.intern.facebook.com/D4231966

Signature: t1:4231966:1480011763:d116799ded3514d644e4b80296ffc71a8d712a43
This commit is contained in:
Jun Wu 2016-11-24 18:07:32 +00:00
parent 6257caad35
commit 311a3fc653
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/test-fastannotate-hg.t
View File

@ -300,10 +300,11 @@ annotate after rename merge with -l
: --- a/a : --- a/a
: +++ b/b : +++ b/b
: @@ -1,3 +1,3 @@ : @@ -1,3 +1,3 @@
: -a (?)
: a : a
: +z : +z
: a : a
: -a : -a (?)
: :
o 1:762f04898e6684ff713415f7b8a8d53d33f96c92diff --git a/a b/a o 1:762f04898e6684ff713415f7b8a8d53d33f96c92diff --git a/a b/a
| --- a/a | --- a/a
@ -321,6 +322,22 @@ annotate after rename merge with -l
+a +a
(note on question marks:
the upstream bdiff change (96f2f50d923f+3633403888ae+8c0c75aa3ff4+5c4e2636c1a9
+38ed54888617) alters the output so deletion is not always at the end of the
output. for example:
| a | b | old | new | # old: e1d6aa0e4c3a, new: 8836f13e3c5b
|-------------------|
| a | a | a | -a |
| a | z | +z | a |
| a | a | a | +z |
| | | -a | a |
|-------------------|
| a | a | a |
| a | a | a |
| a | | -a |
this leads to more question marks below)
(rev 1 adds two "a"s and rev 6 deletes one "a". (rev 1 adds two "a"s and rev 6 deletes one "a".
the "a" that rev 6 deletes could be either the first or the second "a" of those two "a"s added by rev 1. the "a" that rev 6 deletes could be either the first or the second "a" of those two "a"s added by rev 1.
and that causes the line number difference) and that causes the line number difference)
@ -335,9 +352,11 @@ annotate after rename merge with -l
7 b:7: d 7 b:7: d
$ hg annotate -nlf b $ hg annotate -nlf b
0 a:1: a 0 a:1: a (?)
1 a:2: a (?)
6 b:2: z 6 b:2: z
1 a:2: a 1 a:2: a (?)
1 a:3: a (?)
3 b:4: b4 3 b:4: b4
4 b:5: c 4 b:5: c
3 b:5: b5 3 b:5: b5
@ -353,9 +372,11 @@ Issue2807: alignment of line numbers with -l
$ echo more >> b $ echo more >> b
$ hg ci -mmore -d '7 0' $ hg ci -mmore -d '7 0'
$ hg annotate -nlf b $ hg annotate -nlf b
0 a: 1: a 0 a: 1: a (?)
1 a: 2: a (?)
6 b: 2: z 6 b: 2: z
1 a: 2: a 1 a: 2: a (?)
1 a: 3: a (?)
3 b: 4: b4 3 b: 4: b4
4 b: 5: c 4 b: 5: c
3 b: 5: b5 3 b: 5: b5