Mercurial > hg
annotate tests/test-diff-antipatience.t @ 39855:62a532045e71
lfs: access revlog directly
LFS is monkeypatching filelog.filelog and is then accessing
various filelog attributes in the monkeypatched function. This is all
fine.
But some of the attributes being accessed by LFS are revlog centric
and shouldn't be exposed on the file storage interface.
This commit changes the monkeypatched functions to access proxied
attributes on self._revlog instead of self.
This should be safe to do because non-revlog repositories should not
be using filelog instances: instead they should have a separate class
to represent file storage. So it is reasonable for LFS to assume the
_revlog attribute exists and points to a revlog.
Differential Revision: https://phab.mercurial-scm.org/D4714
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Thu, 20 Sep 2018 17:47:34 -0700 |
parents | 9ef9884e5d50 |
children |
rev | line source |
---|---|
36678 | 1 #testcases bdiff xdiff |
2 | |
3 #if xdiff | |
4 #require xdiff | |
5 $ cat >> $HGRCPATH <<EOF | |
6 > [experimental] | |
7 > xdiff = true | |
8 > EOF | |
9 #endif | |
10 | |
11 Test case that makes use of the weakness of patience diff algorithm | |
12 | |
13 $ hg init | |
38469
9ef9884e5d50
py3: make tests/test-diff-antipatience.t work with python 3
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36678
diff
changeset
|
14 >>> open('a', 'wb').write(('\n'.join(list('a' + 'x' * 10 + 'u' + 'x' * 30 + 'a\n'))).encode('ascii')) and None |
36678 | 15 $ hg commit -m 1 -A a |
38469
9ef9884e5d50
py3: make tests/test-diff-antipatience.t work with python 3
Pulkit Goyal <7895pulkit@gmail.com>
parents:
36678
diff
changeset
|
16 >>> open('a', 'wb').write(('\n'.join(list('b' + 'x' * 30 + 'u' + 'x' * 10 + 'b\n'))).encode('ascii')) and None |
36678 | 17 #if xdiff |
18 $ hg diff | |
19 diff -r f0aeecb49805 a | |
20 --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
21 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
22 @@ -1,4 +1,4 @@ | |
23 -a | |
24 +b | |
25 x | |
26 x | |
27 x | |
28 @@ -9,7 +9,6 @@ | |
29 x | |
30 x | |
31 x | |
32 -u | |
33 x | |
34 x | |
35 x | |
36 @@ -30,6 +29,7 @@ | |
37 x | |
38 x | |
39 x | |
40 +u | |
41 x | |
42 x | |
43 x | |
44 @@ -40,5 +40,5 @@ | |
45 x | |
46 x | |
47 x | |
48 -a | |
49 +b | |
50 | |
51 #else | |
52 $ hg diff | |
53 diff -r f0aeecb49805 a | |
54 --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
55 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
56 @@ -1,15 +1,4 @@ | |
57 -a | |
58 -x | |
59 -x | |
60 -x | |
61 -x | |
62 -x | |
63 -x | |
64 -x | |
65 -x | |
66 -x | |
67 -x | |
68 -u | |
69 +b | |
70 x | |
71 x | |
72 x | |
73 @@ -40,5 +29,16 @@ | |
74 x | |
75 x | |
76 x | |
77 -a | |
78 +u | |
79 +x | |
80 +x | |
81 +x | |
82 +x | |
83 +x | |
84 +x | |
85 +x | |
86 +x | |
87 +x | |
88 +x | |
89 +b | |
90 | |
91 #endif |