author | Martin von Zweigbergk <martinvonz@google.com> |
Wed, 11 Dec 2019 11:22:37 -0800 | |
changeset 43918 | 86fe85364811 |
parent 43268 | e88549a02f5e |
child 52094 | 87faafd6ea83 |
permissions | -rw-r--r-- |
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
1 |
Test EOL update |
11249
0bb67503ad4b
eol: extension for managing file EOLs
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
2 |
|
13519
43b3b761d9d1
tests: don't overwrite HGRCPATH
Martin Geisler <mg@aragost.com>
parents:
12943
diff
changeset
|
3 |
$ cat >> $HGRCPATH <<EOF |
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
4 |
> [diff] |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
5 |
> git = 1 |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
6 |
> EOF |
11249
0bb67503ad4b
eol: extension for managing file EOLs
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
7 |
|
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
8 |
$ seteol () { |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
9 |
> if [ $1 = "LF" ]; then |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
10 |
> EOL='\n' |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
11 |
> else |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
12 |
> EOL='\r\n' |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
13 |
> fi |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
14 |
> } |
11249
0bb67503ad4b
eol: extension for managing file EOLs
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
15 |
|
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
16 |
$ makerepo () { |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
17 |
> echo |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
18 |
> echo "# ==== setup repository ====" |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
19 |
> echo '% hg init' |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
20 |
> hg init repo |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
21 |
> cd repo |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
22 |
> |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
23 |
> cat > .hgeol <<EOF |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
24 |
> [patterns] |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
25 |
> **.txt = LF |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
26 |
> EOF |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
27 |
> |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
28 |
> printf "first\nsecond\nthird\n" > a.txt |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
29 |
> printf "f\r\n" > f |
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
30 |
> hg commit --addremove -m 'LF commit' |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
31 |
> |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
32 |
> cat > .hgeol <<EOF |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
33 |
> [patterns] |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
34 |
> **.txt = CRLF |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
35 |
> f = LF |
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
36 |
> EOF |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
37 |
> |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
38 |
> printf "first\r\nsecond\r\nthird\r\n" > a.txt |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
39 |
> printf "f\n" > f |
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
40 |
> hg commit -m 'CRLF commit' |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
41 |
> |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
42 |
> cd .. |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
43 |
> } |
11249
0bb67503ad4b
eol: extension for managing file EOLs
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
44 |
|
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
45 |
$ dotest () { |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
46 |
> seteol $1 |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
47 |
> |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
48 |
> echo |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
49 |
> echo "% hg clone repo repo-$1" |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
50 |
> hg clone --noupdate repo repo-$1 |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
51 |
> cd repo-$1 |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
52 |
> |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
53 |
> cat > .hg/hgrc <<EOF |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
54 |
> [extensions] |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
55 |
> eol = |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
56 |
> EOF |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
57 |
> |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
58 |
> hg update |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
59 |
> |
12943
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
60 |
> echo '% a.txt (before)' |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
61 |
> cat a.txt |
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
62 |
> |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
63 |
> printf "first${EOL}third${EOL}" > a.txt |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
64 |
> |
12943
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
65 |
> echo '% a.txt (after)' |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
66 |
> cat a.txt |
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
67 |
> echo '% hg diff' |
12943
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
68 |
> hg diff |
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
69 |
> |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
70 |
> echo '% hg update 0' |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
71 |
> hg update 0 |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
72 |
> |
12943
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
73 |
> echo '% a.txt' |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
74 |
> cat a.txt |
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
75 |
> echo '% hg diff' |
12943
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
76 |
> hg diff |
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
77 |
> |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
78 |
> |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
79 |
> cd .. |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
80 |
> rm -r repo-$1 |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
81 |
> } |
11249
0bb67503ad4b
eol: extension for managing file EOLs
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
82 |
|
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
83 |
$ makerepo |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
84 |
|
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
85 |
# ==== setup repository ==== |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
86 |
% hg init |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
87 |
adding .hgeol |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
88 |
adding a.txt |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
89 |
adding f |
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
90 |
$ dotest LF |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
91 |
|
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
92 |
% hg clone repo repo-LF |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
93 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12943
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
94 |
% a.txt (before) |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
95 |
first\r (esc) |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
96 |
second\r (esc) |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
97 |
third\r (esc) |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
98 |
% a.txt (after) |
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
99 |
first |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
100 |
third |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
101 |
% hg diff |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
102 |
diff --git a/a.txt b/a.txt |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
103 |
--- a/a.txt |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
104 |
+++ b/a.txt |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
105 |
@@ -1,3 +1,2 @@ |
12943
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
106 |
first\r (esc) |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
107 |
-second\r (esc) |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
108 |
third\r (esc) |
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
109 |
% hg update 0 |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
110 |
merging a.txt |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
111 |
2 files updated, 1 files merged, 0 files removed, 0 files unresolved |
12943
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
112 |
% a.txt |
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
113 |
first |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
114 |
third |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
115 |
% hg diff |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
116 |
diff --git a/a.txt b/a.txt |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
117 |
--- a/a.txt |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
118 |
+++ b/a.txt |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
119 |
@@ -1,3 +1,2 @@ |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
120 |
first |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
121 |
-second |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
122 |
third |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
123 |
$ dotest CRLF |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
124 |
|
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
125 |
% hg clone repo repo-CRLF |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
126 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12943
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
127 |
% a.txt (before) |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
128 |
first\r (esc) |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
129 |
second\r (esc) |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
130 |
third\r (esc) |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
131 |
% a.txt (after) |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
132 |
first\r (esc) |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
133 |
third\r (esc) |
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
134 |
% hg diff |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
135 |
diff --git a/a.txt b/a.txt |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
136 |
--- a/a.txt |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
137 |
+++ b/a.txt |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
138 |
@@ -1,3 +1,2 @@ |
12943
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
139 |
first\r (esc) |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
140 |
-second\r (esc) |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
141 |
third\r (esc) |
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
142 |
% hg update 0 |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
143 |
merging a.txt |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
144 |
2 files updated, 1 files merged, 0 files removed, 0 files unresolved |
12943
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12424
diff
changeset
|
145 |
% a.txt |
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
146 |
first |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
147 |
third |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
148 |
% hg diff |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
149 |
diff --git a/a.txt b/a.txt |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
150 |
--- a/a.txt |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
151 |
+++ b/a.txt |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
152 |
@@ -1,3 +1,2 @@ |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
153 |
first |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
154 |
-second |
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
155 |
third |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
156 |
|
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
157 |
Test in repo using eol extension, while keeping an eye on how filters are |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
158 |
applied: |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
159 |
|
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
160 |
$ cd repo |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
161 |
|
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
162 |
$ hg up -q -c -r null |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
163 |
$ cat > .hg/hgrc <<EOF |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
164 |
> [extensions] |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
165 |
> eol = |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
166 |
> EOF |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
167 |
|
43205
dfaa477e37a8
eol: fix update - don't use and apply removed .hgeol patterns
Mads Kiilerich <mads@kiilerich.com>
parents:
43203
diff
changeset
|
168 |
Update to revision 0 which has no .hgeol, shouldn't use any filters, and |
dfaa477e37a8
eol: fix update - don't use and apply removed .hgeol patterns
Mads Kiilerich <mads@kiilerich.com>
parents:
43203
diff
changeset
|
169 |
obviously should leave things as tidy as they were before the clean update. |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
170 |
|
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
171 |
$ hg up -c -r 0 -v --debug |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
172 |
resolving manifests |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
173 |
branchmerge: False, force: False, partial: False |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
174 |
ancestor: 000000000000, local: 000000000000+, remote: 15cbdf8ca3db |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
175 |
calling hook preupdate.eol: hgext.eol.preupdate |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
176 |
.hgeol: remote created -> g |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
177 |
getting .hgeol |
43203
d38f9117ee15
eol: update isbinary filter to work without compat wrapper
Mads Kiilerich <mads@kiilerich.com>
parents:
43201
diff
changeset
|
178 |
filtering .hgeol through isbinary |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
179 |
a.txt: remote created -> g |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
180 |
getting a.txt |
43201
6ceb3721e203
localrepo: debug log of filter name when filtering through a function
Mads Kiilerich <mads@kiilerich.com>
parents:
43200
diff
changeset
|
181 |
filtering a.txt through tolf |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
182 |
f: remote created -> g |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
183 |
getting f |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
184 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
185 |
$ hg st |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
186 |
|
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
187 |
$ hg branch b |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
188 |
marked working directory as branch b |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
189 |
(branches are permanent and global, did you want a bookmark?) |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
190 |
$ hg ci -m b |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
191 |
|
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
192 |
Merge changes that apply a filter to f: |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
193 |
|
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
194 |
$ hg merge 1 |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
195 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
196 |
(branch merge, don't forget to commit) |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
197 |
$ hg st |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
198 |
M .hgeol |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
199 |
M a.txt |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
200 |
M f |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
201 |
$ hg diff |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
202 |
diff --git a/.hgeol b/.hgeol |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
203 |
--- a/.hgeol |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
204 |
+++ b/.hgeol |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
205 |
@@ -1,2 +1,3 @@ |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
206 |
[patterns] |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
207 |
-**.txt = LF |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
208 |
+**.txt = CRLF |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
209 |
+f = LF |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
210 |
diff --git a/a.txt b/a.txt |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
211 |
--- a/a.txt |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
212 |
+++ b/a.txt |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
213 |
@@ -1,3 +1,3 @@ |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
214 |
-first |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
215 |
-second |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
216 |
-third |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
217 |
+first\r (esc) |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
218 |
+second\r (esc) |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
219 |
+third\r (esc) |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
220 |
diff --git a/f b/f |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
221 |
--- a/f |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
222 |
+++ b/f |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
223 |
@@ -1,1 +1,1 @@ |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
224 |
-f\r (esc) |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
225 |
+f |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
226 |
|
43205
dfaa477e37a8
eol: fix update - don't use and apply removed .hgeol patterns
Mads Kiilerich <mads@kiilerich.com>
parents:
43203
diff
changeset
|
227 |
Abort the merge with up -C to revision 0. |
dfaa477e37a8
eol: fix update - don't use and apply removed .hgeol patterns
Mads Kiilerich <mads@kiilerich.com>
parents:
43203
diff
changeset
|
228 |
Note that files are filtered correctly for revision 0: f is not filtered, a.txt |
dfaa477e37a8
eol: fix update - don't use and apply removed .hgeol patterns
Mads Kiilerich <mads@kiilerich.com>
parents:
43203
diff
changeset
|
229 |
is filtered with tolf, and everything is left tidy. |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
230 |
|
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
231 |
$ touch .hgeol * # ensure consistent dirtyness checks ignoring dirstate |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
232 |
$ hg up -C -r 0 -v --debug |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
233 |
eol: detected change in .hgeol |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
234 |
resolving manifests |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
235 |
branchmerge: False, force: True, partial: False |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
236 |
ancestor: 1db78bdd3bd6+, local: 1db78bdd3bd6+, remote: 15cbdf8ca3db |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
237 |
calling hook preupdate.eol: hgext.eol.preupdate |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
238 |
.hgeol: remote is newer -> g |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
239 |
getting .hgeol |
43203
d38f9117ee15
eol: update isbinary filter to work without compat wrapper
Mads Kiilerich <mads@kiilerich.com>
parents:
43201
diff
changeset
|
240 |
filtering .hgeol through isbinary |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
241 |
a.txt: remote is newer -> g |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
242 |
getting a.txt |
43201
6ceb3721e203
localrepo: debug log of filter name when filtering through a function
Mads Kiilerich <mads@kiilerich.com>
parents:
43200
diff
changeset
|
243 |
filtering a.txt through tolf |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
244 |
f: remote is newer -> g |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
245 |
getting f |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
246 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
247 |
|
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
248 |
$ touch .hgeol * |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
249 |
$ hg st --debug |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
250 |
eol: detected change in .hgeol |
43203
d38f9117ee15
eol: update isbinary filter to work without compat wrapper
Mads Kiilerich <mads@kiilerich.com>
parents:
43201
diff
changeset
|
251 |
filtering .hgeol through isbinary |
43201
6ceb3721e203
localrepo: debug log of filter name when filtering through a function
Mads Kiilerich <mads@kiilerich.com>
parents:
43200
diff
changeset
|
252 |
filtering a.txt through tolf |
43268
e88549a02f5e
tests: stabilize test-eol-update on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
43205
diff
changeset
|
253 |
skip updating dirstate: identity mismatch (?) |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
254 |
$ hg diff |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
255 |
|
43205
dfaa477e37a8
eol: fix update - don't use and apply removed .hgeol patterns
Mads Kiilerich <mads@kiilerich.com>
parents:
43203
diff
changeset
|
256 |
Things were clean, and updating again will not change anything: |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
257 |
|
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
258 |
$ touch .hgeol * |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
259 |
$ hg up -C -r 0 -v --debug |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
260 |
eol: detected change in .hgeol |
43203
d38f9117ee15
eol: update isbinary filter to work without compat wrapper
Mads Kiilerich <mads@kiilerich.com>
parents:
43201
diff
changeset
|
261 |
filtering .hgeol through isbinary |
43201
6ceb3721e203
localrepo: debug log of filter name when filtering through a function
Mads Kiilerich <mads@kiilerich.com>
parents:
43200
diff
changeset
|
262 |
filtering a.txt through tolf |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
263 |
resolving manifests |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
264 |
branchmerge: False, force: True, partial: False |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
265 |
ancestor: 15cbdf8ca3db+, local: 15cbdf8ca3db+, remote: 15cbdf8ca3db |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
266 |
calling hook preupdate.eol: hgext.eol.preupdate |
43268
e88549a02f5e
tests: stabilize test-eol-update on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
43205
diff
changeset
|
267 |
starting 4 threads for background file closing (?) |
43205
dfaa477e37a8
eol: fix update - don't use and apply removed .hgeol patterns
Mads Kiilerich <mads@kiilerich.com>
parents:
43203
diff
changeset
|
268 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
269 |
|
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
270 |
$ touch .hgeol * |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
271 |
$ hg st --debug |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
272 |
eol: detected change in .hgeol |
43203
d38f9117ee15
eol: update isbinary filter to work without compat wrapper
Mads Kiilerich <mads@kiilerich.com>
parents:
43201
diff
changeset
|
273 |
filtering .hgeol through isbinary |
43201
6ceb3721e203
localrepo: debug log of filter name when filtering through a function
Mads Kiilerich <mads@kiilerich.com>
parents:
43200
diff
changeset
|
274 |
filtering a.txt through tolf |
43200
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
275 |
|
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
276 |
$ cd .. |
a819b5777727
eol: test-eol-update.t coverage around update --clean using filters ... badly
Mads Kiilerich <mads@kiilerich.com>
parents:
13519
diff
changeset
|
277 |
|
12424
1aa7ba33f6a9
tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents:
11249
diff
changeset
|
278 |
$ rm -r repo |