view tests/test-mactext.out @ 6481:e837dded56c7

win32text: Add macencode/macdecode
author OHASHI Hideya <ohachige@gmail.com>
date Thu, 03 Apr 2008 20:41:31 +0900
parents
children 529d7887ecfe
line wrap: on
line source

[hooks]
pretxncommit.cr = python:hgext.win32text.forbidcr
pretxnchangegroup.cr = python:hgext.win32text.forbidcr


Attempt to commit or push text file(s) using CR line endings
in dea860dc51ec: f
transaction abort!
rollback completed
abort: pretxncommit.cr hook failed
reverting f

Attempt to commit or push text file(s) using CR line endings
in 8aa1d87b4e2f: d/f2
transaction abort!
rollback completed
abort: pretxncommit.cr hook failed
forgetting d/f2


changeset:   2:d7599e43717c
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
files:       bin
description:
5


changeset:   1:c72a7d1d0907
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
files:       f
description:
4


changeset:   0:fcf06d5c4e1d
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
files:       f
description:
1



updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

adding dupe/a
adding dupe/b
adding dupe/c
adding dupe/d
changeset:   5:ebbcbe52b20e
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
files:       d
description:
d


changeset:   4:ceeb93d6508a
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
files:       b c
description:
b/c


changeset:   3:c5404edbb872
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
files:       a
description:
a


changeset:   2:d7599e43717c
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
files:       bin
description:
5


changeset:   1:c72a7d1d0907
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
files:       f
description:
4


changeset:   0:fcf06d5c4e1d
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
files:       f
description:
1



pulling from dupe
searching for changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 4 changes to 4 files
Attempt to commit or push text file(s) using CR line endings
in ceeb93d6508a: b
in ceeb93d6508a: c
in ebbcbe52b20e: d

To prevent this mistake in your local repository,
add to Mercurial.ini or .hg/hgrc:

[hooks]
pretxncommit.cr = python:hgext.win32text.forbidcr

and also consider adding:

[extensions]
hgext.win32text =
[encode]
** = macencode:
[decode]
** = macdecode:
transaction abort!
rollback completed
abort: pretxnchangegroup.cr hook failed

changeset:   2:d7599e43717c
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
files:       bin
description:
5


changeset:   1:c72a7d1d0907
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
files:       f
description:
4


changeset:   0:fcf06d5c4e1d
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
files:       f
description:
1



hello<NUL><CR>
some<LF>text<LF>
rem empty<CR>

[extensions]
win32text = 
[decode]
** = macdecode:
[encode]
** = macencode:

WARNING: f4.bat already has CR line endings
and does not need EOL conversion by the win32text plugin.
Before your next commit, please reconsider your encode/decode settings in 
Mercurial.ini or ..../.hg/hgrc.
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
hello<NUL><CR>
some<CR>text<CR>
rem empty<CR>

# empty<CR>
# empty<LF>
% just linefeed<LF>
% just linefeed<LF>
no changes needed to linefeed
% just linefeed<LF>
M linefeed
reverting linefeed
% just linefeed<CR>