annotate tests/test-diff-newlines.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 5abc47d4ca6b
children 55c6ebd11cb9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12143
bf840a3d1af2 tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents: 2248
diff changeset
1 $ hg init
bf840a3d1af2 tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents: 2248
diff changeset
2
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 33305
diff changeset
3 $ "$PYTHON" -c 'open("a", "wb").write(b"confuse str.splitlines\nembedded\rnewline\n")'
12143
bf840a3d1af2 tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents: 2248
diff changeset
4 $ hg ci -Ama -d '1 0'
bf840a3d1af2 tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents: 2248
diff changeset
5 adding a
bf840a3d1af2 tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents: 2248
diff changeset
6
bf840a3d1af2 tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents: 2248
diff changeset
7 $ echo clean diff >> a
bf840a3d1af2 tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents: 2248
diff changeset
8 $ hg ci -mb -d '2 0'
2248
b914f0557832 fix diffs containing embedded "\r".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
9
12143
bf840a3d1af2 tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents: 2248
diff changeset
10 $ hg diff -r0 -r1
bf840a3d1af2 tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents: 2248
diff changeset
11 diff -r 107ba6f817b5 -r 310ce7989cdc a
bf840a3d1af2 tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents: 2248
diff changeset
12 --- a/a Thu Jan 01 00:00:01 1970 +0000
bf840a3d1af2 tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents: 2248
diff changeset
13 +++ b/a Thu Jan 01 00:00:02 1970 +0000
bf840a3d1af2 tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents: 2248
diff changeset
14 @@ -1,2 +1,3 @@
bf840a3d1af2 tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents: 2248
diff changeset
15 confuse str.splitlines
17742
405b6bd015df run-tests: allow test output lines to be terminated with \r in addition to \n
Mads Kiilerich <mads@kiilerich.com>
parents: 15522
diff changeset
16 embedded\r (no-eol) (esc)
405b6bd015df run-tests: allow test output lines to be terminated with \r in addition to \n
Mads Kiilerich <mads@kiilerich.com>
parents: 15522
diff changeset
17 newline
12143
bf840a3d1af2 tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents: 2248
diff changeset
18 +clean diff
bf840a3d1af2 tests: unify test-diff-newlines
Adrian Buehlmann <adrian@cadifra.com>
parents: 2248
diff changeset
19