Mercurial > hg
annotate tests/test-diff-antipatience.t @ 49603:3eda36e9b3d6 stable
matcher: fix issues regex flag contained in pattern (issue6759)
Python 3.11 is now enforcing that flag must be at the beginning of the regex
This creates a serious regression for people using Python 3.11 with an hgignore
using flag in a "relre" pattern.
We now detect any flags in such pattern and "prepend" our ".*" pattern after them.
In addition, we now insert the flag in the regexp to only affect the pattern we
are rewriting. Otherwise, the regex built from the combined pattern would these
flags in the middle of it anyway.
As a side effect of this last change, we fix a bug… before this change regex
flag in a pattern would affect all combined patterns. That was bad and is not
longer the case.
The Rust code needs to be updated to fix that very bug, but we will do it in
another changeset.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 16 Nov 2022 13:05:01 +0100 |
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 |