diff mercurial/scmutil.py @ 13974:23f2736abce3

move checkfilename from util to scmutil checkfilename is specific to Mercurial, since it contains the knowledege that Mercurial can't track files with \n or \r in the name.
author Adrian Buehlmann <adrian@cadifra.com>
date Thu, 21 Apr 2011 13:18:52 +0200
parents 366fa83f9820
children 938fbeacac84
line wrap: on
line diff
--- a/mercurial/scmutil.py	Thu Apr 21 12:10:03 2011 +0200
+++ b/mercurial/scmutil.py	Thu Apr 21 13:18:52 2011 +0200
@@ -9,9 +9,14 @@
 import util, error
 import os, errno, stat
 
+def checkfilename(f):
+    '''Check that the filename f is an acceptable filename for a tracked file'''
+    if '\r' in f or '\n' in f:
+        raise util.Abort(_("'\\n' and '\\r' disallowed in filenames: %r") % f)
+
 def checkportable(ui, f):
     '''Check if filename f is portable and warn or abort depending on config'''
-    util.checkfilename(f)
+    checkfilename(f)
     val = ui.config('ui', 'portablefilenames', 'warn')
     lval = val.lower()
     abort = os.name == 'nt' or lval == 'abort'