author | Martin Geisler <mg@lazybytes.net> |
Wed, 27 Oct 2010 12:05:37 +0200 | |
branch | stable |
changeset 12857 | a9f91c844a3b |
parent 12853 | 13984e96cb09 |
child 12977 | a1a50567b5d2 |
permissions | -rw-r--r-- |
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 |
$ cat > print.py <<EOF |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
13 |
> import sys |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
14 |
> print(sys.stdin.read().replace('\n', '<LF>').replace('\r', '<CR>').replace('\0', '<NUL>')) |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
15 |
> EOF |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
16 |
$ echo '[hooks]' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
17 |
$ echo 'pretxncommit.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
18 |
$ echo 'pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
19 |
$ cat .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
20 |
[hooks] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
21 |
pretxncommit.crlf = python:hgext.win32text.forbidcrlf |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
22 |
pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
23 |
$ echo |
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 |
$ echo hello > f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
26 |
$ hg add f |
5967
f8ad3b76e923
Provide better context for custom Python encode/decode filters.
Jesse Glick <jesse.glick@sun.com>
parents:
5680
diff
changeset
|
27 |
|
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
28 |
commit should succeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
29 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
30 |
$ hg ci -m 1 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
31 |
$ echo |
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 |
$ hg clone . ../zoz |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
34 |
updating to branch default |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
35 |
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
|
36 |
$ cp .hg/hgrc ../zoz/.hg |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
37 |
$ python unix2dos.py f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
38 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
39 |
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
|
40 |
|
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
41 |
$ hg ci -m 2.1 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
42 |
Attempt to commit or push text file(s) using CRLF line endings |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
43 |
in f583ea08d42a: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
44 |
transaction abort! |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
45 |
rollback completed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
46 |
abort: pretxncommit.crlf hook failed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
47 |
[255] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
48 |
$ echo |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
49 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
50 |
$ 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
|
51 |
|
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
52 |
commits should succeed |
8147
441dc7becd43
win32text: be more careful about rejecting violating changesets
Bryan O'Sullivan <bos@serpentine.com>
parents:
7226
diff
changeset
|
53 |
|
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
54 |
$ hg ci -m 2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
55 |
$ hg cp f g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
56 |
$ hg ci -m 2.2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
57 |
$ echo |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
58 |
|
8147
441dc7becd43
win32text: be more careful about rejecting violating changesets
Bryan O'Sullivan <bos@serpentine.com>
parents:
7226
diff
changeset
|
59 |
|
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
60 |
push should fail |
8147
441dc7becd43
win32text: be more careful about rejecting violating changesets
Bryan O'Sullivan <bos@serpentine.com>
parents:
7226
diff
changeset
|
61 |
|
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
62 |
$ hg push ../zoz |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
63 |
pushing to ../zoz |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
64 |
searching for changes |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
65 |
adding changesets |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
66 |
adding manifests |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
67 |
adding file changes |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
68 |
added 2 changesets with 2 changes to 2 files |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
69 |
Attempt to commit or push text file(s) using CRLF line endings |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
70 |
in bc2d09796734: g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
71 |
in b1aa5cde7ff4: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
72 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
73 |
To prevent this mistake in your local repository, |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
74 |
add to Mercurial.ini or .hg/hgrc: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
75 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
76 |
[hooks] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
77 |
pretxncommit.crlf = python:hgext.win32text.forbidcrlf |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
78 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
79 |
and also consider adding: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
80 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
81 |
[extensions] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
82 |
win32text = |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
83 |
[encode] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
84 |
** = cleverencode: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
85 |
[decode] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
86 |
** = cleverdecode: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
87 |
transaction abort! |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
88 |
rollback completed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
89 |
abort: pretxnchangegroup.crlf hook failed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
90 |
[255] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
91 |
$ echo |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
92 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
93 |
$ mv .hg/hgrc.bak .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
94 |
$ echo hello > f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
95 |
$ hg rm g |
8147
441dc7becd43
win32text: be more careful about rejecting violating changesets
Bryan O'Sullivan <bos@serpentine.com>
parents:
7226
diff
changeset
|
96 |
|
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
97 |
commit should succeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
98 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
99 |
$ hg ci -m 2.3 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
100 |
$ echo |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
101 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
102 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
103 |
push should succeed |
8147
441dc7becd43
win32text: be more careful about rejecting violating changesets
Bryan O'Sullivan <bos@serpentine.com>
parents:
7226
diff
changeset
|
104 |
|
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
105 |
$ hg push ../zoz |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
106 |
pushing to ../zoz |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
107 |
searching for changes |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
108 |
adding changesets |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
109 |
adding manifests |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
110 |
adding file changes |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
111 |
added 3 changesets with 3 changes to 2 files |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
112 |
$ echo |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
113 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
114 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
115 |
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
|
116 |
|
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
117 |
$ mkdir d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
118 |
$ echo hello > d/f2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
119 |
$ python unix2dos.py d/f2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
120 |
$ hg add d/f2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
121 |
$ hg ci -m 3 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
122 |
Attempt to commit or push text file(s) using CRLF line endings |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
123 |
in 053ba1a3035a: d/f2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
124 |
transaction abort! |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
125 |
rollback completed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
126 |
abort: pretxncommit.crlf hook failed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
127 |
[255] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
128 |
$ hg revert -a |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
129 |
forgetting d/f2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
130 |
$ rm d/f2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
131 |
$ echo |
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 |
$ hg rem f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
134 |
$ hg ci -m 4 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
135 |
$ echo |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
136 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
137 |
$ python -c 'file("bin", "wb").write("hello\x00\x0D\x0A")' |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
138 |
$ hg add bin |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
139 |
$ hg ci -m 5 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
140 |
$ hg log -v |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
141 |
changeset: 5:f0b1c8d75fce |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
142 |
tag: tip |
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: bin |
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 |
5 |
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: 4:77796dbcd4ad |
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: f |
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 |
4 |
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: 3:7c1b5430b350 |
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 g |
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.3 |
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: 2:bc2d09796734 |
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: g |
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 |
2.2 |
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 |
changeset: 1:b1aa5cde7ff4 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
175 |
user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
176 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
177 |
files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
178 |
description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
179 |
2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
180 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
181 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
182 |
changeset: 0:fcf06d5c4e1d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
183 |
user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
184 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
185 |
files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
186 |
description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
187 |
1 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
188 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
189 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
190 |
$ echo |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
191 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
192 |
$ hg clone . dupe |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
193 |
updating to branch default |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
194 |
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
|
195 |
$ echo |
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 |
$ 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
|
198 |
$ hg -R dupe add |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
199 |
adding dupe/a |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
200 |
adding dupe/b |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
201 |
adding dupe/c |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
202 |
adding dupe/d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
203 |
$ python unix2dos.py dupe/b dupe/c dupe/d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
204 |
$ hg -R dupe ci -m a dupe/a |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
205 |
$ hg -R dupe ci -m b/c dupe/[bc] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
206 |
$ hg -R dupe ci -m d dupe/d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
207 |
$ hg -R dupe log -v |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
208 |
changeset: 8:67ac5962ab43 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
209 |
tag: tip |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
210 |
user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
211 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
212 |
files: d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
213 |
description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
214 |
d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
215 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
216 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
217 |
changeset: 7:68c127d1834e |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
218 |
user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
219 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
220 |
files: b c |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
221 |
description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
222 |
b/c |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
223 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
224 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
225 |
changeset: 6:adbf8bf7f31d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
226 |
user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
227 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
228 |
files: a |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
229 |
description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
230 |
a |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
231 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
232 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
233 |
changeset: 5:f0b1c8d75fce |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
234 |
user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
235 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
236 |
files: bin |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
237 |
description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
238 |
5 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
239 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
240 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
241 |
changeset: 4:77796dbcd4ad |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
242 |
user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
243 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
244 |
files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
245 |
description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
246 |
4 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
247 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
248 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
249 |
changeset: 3:7c1b5430b350 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
250 |
user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
251 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
252 |
files: f g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
253 |
description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
254 |
2.3 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
255 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
256 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
257 |
changeset: 2:bc2d09796734 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
258 |
user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
259 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
260 |
files: g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
261 |
description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
262 |
2.2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
263 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
264 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
265 |
changeset: 1:b1aa5cde7ff4 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
266 |
user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
267 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
268 |
files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
269 |
description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
270 |
2 |
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 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
273 |
changeset: 0:fcf06d5c4e1d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
274 |
user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
275 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
276 |
files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
277 |
description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
278 |
1 |
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 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
281 |
$ echo |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
282 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
283 |
$ hg pull dupe |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
284 |
pulling from dupe |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
285 |
searching for changes |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
286 |
adding changesets |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
287 |
adding manifests |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
288 |
adding file changes |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
289 |
added 3 changesets with 4 changes to 4 files |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
290 |
Attempt to commit or push text file(s) using CRLF line endings |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
291 |
in 67ac5962ab43: d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
292 |
in 68c127d1834e: b |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
293 |
in 68c127d1834e: c |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
294 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
295 |
To prevent this mistake in your local repository, |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
296 |
add to Mercurial.ini or .hg/hgrc: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
297 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
298 |
[hooks] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
299 |
pretxncommit.crlf = python:hgext.win32text.forbidcrlf |
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 |
and also consider adding: |
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 |
[extensions] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
304 |
win32text = |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
305 |
[encode] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
306 |
** = cleverencode: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
307 |
[decode] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
308 |
** = cleverdecode: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
309 |
transaction abort! |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
310 |
rollback completed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
311 |
abort: pretxnchangegroup.crlf hook failed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
312 |
[255] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
313 |
$ echo |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
314 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
315 |
$ hg log -v |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
316 |
changeset: 5:f0b1c8d75fce |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
317 |
tag: tip |
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: bin |
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 |
5 |
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: 4:77796dbcd4ad |
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 |
4 |
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: 3:7c1b5430b350 |
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 g |
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 |
2.3 |
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 |
changeset: 2:bc2d09796734 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
342 |
user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
343 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
344 |
files: g |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
345 |
description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
346 |
2.2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
347 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
348 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
349 |
changeset: 1:b1aa5cde7ff4 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
350 |
user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
351 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
352 |
files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
353 |
description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
354 |
2 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
355 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
356 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
357 |
changeset: 0:fcf06d5c4e1d |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
358 |
user: test |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
359 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
360 |
files: f |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
361 |
description: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
362 |
1 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
363 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
364 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
365 |
$ echo |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
366 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
367 |
$ rm .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
368 |
$ (echo some; echo text) > f3 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
369 |
$ 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
|
370 |
$ hg add f3 f4.bat |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
371 |
$ hg ci -m 6 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
372 |
$ python print.py < bin |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
373 |
hello<NUL><CR><LF> |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
374 |
$ python print.py < f3 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
375 |
some<LF>text<LF> |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
376 |
$ python print.py < f4.bat |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
377 |
rem empty<CR><LF> |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
378 |
$ echo |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
379 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
380 |
$ echo '[extensions]' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
381 |
$ echo 'win32text = ' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
382 |
$ echo '[decode]' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
383 |
$ echo '** = cleverdecode:' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
384 |
$ echo '[encode]' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
385 |
$ echo '** = cleverencode:' >> .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
386 |
$ cat .hg/hgrc |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
387 |
[extensions] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
388 |
win32text = |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
389 |
[decode] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
390 |
** = cleverdecode: |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
391 |
[encode] |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
392 |
** = cleverencode: |
12843
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
393 |
|
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
394 |
Trigger deprecation warning: |
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
395 |
|
12853
13984e96cb09
test-win32text.t: stabilize test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12843
diff
changeset
|
396 |
$ hg id -t |
12843
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
397 |
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
|
398 |
tip |
12843
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
399 |
|
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
400 |
Disable warning: |
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
401 |
|
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
402 |
$ echo '[win32text]' >> .hg/hgrc |
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
403 |
$ echo 'warn = no' >> .hg/hgrc |
12853
13984e96cb09
test-win32text.t: stabilize test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12843
diff
changeset
|
404 |
$ hg id -t |
13984e96cb09
test-win32text.t: stabilize test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12843
diff
changeset
|
405 |
tip |
12843
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12494
diff
changeset
|
406 |
|
12494
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
407 |
$ rm f3 f4.bat bin |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
408 |
$ hg co -C 2>&1 | python -c 'import sys, os; sys.stdout.write(sys.stdin.read().replace(os.getcwd(), "...."))' |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
409 |
WARNING: f4.bat already has CRLF line endings |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
410 |
and does not need EOL conversion by the win32text plugin. |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
411 |
Before your next commit, please reconsider your encode/decode settings in |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
412 |
Mercurial.ini or ..../.hg/hgrc. |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
413 |
3 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
|
414 |
$ python print.py < bin |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
415 |
hello<NUL><CR><LF> |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
416 |
$ python print.py < f3 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
417 |
some<CR><LF>text<CR><LF> |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
418 |
$ python print.py < f4.bat |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
419 |
rem empty<CR><LF> |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
420 |
$ echo |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
421 |
|
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
422 |
$ python -c 'file("f5.sh", "wb").write("# empty\x0D\x0A")' |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
423 |
$ hg add f5.sh |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
424 |
$ hg ci -m 7 |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
425 |
$ python print.py < f5.sh |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
426 |
# empty<CR><LF> |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
427 |
$ hg cat f5.sh | python print.py |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
428 |
# empty<LF> |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
429 |
$ echo '% just linefeed' > linefeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
430 |
$ hg ci -qAm 8 linefeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
431 |
$ python print.py < linefeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
432 |
% just linefeed<LF> |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
433 |
$ hg cat linefeed | python print.py |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
434 |
% just linefeed<LF> |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
435 |
$ hg st -q |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
436 |
$ hg revert -a linefeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
437 |
no changes needed to linefeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
438 |
$ python print.py < linefeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
439 |
% just linefeed<LF> |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
440 |
$ hg st -q |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
441 |
$ echo modified >> linefeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
442 |
$ hg st -q |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
443 |
M linefeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
444 |
$ hg revert -a |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
445 |
reverting linefeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
446 |
$ hg st -q |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
447 |
$ python print.py < linefeed |
f18fd371ecbd
tests: unify test-win32text
Matt Mackall <mpm@selenic.com>
parents:
8759
diff
changeset
|
448 |
% just linefeed<CR><LF> |