Mercurial > public > mercurial-scm > hg
annotate tests/test-mactext.t @ 31257:11831d755b51
merge: remove uses of manifest.matches
This gets rid of the manifest.matches calls in merge.py in favor of the new api.
This is part of getting rid of manifest.matches since it is O(manifest).
| author | Durham Goode <durham@fb.com> |
|---|---|
| date | Tue, 07 Mar 2017 18:38:20 -0800 |
| parents | 7985a9e2ddce |
| children | 75be14993fda |
| rev | line source |
|---|---|
|
6481
e837dded56c7
win32text: Add macencode/macdecode
OHASHI Hideya <ohachige@gmail.com>
parents:
diff
changeset
|
1 |
| 12458 | 2 $ cat > unix2mac.py <<EOF |
| 3 > import sys | |
| 4 > | |
| 5 > for path in sys.argv[1:]: | |
| 6 > data = file(path, 'rb').read() | |
| 7 > data = data.replace('\n', '\r') | |
| 8 > file(path, 'wb').write(data) | |
| 9 > EOF | |
| 10 $ cat > print.py <<EOF | |
| 11 > import sys | |
| 12 > print(sys.stdin.read().replace('\n', '<LF>').replace('\r', '<CR>').replace('\0', '<NUL>')) | |
| 13 > EOF | |
| 14 $ hg init | |
| 15 $ echo '[hooks]' >> .hg/hgrc | |
| 16 $ echo 'pretxncommit.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc | |
| 17 $ echo 'pretxnchangegroup.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc | |
| 18 $ cat .hg/hgrc | |
| 19 [hooks] | |
| 20 pretxncommit.cr = python:hgext.win32text.forbidcr | |
| 21 pretxnchangegroup.cr = python:hgext.win32text.forbidcr | |
|
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
12458
diff
changeset
|
22 |
| 12458 | 23 $ echo hello > f |
| 24 $ hg add f | |
| 25 $ hg ci -m 1 | |
|
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
12458
diff
changeset
|
26 |
| 12458 | 27 $ python unix2mac.py f |
| 28 $ hg ci -m 2 | |
|
16932
7985a9e2ddce
win32text: lowercase warning message
Martin Geisler <mg@aragost.com>
parents:
15243
diff
changeset
|
29 attempt to commit or push text file(s) using CR line endings |
| 12458 | 30 in dea860dc51ec: f |
| 31 transaction abort! | |
| 32 rollback completed | |
| 33 abort: pretxncommit.cr hook failed | |
| 34 [255] | |
| 35 $ hg cat f | python print.py | |
| 36 hello<LF> | |
| 37 $ cat f | python print.py | |
| 38 hello<CR> |