Mercurial > hg
annotate tests/test-win32text.t @ 19822:a194a33f8cb2
mq: prepare a strip extension for extraction
Strip will lives in its own extension. The extension is surprisingly called
`strip`. (as discussed in issue3824) The `mq` extension force the use of the
strip extension when its enabled. This will both necessary for backward
compatibility (people expect `mq` to comes with strip) and become some utility
function used by `mq` will move in the strip extension.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Thu, 26 Sep 2013 23:10:11 +0200 |
parents | 7985a9e2ddce |
children | c63a09b6b337 |
rev | line source |
---|---|
5680
963c516bb38c
test-win32text: avoid unix2dos, printf extensions
Patrick Mezard <pmezard@gmail.com>
parents:
5675
diff
changeset
|
1 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
2 $ hg init t |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
3 $ cd t |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
4 $ cat > unix2dos.py <<EOF |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
5 > import sys |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
6 > |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
7 > for path in sys.argv[1:]: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
8 > data = file(path, 'rb').read() |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
9 > data = data.replace('\n', '\r\n') |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
10 > file(path, 'wb').write(data) |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
11 > EOF |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
12 $ echo '[hooks]' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
13 $ echo 'pretxncommit.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
14 $ echo 'pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
15 $ cat .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
16 [hooks] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
17 pretxncommit.crlf = python:hgext.win32text.forbidcrlf |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
18 pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
12978
diff
changeset
|
19 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
20 $ echo hello > f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
21 $ hg add f |
5967
f8ad3b76e923
Provide better context for custom Python encode/decode filters.
Jesse Glick <jesse.glick@sun.com>
parents:
5680
diff
changeset
|
22 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
23 commit should succeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
24 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
25 $ hg ci -m 1 |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
12978
diff
changeset
|
26 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
27 $ hg clone . ../zoz |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
28 updating to branch default |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
29 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
30 $ cp .hg/hgrc ../zoz/.hg |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
31 $ python unix2dos.py f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
32 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
33 commit should fail |
5675
a5fe27b83a4a
Issue 882: add standard hook to reject text files with CRLF.
Jesse Glick <jesse.glick@sun.com>
parents:
diff
changeset
|
34 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
35 $ hg ci -m 2.1 |
16932
7985a9e2ddce
win32text: lowercase warning message
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
36 attempt to commit or push text file(s) using CRLF line endings |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
37 in f583ea08d42a: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
38 transaction abort! |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
39 rollback completed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
40 abort: pretxncommit.crlf hook failed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
41 [255] |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
12978
diff
changeset
|
42 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
43 $ mv .hg/hgrc .hg/hgrc.bak |
5675
a5fe27b83a4a
Issue 882: add standard hook to reject text files with CRLF.
Jesse Glick <jesse.glick@sun.com>
parents:
diff
changeset
|
44 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
45 commits should succeed |
8147
441dc7becd43
win32text: be more careful about rejecting violating changesets
Bryan O'Sullivan <bos@serpentine.com>
parents:
7226
diff
changeset
|
46 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
47 $ hg ci -m 2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
48 $ hg cp f g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
49 $ hg ci -m 2.2 |
8147
441dc7becd43
win32text: be more careful about rejecting violating changesets
Bryan O'Sullivan <bos@serpentine.com>
parents:
7226
diff
changeset
|
50 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
51 push should fail |
8147
441dc7becd43
win32text: be more careful about rejecting violating changesets
Bryan O'Sullivan <bos@serpentine.com>
parents:
7226
diff
changeset
|
52 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
53 $ hg push ../zoz |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
54 pushing to ../zoz |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
55 searching for changes |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
56 adding changesets |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
57 adding manifests |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
58 adding file changes |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
59 added 2 changesets with 2 changes to 2 files |
16932
7985a9e2ddce
win32text: lowercase warning message
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
60 attempt to commit or push text file(s) using CRLF line endings |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
61 in bc2d09796734: g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
62 in b1aa5cde7ff4: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
63 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
64 To prevent this mistake in your local repository, |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
65 add to Mercurial.ini or .hg/hgrc: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
66 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
67 [hooks] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
68 pretxncommit.crlf = python:hgext.win32text.forbidcrlf |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
69 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
70 and also consider adding: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
71 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
72 [extensions] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
73 win32text = |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
74 [encode] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
75 ** = cleverencode: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
76 [decode] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
77 ** = cleverdecode: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
78 transaction abort! |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
79 rollback completed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
80 abort: pretxnchangegroup.crlf hook failed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
81 [255] |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
12978
diff
changeset
|
82 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
83 $ mv .hg/hgrc.bak .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
84 $ echo hello > f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
85 $ hg rm g |
8147
441dc7becd43
win32text: be more careful about rejecting violating changesets
Bryan O'Sullivan <bos@serpentine.com>
parents:
7226
diff
changeset
|
86 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
87 commit should succeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
88 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
89 $ hg ci -m 2.3 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
90 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
91 push should succeed |
8147
441dc7becd43
win32text: be more careful about rejecting violating changesets
Bryan O'Sullivan <bos@serpentine.com>
parents:
7226
diff
changeset
|
92 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
93 $ hg push ../zoz |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
94 pushing to ../zoz |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
95 searching for changes |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
96 adding changesets |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
97 adding manifests |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
98 adding file changes |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
99 added 3 changesets with 3 changes to 2 files |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
100 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
101 and now for something completely different |
5675
a5fe27b83a4a
Issue 882: add standard hook to reject text files with CRLF.
Jesse Glick <jesse.glick@sun.com>
parents:
diff
changeset
|
102 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
103 $ mkdir d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
104 $ echo hello > d/f2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
105 $ python unix2dos.py d/f2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
106 $ hg add d/f2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
107 $ hg ci -m 3 |
16932
7985a9e2ddce
win32text: lowercase warning message
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
108 attempt to commit or push text file(s) using CRLF line endings |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
109 in 053ba1a3035a: d/f2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
110 transaction abort! |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
111 rollback completed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
112 abort: pretxncommit.crlf hook failed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
113 [255] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
114 $ hg revert -a |
15520
d6d7b56ec346
tests: add missing '(glob)'s to match '\' in paths in test output on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
115 forgetting d/f2 (glob) |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
116 $ rm d/f2 |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
12978
diff
changeset
|
117 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
118 $ hg rem f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
119 $ hg ci -m 4 |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
12978
diff
changeset
|
120 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
121 $ python -c 'file("bin", "wb").write("hello\x00\x0D\x0A")' |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
122 $ hg add bin |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
123 $ hg ci -m 5 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
124 $ hg log -v |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
125 changeset: 5:f0b1c8d75fce |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
126 tag: tip |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
127 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
128 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
129 files: bin |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
130 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
131 5 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
132 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
133 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
134 changeset: 4:77796dbcd4ad |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
135 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
136 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
137 files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
138 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
139 4 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
140 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
141 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
142 changeset: 3:7c1b5430b350 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
143 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
144 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
145 files: f g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
146 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
147 2.3 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
148 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
149 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
150 changeset: 2:bc2d09796734 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
151 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
152 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
153 files: g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
154 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
155 2.2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
156 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
157 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
158 changeset: 1:b1aa5cde7ff4 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
159 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
160 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
161 files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
162 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
163 2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
164 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
165 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
166 changeset: 0:fcf06d5c4e1d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
167 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
168 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
169 files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
170 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
171 1 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
172 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
173 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
174 $ hg clone . dupe |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
175 updating to branch default |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
176 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
12978
diff
changeset
|
177 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
178 $ for x in a b c d; do echo content > dupe/$x; done |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
179 $ hg -R dupe add |
15520
d6d7b56ec346
tests: add missing '(glob)'s to match '\' in paths in test output on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
180 adding dupe/a (glob) |
d6d7b56ec346
tests: add missing '(glob)'s to match '\' in paths in test output on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
181 adding dupe/b (glob) |
d6d7b56ec346
tests: add missing '(glob)'s to match '\' in paths in test output on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
182 adding dupe/c (glob) |
d6d7b56ec346
tests: add missing '(glob)'s to match '\' in paths in test output on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
183 adding dupe/d (glob) |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
184 $ python unix2dos.py dupe/b dupe/c dupe/d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
185 $ hg -R dupe ci -m a dupe/a |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
186 $ hg -R dupe ci -m b/c dupe/[bc] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
187 $ hg -R dupe ci -m d dupe/d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
188 $ hg -R dupe log -v |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
189 changeset: 8:67ac5962ab43 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
190 tag: tip |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
191 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
192 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
193 files: d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
194 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
195 d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
196 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
197 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
198 changeset: 7:68c127d1834e |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
199 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
200 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
201 files: b c |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
202 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
203 b/c |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
204 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
205 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
206 changeset: 6:adbf8bf7f31d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
207 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
208 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
209 files: a |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
210 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
211 a |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
212 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
213 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
214 changeset: 5:f0b1c8d75fce |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
215 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
216 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
217 files: bin |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
218 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
219 5 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
220 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
221 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
222 changeset: 4:77796dbcd4ad |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
223 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
224 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
225 files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
226 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
227 4 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
228 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
229 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
230 changeset: 3:7c1b5430b350 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
231 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
232 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
233 files: f g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
234 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
235 2.3 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
236 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
237 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
238 changeset: 2:bc2d09796734 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
239 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
240 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
241 files: g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
242 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
243 2.2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
244 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
245 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
246 changeset: 1:b1aa5cde7ff4 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
247 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
248 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
249 files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
250 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
251 2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
252 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
253 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
254 changeset: 0:fcf06d5c4e1d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
255 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
256 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
257 files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
258 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
259 1 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
260 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
261 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
262 $ hg pull dupe |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
263 pulling from dupe |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
264 searching for changes |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
265 adding changesets |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
266 adding manifests |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
267 adding file changes |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
268 added 3 changesets with 4 changes to 4 files |
16932
7985a9e2ddce
win32text: lowercase warning message
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
269 attempt to commit or push text file(s) using CRLF line endings |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
270 in 67ac5962ab43: d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
271 in 68c127d1834e: b |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
272 in 68c127d1834e: c |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
273 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
274 To prevent this mistake in your local repository, |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
275 add to Mercurial.ini or .hg/hgrc: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
276 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
277 [hooks] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
278 pretxncommit.crlf = python:hgext.win32text.forbidcrlf |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
279 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
280 and also consider adding: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
281 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
282 [extensions] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
283 win32text = |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
284 [encode] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
285 ** = cleverencode: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
286 [decode] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
287 ** = cleverdecode: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
288 transaction abort! |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
289 rollback completed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
290 abort: pretxnchangegroup.crlf hook failed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
291 [255] |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
12978
diff
changeset
|
292 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
293 $ hg log -v |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
294 changeset: 5:f0b1c8d75fce |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
295 tag: tip |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
296 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
297 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
298 files: bin |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
299 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
300 5 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
301 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
302 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
303 changeset: 4:77796dbcd4ad |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
304 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
305 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
306 files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
307 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
308 4 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
309 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
310 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
311 changeset: 3:7c1b5430b350 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
312 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
313 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
314 files: f g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
315 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
316 2.3 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
317 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
318 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
319 changeset: 2:bc2d09796734 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
320 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
321 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
322 files: g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
323 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
324 2.2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
325 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
326 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
327 changeset: 1:b1aa5cde7ff4 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
328 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
329 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
330 files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
331 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
332 2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
333 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
334 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
335 changeset: 0:fcf06d5c4e1d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
336 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
337 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
338 files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
339 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
340 1 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
341 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
342 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
343 $ rm .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
344 $ (echo some; echo text) > f3 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
345 $ python -c 'file("f4.bat", "wb").write("rem empty\x0D\x0A")' |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
346 $ hg add f3 f4.bat |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
347 $ hg ci -m 6 |
12977
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
348 $ cat bin |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
349 hello\x00\r (esc) |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
350 $ cat f3 |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
351 some |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
352 text |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
353 $ cat f4.bat |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
354 rem empty\r (esc) |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
12978
diff
changeset
|
355 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
356 $ echo '[extensions]' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
357 $ echo 'win32text = ' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
358 $ echo '[decode]' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
359 $ echo '** = cleverdecode:' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
360 $ echo '[encode]' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
361 $ echo '** = cleverencode:' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
362 $ cat .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
363 [extensions] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
364 win32text = |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
365 [decode] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
366 ** = cleverdecode: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
367 [encode] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
368 ** = cleverencode: |
12843
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
369 |
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
370 Trigger deprecation warning: |
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
371 |
12853
13984e96cb09
test-win32text.t: stabilize test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12843
diff
changeset
|
372 $ hg id -t |
12843
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
373 win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension |
12853
13984e96cb09
test-win32text.t: stabilize test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12843
diff
changeset
|
374 tip |
12843
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
375 |
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
376 Disable warning: |
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
377 |
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
378 $ echo '[win32text]' >> .hg/hgrc |
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
379 $ echo 'warn = no' >> .hg/hgrc |
12853
13984e96cb09
test-win32text.t: stabilize test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12843
diff
changeset
|
380 $ hg id -t |
13984e96cb09
test-win32text.t: stabilize test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12843
diff
changeset
|
381 tip |
12843
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
382 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
383 $ rm f3 f4.bat bin |
12978
5ac9c903e7d2
test-win32text: use $TESTTMP in output
Martin Geisler <mg@lazybytes.net>
parents:
12977
diff
changeset
|
384 $ hg co -C |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
385 WARNING: f4.bat already has CRLF line endings |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
386 and does not need EOL conversion by the win32text plugin. |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
387 Before your next commit, please reconsider your encode/decode settings in |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
388 Mercurial.ini or $TESTTMP/t/.hg/hgrc. (glob) |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
389 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12977
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
390 $ cat bin |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
391 hello\x00\r (esc) |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
392 $ cat f3 |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
393 some\r (esc) |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
394 text\r (esc) |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
395 $ cat f4.bat |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
396 rem empty\r (esc) |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
12978
diff
changeset
|
397 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
398 $ python -c 'file("f5.sh", "wb").write("# empty\x0D\x0A")' |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
399 $ hg add f5.sh |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
400 $ hg ci -m 7 |
12977
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
401 $ cat f5.sh |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
402 # empty\r (esc) |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
403 $ hg cat f5.sh |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
404 # empty |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
405 $ echo '% just linefeed' > linefeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
406 $ hg ci -qAm 8 linefeed |
12977
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
407 $ cat linefeed |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
408 % just linefeed |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
409 $ hg cat linefeed |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
410 % just linefeed |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
411 $ hg st -q |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
412 $ hg revert -a linefeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
413 no changes needed to linefeed |
12977
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
414 $ cat linefeed |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
415 % just linefeed |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
416 $ hg st -q |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
417 $ echo modified >> linefeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
418 $ hg st -q |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
419 M linefeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
420 $ hg revert -a |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
421 reverting linefeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
422 $ hg st -q |
12977
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
423 $ cat linefeed |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
424 % just linefeed\r (esc) |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15520
diff
changeset
|
425 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15520
diff
changeset
|
426 $ cd .. |