win32text: lowercase warning message

hgext/win32text.py

@@ -1,172 +1,172 b''
 # win32text.py - LF <-> CRLF/CR translation utilities for Windows/Mac users
 #
 #  Copyright 2005, 2007-2009 Matt Mackall <[e-mail]> and others
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 '''perform automatic newline conversion
 
   Deprecation: The win32text extension requires each user to configure
   the extension again and again for each clone since the configuration
   is not copied when cloning.
 
   We have therefore made the ``eol`` as an alternative. The ``eol``
   uses a version controlled file for its configuration and each clone
   will therefore use the right settings from the start.
 
 To perform automatic newline conversion, use::
 
   [extensions]
   win32text =
   [encode]
   ** = cleverencode:
   # or ** = macencode:
 
   [decode]
   ** = cleverdecode:
   # or ** = macdecode:
 
 If not doing conversion, to make sure you do not commit CRLF/CR by accident::
 
   [hooks]
   pretxncommit.crlf = python:hgext.win32text.forbidcrlf
   # or pretxncommit.cr = python:hgext.win32text.forbidcr
 
 To do the same check on a server to prevent CRLF/CR from being
 pushed or pulled::
 
   [hooks]
   pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
   # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr
 '''
 
 from mercurial.i18n import _
 from mercurial.node import short
 from mercurial import util
 import re
 
 testedwith = 'internal'
 
 # regexp for single LF without CR preceding.
 re_single_lf = re.compile('(^|[^\r])\n', re.MULTILINE)
 
 newlinestr = {'\r\n': 'CRLF', '\r': 'CR'}
 filterstr = {'\r\n': 'clever', '\r': 'mac'}
 
 def checknewline(s, newline, ui=None, repo=None, filename=None):
     # warn if already has 'newline' in repository.
     # it might cause unexpected eol conversion.
     # see issue 302:
     #   http://mercurial.selenic.com/bts/issue302
     if newline in s and ui and filename and repo:
         ui.warn(_('WARNING: %s already has %s line endings\n'
                   'and does not need EOL conversion by the win32text plugin.\n'
                   'Before your next commit, please reconsider your '
                   'encode/decode settings in \nMercurial.ini or %s.\n') %
                 (filename, newlinestr[newline], repo.join('hgrc')))
 
 def dumbdecode(s, cmd, **kwargs):
     checknewline(s, '\r\n', **kwargs)
     # replace single LF to CRLF
     return re_single_lf.sub('\\1\r\n', s)
 
 def dumbencode(s, cmd):
     return s.replace('\r\n', '\n')
 
 def macdumbdecode(s, cmd, **kwargs):
     checknewline(s, '\r', **kwargs)
     return s.replace('\n', '\r')
 
 def macdumbencode(s, cmd):
     return s.replace('\r', '\n')
 
 def cleverdecode(s, cmd, **kwargs):
     if not util.binary(s):
         return dumbdecode(s, cmd, **kwargs)
     return s
 
 def cleverencode(s, cmd):
     if not util.binary(s):
         return dumbencode(s, cmd)
     return s
 
 def macdecode(s, cmd, **kwargs):
     if not util.binary(s):
         return macdumbdecode(s, cmd, **kwargs)
     return s
 
 def macencode(s, cmd):
     if not util.binary(s):
         return macdumbencode(s, cmd)
     return s
 
 _filters = {
     'dumbdecode:': dumbdecode,
     'dumbencode:': dumbencode,
     'cleverdecode:': cleverdecode,
     'cleverencode:': cleverencode,
     'macdumbdecode:': macdumbdecode,
     'macdumbencode:': macdumbencode,
     'macdecode:': macdecode,
     'macencode:': macencode,
     }
 
 def forbidnewline(ui, repo, hooktype, node, newline, **kwargs):
     halt = False
     seen = set()
     # we try to walk changesets in reverse order from newest to
     # oldest, so that if we see a file multiple times, we take the
     # newest version as canonical. this prevents us from blocking a
     # changegroup that contains an unacceptable commit followed later
     # by a commit that fixes the problem.
     tip = repo['tip']
     for rev in xrange(len(repo)-1, repo[node].rev()-1, -1):
         c = repo[rev]
         for f in c.files():
             if f in seen or f not in tip or f not in c:
                 continue
             seen.add(f)
             data = c[f].data()
             if not util.binary(data) and newline in data:
                 if not halt:
-                    ui.warn(_('Attempt to commit or push text file(s) '
+                    ui.warn(_('attempt to commit or push text file(s) '
                               'using %s line endings\n') %
                               newlinestr[newline])
                 ui.warn(_('in %s: %s\n') % (short(c.node()), f))
                 halt = True
     if halt and hooktype == 'pretxnchangegroup':
         crlf = newlinestr[newline].lower()
         filter = filterstr[newline]
         ui.warn(_('\nTo prevent this mistake in your local repository,\n'
                   'add to Mercurial.ini or .hg/hgrc:\n'
                   '\n'
                   '[hooks]\n'
                   'pretxncommit.%s = python:hgext.win32text.forbid%s\n'
                   '\n'
                   'and also consider adding:\n'
                   '\n'
                   '[extensions]\n'
                   'win32text =\n'
                   '[encode]\n'
                   '** = %sencode:\n'
                   '[decode]\n'
                   '** = %sdecode:\n') % (crlf, crlf, filter, filter))
     return halt
 
 def forbidcrlf(ui, repo, hooktype, node, **kwargs):
     return forbidnewline(ui, repo, hooktype, node, '\r\n', **kwargs)
 
 def forbidcr(ui, repo, hooktype, node, **kwargs):
     return forbidnewline(ui, repo, hooktype, node, '\r', **kwargs)
 
 def reposetup(ui, repo):
     if not repo.local():
         return
     for name, fn in _filters.iteritems():
         repo.adddatafilter(name, fn)
 
 def extsetup(ui):
     if ui.configbool('win32text', 'warn', True):
         ui.warn(_("win32text is deprecated: "
                   "http://mercurial.selenic.com/wiki/Win32TextExtension\n"))

tests/test-mactext.t

@@ -1,38 +1,38 b''
 
   $ cat > unix2mac.py <<EOF
   > import sys
   > 
   > for path in sys.argv[1:]:
   >     data = file(path, 'rb').read()
   >     data = data.replace('\n', '\r')
   >     file(path, 'wb').write(data)
   > EOF
   $ cat > print.py <<EOF
   > import sys
   > print(sys.stdin.read().replace('\n', '<LF>').replace('\r', '<CR>').replace('\0', '<NUL>'))
   > EOF
   $ hg init
   $ echo '[hooks]' >> .hg/hgrc
   $ echo 'pretxncommit.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc
   $ echo 'pretxnchangegroup.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc
   $ cat .hg/hgrc
   [hooks]
   pretxncommit.cr = python:hgext.win32text.forbidcr
   pretxnchangegroup.cr = python:hgext.win32text.forbidcr
 
   $ echo hello > f
   $ hg add f
   $ hg ci -m 1
 
   $ python unix2mac.py f
   $ hg ci -m 2
-  Attempt to commit or push text file(s) using CR line endings
+  attempt to commit or push text file(s) using CR line endings
   in dea860dc51ec: f
   transaction abort!
   rollback completed
   abort: pretxncommit.cr hook failed
   [255]
   $ hg cat f | python print.py
   hello<LF>
   $ cat f | python print.py
   hello<CR>

tests/test-win32text.t

@@ -1,426 +1,426 b''
 
   $ hg init t
   $ cd t
   $ cat > unix2dos.py <<EOF
   > import sys
   > 
   > for path in sys.argv[1:]:
   >     data = file(path, 'rb').read()
   >     data = data.replace('\n', '\r\n')
   >     file(path, 'wb').write(data)
   > EOF
   $ echo '[hooks]' >> .hg/hgrc
   $ echo 'pretxncommit.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc
   $ echo 'pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc
   $ cat .hg/hgrc
   [hooks]
   pretxncommit.crlf = python:hgext.win32text.forbidcrlf
   pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
 
   $ echo hello > f
   $ hg add f
 
 commit should succeed
 
   $ hg ci -m 1
 
   $ hg clone . ../zoz
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cp .hg/hgrc ../zoz/.hg
   $ python unix2dos.py f
 
 commit should fail
 
   $ hg ci -m 2.1
-  Attempt to commit or push text file(s) using CRLF line endings
+  attempt to commit or push text file(s) using CRLF line endings
   in f583ea08d42a: f
   transaction abort!
   rollback completed
   abort: pretxncommit.crlf hook failed
   [255]
 
   $ mv .hg/hgrc .hg/hgrc.bak
 
 commits should succeed
 
   $ hg ci -m 2
   $ hg cp f g
   $ hg ci -m 2.2
 
 push should fail
 
   $ hg push ../zoz
   pushing to ../zoz
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  Attempt to commit or push text file(s) using CRLF line endings
+  attempt to commit or push text file(s) using CRLF line endings
   in bc2d09796734: g
   in b1aa5cde7ff4: f
   
   To prevent this mistake in your local repository,
   add to Mercurial.ini or .hg/hgrc:
   
   [hooks]
   pretxncommit.crlf = python:hgext.win32text.forbidcrlf
   
   and also consider adding:
   
   [extensions]
   win32text =
   [encode]
   ** = cleverencode:
   [decode]
   ** = cleverdecode:
   transaction abort!
   rollback completed
   abort: pretxnchangegroup.crlf hook failed
   [255]
 
   $ mv .hg/hgrc.bak .hg/hgrc
   $ echo hello > f
   $ hg rm g
 
 commit should succeed
 
   $ hg ci -m 2.3
 
 push should succeed
 
   $ hg push ../zoz
   pushing to ../zoz
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 2 files
 
 and now for something completely different
 
   $ mkdir d
   $ echo hello > d/f2
   $ python unix2dos.py d/f2
   $ hg add d/f2
   $ hg ci -m 3
-  Attempt to commit or push text file(s) using CRLF line endings
+  attempt to commit or push text file(s) using CRLF line endings
   in 053ba1a3035a: d/f2
   transaction abort!
   rollback completed
   abort: pretxncommit.crlf hook failed
   [255]
   $ hg revert -a
   forgetting d/f2 (glob)
   $ rm d/f2
 
   $ hg rem f
   $ hg ci -m 4
 
   $ python -c 'file("bin", "wb").write("hello\x00\x0D\x0A")'
   $ hg add bin
   $ hg ci -m 5
   $ hg log -v
   changeset:   5:f0b1c8d75fce
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       bin
   description:
   5
   
   
   changeset:   4:77796dbcd4ad
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   4
   
   
   changeset:   3:7c1b5430b350
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f g
   description:
   2.3
   
   
   changeset:   2:bc2d09796734
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       g
   description:
   2.2
   
   
   changeset:   1:b1aa5cde7ff4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   2
   
   
   changeset:   0:fcf06d5c4e1d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   1
   
   
   $ hg clone . dupe
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ for x in a b c d; do echo content > dupe/$x; done
   $ hg -R dupe add
   adding dupe/a (glob)
   adding dupe/b (glob)
   adding dupe/c (glob)
   adding dupe/d (glob)
   $ python unix2dos.py dupe/b dupe/c dupe/d
   $ hg -R dupe ci -m a dupe/a
   $ hg -R dupe ci -m b/c dupe/[bc]
   $ hg -R dupe ci -m d dupe/d
   $ hg -R dupe log -v
   changeset:   8:67ac5962ab43
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       d
   description:
   d
   
   
   changeset:   7:68c127d1834e
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       b c
   description:
   b/c
   
   
   changeset:   6:adbf8bf7f31d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       a
   description:
   a
   
   
   changeset:   5:f0b1c8d75fce
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       bin
   description:
   5
   
   
   changeset:   4:77796dbcd4ad
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   4
   
   
   changeset:   3:7c1b5430b350
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f g
   description:
   2.3
   
   
   changeset:   2:bc2d09796734
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       g
   description:
   2.2
   
   
   changeset:   1:b1aa5cde7ff4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   2
   
   
   changeset:   0:fcf06d5c4e1d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   1
   
   
   $ hg pull dupe
   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 CRLF line endings
+  attempt to commit or push text file(s) using CRLF line endings
   in 67ac5962ab43: d
   in 68c127d1834e: b
   in 68c127d1834e: c
   
   To prevent this mistake in your local repository,
   add to Mercurial.ini or .hg/hgrc:
   
   [hooks]
   pretxncommit.crlf = python:hgext.win32text.forbidcrlf
   
   and also consider adding:
   
   [extensions]
   win32text =
   [encode]
   ** = cleverencode:
   [decode]
   ** = cleverdecode:
   transaction abort!
   rollback completed
   abort: pretxnchangegroup.crlf hook failed
   [255]
 
   $ hg log -v
   changeset:   5:f0b1c8d75fce
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       bin
   description:
   5
   
   
   changeset:   4:77796dbcd4ad
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   4
   
   
   changeset:   3:7c1b5430b350
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f g
   description:
   2.3
   
   
   changeset:   2:bc2d09796734
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       g
   description:
   2.2
   
   
   changeset:   1:b1aa5cde7ff4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   2
   
   
   changeset:   0:fcf06d5c4e1d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       f
   description:
   1
   
   
   $ rm .hg/hgrc
   $ (echo some; echo text) > f3
   $ python -c 'file("f4.bat", "wb").write("rem empty\x0D\x0A")'
   $ hg add f3 f4.bat
   $ hg ci -m 6
   $ cat bin
   hello\x00\r (esc)
   $ cat f3
   some
   text
   $ cat f4.bat
   rem empty\r (esc)
 
   $ echo '[extensions]' >> .hg/hgrc
   $ echo 'win32text = ' >> .hg/hgrc
   $ echo '[decode]' >> .hg/hgrc
   $ echo '** = cleverdecode:' >> .hg/hgrc
   $ echo '[encode]' >> .hg/hgrc
   $ echo '** = cleverencode:' >> .hg/hgrc
   $ cat .hg/hgrc
   [extensions]
   win32text = 
   [decode]
   ** = cleverdecode:
   [encode]
   ** = cleverencode:
 
 Trigger deprecation warning:
 
   $ hg id -t
   win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension
   tip
 
 Disable warning:
 
   $ echo '[win32text]' >> .hg/hgrc
   $ echo 'warn = no' >> .hg/hgrc
   $ hg id -t
   tip
 
   $ rm f3 f4.bat bin
   $ hg co -C
   WARNING: f4.bat already has CRLF 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 $TESTTMP/t/.hg/hgrc. (glob)
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat bin
   hello\x00\r (esc)
   $ cat f3
   some\r (esc)
   text\r (esc)
   $ cat f4.bat
   rem empty\r (esc)
 
   $ python -c 'file("f5.sh", "wb").write("# empty\x0D\x0A")'
   $ hg add f5.sh
   $ hg ci -m 7
   $ cat f5.sh
   # empty\r (esc)
   $ hg cat f5.sh
   # empty
   $ echo '% just linefeed' > linefeed
   $ hg ci -qAm 8 linefeed
   $ cat linefeed
   % just linefeed
   $ hg cat linefeed
   % just linefeed
   $ hg st -q
   $ hg revert -a linefeed
   no changes needed to linefeed
   $ cat linefeed
   % just linefeed
   $ hg st -q
   $ echo modified >> linefeed
   $ hg st -q
   M linefeed
   $ hg revert -a
   reverting linefeed
   $ hg st -q
   $ cat linefeed
   % just linefeed\r (esc)
 
   $ cd ..