Mercurial > hg

comparison tests/test-eol-update.t @ 12943:7439ea4146f8 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: use (esc) instead of other kinds of string escaping
author Mads Kiilerich <mads@kiilerich.com>
date Mon, 08 Nov 2010 01:41:42 +0100
parents 1aa7ba33f6a9
children 43b3b761d9d1
comparison
equal deleted inserted replaced
12942:05fffd665170 12943:7439ea4146f8
52 > eol = 52 > eol =
53 > EOF 53 > EOF
54 > 54 >
55 > hg update 55 > hg update
56 > 56 >
57 > echo '% printrepr.py a.txt (before)' 57 > echo '% a.txt (before)'
58 > python $TESTDIR/printrepr.py < a.txt 58 > cat a.txt
59 > 59 >
60 > printf "first${EOL}third${EOL}" > a.txt 60 > printf "first${EOL}third${EOL}" > a.txt
61 > 61 >
62 > echo '% printrepr.py a.txt (after)' 62 > echo '% a.txt (after)'
63 > python $TESTDIR/printrepr.py < a.txt 63 > cat a.txt
64 > echo '% hg diff' 64 > echo '% hg diff'
65 > hg diff | python $TESTDIR/printrepr.py 65 > hg diff
66 > 66 >
67 > echo '% hg update 0' 67 > echo '% hg update 0'
68 > hg update 0 68 > hg update 0
69 > 69 >
70 > echo '% printrepr.py a.txt' 70 > echo '% a.txt'
71 > python $TESTDIR/printrepr.py < a.txt 71 > cat a.txt
72 > echo '% hg diff' 72 > echo '% hg diff'
73 > hg diff | python $TESTDIR/printrepr.py 73 > hg diff
74 > 74 >
75 > 75 >
76 > cd .. 76 > cd ..
77 > rm -r repo-$1 77 > rm -r repo-$1
78 > } 78 > }
85 adding a.txt 85 adding a.txt
86 $ dotest LF 86 $ dotest LF
87 87
88 % hg clone repo repo-LF 88 % hg clone repo repo-LF
89 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 89 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
90 % printrepr.py a.txt (before) 90 % a.txt (before)
91 first\r 91 first\r (esc)
92 second\r 92 second\r (esc)
93 third\r 93 third\r (esc)
94 % printrepr.py a.txt (after) 94 % a.txt (after)
95 first 95 first
96 third 96 third
97 % hg diff 97 % hg diff
98 diff --git a/a.txt b/a.txt 98 diff --git a/a.txt b/a.txt
99 --- a/a.txt 99 --- a/a.txt
100 +++ b/a.txt 100 +++ b/a.txt
101 @@ -1,3 +1,2 @@ 101 @@ -1,3 +1,2 @@
102 first\r 102 first\r (esc)
103 -second\r 103 -second\r (esc)
104 third\r 104 third\r (esc)
105 % hg update 0 105 % hg update 0
106 merging a.txt 106 merging a.txt
107 1 files updated, 1 files merged, 0 files removed, 0 files unresolved 107 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
108 % printrepr.py a.txt 108 % a.txt
109 first 109 first
110 third 110 third
111 % hg diff 111 % hg diff
112 diff --git a/a.txt b/a.txt 112 diff --git a/a.txt b/a.txt
113 --- a/a.txt 113 --- a/a.txt
118 third 118 third
119 $ dotest CRLF 119 $ dotest CRLF
120 120
121 % hg clone repo repo-CRLF 121 % hg clone repo repo-CRLF
122 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 122 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
123 % printrepr.py a.txt (before) 123 % a.txt (before)
124 first\r 124 first\r (esc)
125 second\r 125 second\r (esc)
126 third\r 126 third\r (esc)
127 % printrepr.py a.txt (after) 127 % a.txt (after)
128 first\r 128 first\r (esc)
129 third\r 129 third\r (esc)
130 % hg diff 130 % hg diff
131 diff --git a/a.txt b/a.txt 131 diff --git a/a.txt b/a.txt
132 --- a/a.txt 132 --- a/a.txt
133 +++ b/a.txt 133 +++ b/a.txt
134 @@ -1,3 +1,2 @@ 134 @@ -1,3 +1,2 @@
135 first\r 135 first\r (esc)
136 -second\r 136 -second\r (esc)
137 third\r 137 third\r (esc)
138 % hg update 0 138 % hg update 0
139 merging a.txt 139 merging a.txt
140 1 files updated, 1 files merged, 0 files removed, 0 files unresolved 140 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
141 % printrepr.py a.txt 141 % a.txt
142 first 142 first
143 third 143 third
144 % hg diff 144 % hg diff
145 diff --git a/a.txt b/a.txt 145 diff --git a/a.txt b/a.txt
146 --- a/a.txt 146 --- a/a.txt