Mercurial > hg
annotate tests/test-win32text.t @ 47012:d55b71393907
node: replace nullid and friends with nodeconstants class
The introduction of 256bit hashes require changes to nullid and other
constant magic values. Start pushing them down from repository and
revlog where sensible.
Differential Revision: https://phab.mercurial-scm.org/D9465
author | Joerg Sonnenberger <joerg@bec.de> |
---|---|
date | Mon, 29 Mar 2021 01:52:06 +0200 |
parents | 768056549737 |
children | 9f1b9e128788 |
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:]: |
36014
d7238d125aa2
py3: replace file() with open() in test-win32text.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
8 > data = open(path, 'rb').read() |
d7238d125aa2
py3: replace file() with open() in test-win32text.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
9 > data = data.replace(b'\n', b'\r\n') |
d7238d125aa2
py3: replace file() with open() in test-win32text.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
10 > open(path, 'wb').write(data) |
12494
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 |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
36014
diff
changeset
|
31 $ "$PYTHON" unix2dos.py f |
12494
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 |
46417
768056549737
errors: use exit code 40 for when a hook fails
Martin von Zweigbergk <martinvonz@google.com>
parents:
42897
diff
changeset
|
41 [40] |
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 |
16932
7985a9e2ddce
win32text: lowercase warning message
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
59 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
|
60 in bc2d09796734: g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
61 in b1aa5cde7ff4: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
62 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
63 To prevent this mistake in your local repository, |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
64 add to Mercurial.ini or .hg/hgrc: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
65 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
66 [hooks] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
67 pretxncommit.crlf = python:hgext.win32text.forbidcrlf |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
68 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
69 and also consider adding: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
70 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
71 [extensions] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
72 win32text = |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
73 [encode] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
74 ** = cleverencode: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
75 [decode] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
76 ** = cleverdecode: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
77 transaction abort! |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
78 rollback completed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
79 abort: pretxnchangegroup.crlf hook failed |
46417
768056549737
errors: use exit code 40 for when a hook fails
Martin von Zweigbergk <martinvonz@google.com>
parents:
42897
diff
changeset
|
80 [40] |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
12978
diff
changeset
|
81 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
82 $ mv .hg/hgrc.bak .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
83 $ echo hello > f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
84 $ hg rm g |
8147
441dc7becd43
win32text: be more careful about rejecting violating changesets
Bryan O'Sullivan <bos@serpentine.com>
parents:
7226
diff
changeset
|
85 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
86 commit should succeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
87 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
88 $ hg ci -m 2.3 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
89 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
90 push should succeed |
8147
441dc7becd43
win32text: be more careful about rejecting violating changesets
Bryan O'Sullivan <bos@serpentine.com>
parents:
7226
diff
changeset
|
91 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
92 $ hg push ../zoz |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
93 pushing to ../zoz |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
94 searching for changes |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
95 adding changesets |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
96 adding manifests |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
97 adding file changes |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
98 added 3 changesets with 3 changes to 2 files |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
99 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
100 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
|
101 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
102 $ mkdir d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
103 $ echo hello > d/f2 |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
36014
diff
changeset
|
104 $ "$PYTHON" unix2dos.py d/f2 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
105 $ hg add d/f2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
106 $ hg ci -m 3 |
16932
7985a9e2ddce
win32text: lowercase warning message
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
107 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
|
108 in 053ba1a3035a: d/f2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
109 transaction abort! |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
110 rollback completed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
111 abort: pretxncommit.crlf hook failed |
46417
768056549737
errors: use exit code 40 for when a hook fails
Martin von Zweigbergk <martinvonz@google.com>
parents:
42897
diff
changeset
|
112 [40] |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
113 $ hg revert -a |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
32940
diff
changeset
|
114 forgetting d/f2 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
115 $ rm d/f2 |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
12978
diff
changeset
|
116 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
117 $ hg rem f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
118 $ 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
|
119 |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
36014
diff
changeset
|
120 $ "$PYTHON" -c 'open("bin", "wb").write(b"hello\x00\x0D\x0A")' |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
121 $ hg add bin |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
122 $ hg ci -m 5 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
123 $ hg log -v |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
124 changeset: 5:f0b1c8d75fce |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
125 tag: tip |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
126 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
127 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
128 files: bin |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
129 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
130 5 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
131 |
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 changeset: 4:77796dbcd4ad |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
134 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
135 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
136 files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
137 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
138 4 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
139 |
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 changeset: 3:7c1b5430b350 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
142 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
143 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
144 files: f g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
145 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
146 2.3 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
147 |
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 changeset: 2:bc2d09796734 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
150 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
151 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
152 files: g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
153 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
154 2.2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
155 |
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 changeset: 1:b1aa5cde7ff4 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
158 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
159 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
160 files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
161 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
162 2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
163 |
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 changeset: 0:fcf06d5c4e1d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
166 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
167 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
168 files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
169 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
170 1 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
171 |
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 $ hg clone . dupe |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
174 updating to branch default |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
175 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
|
176 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
177 $ 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
|
178 $ hg -R dupe add |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
32940
diff
changeset
|
179 adding dupe/a |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
32940
diff
changeset
|
180 adding dupe/b |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
32940
diff
changeset
|
181 adding dupe/c |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
32940
diff
changeset
|
182 adding dupe/d |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
36014
diff
changeset
|
183 $ "$PYTHON" unix2dos.py dupe/b dupe/c dupe/d |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
184 $ hg -R dupe ci -m a dupe/a |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
185 $ hg -R dupe ci -m b/c dupe/[bc] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
186 $ hg -R dupe ci -m d dupe/d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
187 $ hg -R dupe log -v |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
188 changeset: 8:67ac5962ab43 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
189 tag: tip |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
190 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
191 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
192 files: d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
193 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
194 d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
195 |
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 changeset: 7:68c127d1834e |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
198 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
199 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
200 files: b c |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
201 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
202 b/c |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
203 |
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 changeset: 6:adbf8bf7f31d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
206 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
207 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
208 files: a |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
209 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
210 a |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
211 |
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 changeset: 5:f0b1c8d75fce |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
214 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
215 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
216 files: bin |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
217 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
218 5 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
219 |
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 changeset: 4:77796dbcd4ad |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
222 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
223 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
224 files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
225 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
226 4 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
227 |
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 changeset: 3:7c1b5430b350 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
230 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
231 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
232 files: f g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
233 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
234 2.3 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
235 |
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 changeset: 2:bc2d09796734 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
238 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
239 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
240 files: g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
241 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
242 2.2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
243 |
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 changeset: 1:b1aa5cde7ff4 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
246 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
247 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
248 files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
249 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
250 2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
251 |
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 changeset: 0:fcf06d5c4e1d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
254 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
255 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
256 files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
257 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
258 1 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
259 |
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 $ hg pull dupe |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
262 pulling from dupe |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
263 searching for changes |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
264 adding changesets |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
265 adding manifests |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
266 adding file changes |
16932
7985a9e2ddce
win32text: lowercase warning message
Martin Geisler <mg@aragost.com>
parents:
16913
diff
changeset
|
267 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
|
268 in 67ac5962ab43: d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
269 in 68c127d1834e: b |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
270 in 68c127d1834e: c |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
271 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
272 To prevent this mistake in your local repository, |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
273 add to Mercurial.ini or .hg/hgrc: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
274 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
275 [hooks] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
276 pretxncommit.crlf = python:hgext.win32text.forbidcrlf |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
277 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
278 and also consider adding: |
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 [extensions] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
281 win32text = |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
282 [encode] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
283 ** = cleverencode: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
284 [decode] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
285 ** = cleverdecode: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
286 transaction abort! |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
287 rollback completed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
288 abort: pretxnchangegroup.crlf hook failed |
46417
768056549737
errors: use exit code 40 for when a hook fails
Martin von Zweigbergk <martinvonz@google.com>
parents:
42897
diff
changeset
|
289 [40] |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
12978
diff
changeset
|
290 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
291 $ hg log -v |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
292 changeset: 5:f0b1c8d75fce |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
293 tag: tip |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
294 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
295 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
296 files: bin |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
297 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
298 5 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
299 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
300 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
301 changeset: 4:77796dbcd4ad |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
302 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
303 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
304 files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
305 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
306 4 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
307 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
308 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
309 changeset: 3:7c1b5430b350 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
310 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
311 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
312 files: f g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
313 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
314 2.3 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
315 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
316 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
317 changeset: 2:bc2d09796734 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
318 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
319 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
320 files: g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
321 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
322 2.2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
323 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
324 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
325 changeset: 1:b1aa5cde7ff4 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
326 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
327 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
328 files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
329 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
330 2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
331 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
332 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
333 changeset: 0:fcf06d5c4e1d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
334 user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
335 date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
336 files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
337 description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
338 1 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
339 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
340 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
341 $ rm .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
342 $ (echo some; echo text) > f3 |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
36014
diff
changeset
|
343 $ "$PYTHON" -c 'open("f4.bat", "wb").write(b"rem empty\x0D\x0A")' |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
344 $ hg add f3 f4.bat |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
345 $ hg ci -m 6 |
12977
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
346 $ cat bin |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
347 hello\x00\r (esc) |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
348 $ cat f3 |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
349 some |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
350 text |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
351 $ cat f4.bat |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
352 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
|
353 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
354 $ echo '[extensions]' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
355 $ echo 'win32text = ' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
356 $ echo '[decode]' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
357 $ echo '** = cleverdecode:' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
358 $ echo '[encode]' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
359 $ echo '** = cleverencode:' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
360 $ cat .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
361 [extensions] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
362 win32text = |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
363 [decode] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
364 ** = cleverdecode: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
365 [encode] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
366 ** = cleverencode: |
12843
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
367 |
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
368 Trigger deprecation warning: |
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
369 |
12853
13984e96cb09
test-win32text.t: stabilize test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12843
diff
changeset
|
370 $ hg id -t |
26421
4b0fc75f9403
urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents:
22947
diff
changeset
|
371 win32text is deprecated: https://mercurial-scm.org/wiki/Win32TextExtension |
12853
13984e96cb09
test-win32text.t: stabilize test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12843
diff
changeset
|
372 tip |
12843
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
373 |
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
374 Disable warning: |
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 $ echo '[win32text]' >> .hg/hgrc |
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
377 $ echo 'warn = no' >> .hg/hgrc |
12853
13984e96cb09
test-win32text.t: stabilize test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12843
diff
changeset
|
378 $ hg id -t |
13984e96cb09
test-win32text.t: stabilize test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12843
diff
changeset
|
379 tip |
12843
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
380 |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
381 $ rm f3 f4.bat bin |
12978
5ac9c903e7d2
test-win32text: use $TESTTMP in output
Martin Geisler <mg@lazybytes.net>
parents:
12977
diff
changeset
|
382 $ hg co -C |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
383 WARNING: f4.bat already has CRLF line endings |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
384 and does not need EOL conversion by the win32text plugin. |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
385 Before your next commit, please reconsider your encode/decode settings in |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
32940
diff
changeset
|
386 Mercurial.ini or $TESTTMP/t/.hg/hgrc. |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
387 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
|
388 $ cat bin |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
389 hello\x00\r (esc) |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
390 $ cat f3 |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
391 some\r (esc) |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
392 text\r (esc) |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
393 $ cat f4.bat |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
394 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
|
395 |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
36014
diff
changeset
|
396 $ "$PYTHON" -c 'open("f5.sh", "wb").write(b"# empty\x0D\x0A")' |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
397 $ hg add f5.sh |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
398 $ hg ci -m 7 |
12977
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
399 $ cat f5.sh |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
400 # empty\r (esc) |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
401 $ hg cat f5.sh |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
402 # empty |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
403 $ echo '% just linefeed' > linefeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
404 $ 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
|
405 $ cat linefeed |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
406 % just linefeed |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
407 $ hg cat linefeed |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
408 % just linefeed |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
409 $ hg st -q |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
410 $ hg revert -a linefeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
411 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
|
412 $ cat linefeed |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
413 % just linefeed |
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
414 $ hg st -q |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
415 $ echo modified >> linefeed |
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 M linefeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
418 $ hg revert -a |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
419 reverting linefeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
420 $ hg st -q |
12977
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
421 $ cat linefeed |
a1a50567b5d2
test-win32text: use (esc) lines instead of Python script
Martin Geisler <mg@lazybytes.net>
parents:
12853
diff
changeset
|
422 % just linefeed\r (esc) |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15520
diff
changeset
|
423 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15520
diff
changeset
|
424 $ cd .. |