[PATCH] convert: normalize paths in convert (issue3612)

[Huayang Guo]

# HG changeset patch
# User Huayang <huayang at fb.com>
# Date 1349479654 25200
# Node ID 11816516e399001b058542827edeaf225327ec95
# Parent  fa714f3ed2989aff64c267c9935251d9fc4f31ee
convert: normalize paths in convert (issue3612)

convert doesn't normalise double slashes in paths. Path normalizatin
is applied when a path is loaded into filemap and when a file lookup
request is isseud to filemap.

diff -r fa714f3ed298 -r 11816516e399 hgext/convert/filemap.py
--- a/hgext/convert/filemap.py	Mon Oct 01 23:05:02 2012 -0500
+++ b/hgext/convert/filemap.py	Fri Oct 05 16:27:34 2012 -0700
@@ -4,6 +4,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
+import os
 import shlex
 from mercurial.i18n import _
 from mercurial import util
@@ -16,6 +17,9 @@
         e = name.rfind('/', 0, e)
     yield '.', name
 
+def normalize(path):
+    return os.path.normpath(path)
+
 class filemapper(object):
     '''Map and filter filenames when importing.
     A name can be mapped to itself, a new name, or None (omit from new
@@ -53,21 +57,21 @@
         cmd = lex.get_token()
         while cmd:
             if cmd == 'include':
-                name = lex.get_token()
+                name = normalize(lex.get_token())
                 errs += check(name, self.exclude, 'exclude')
                 self.include[name] = name
             elif cmd == 'exclude':
-                name = lex.get_token()
+                name = normalize(lex.get_token())
                 errs += check(name, self.include, 'include')
                 errs += check(name, self.rename, 'rename')
                 self.exclude[name] = name
             elif cmd == 'rename':
-                src = lex.get_token()
-                dest = lex.get_token()
+                src = normalize(lex.get_token())
+                dest = normalize(lex.get_token())
                 errs += check(src, self.exclude, 'exclude')
                 self.rename[src] = dest
             elif cmd == 'source':
-                errs += self.parse(lex.get_token())
+                errs += self.parse(normalize(lex.get_token()))
             else:
                 self.ui.warn(_('%s:%d: unknown directive %r\n') %
                              (lex.infile, lex.lineno, cmd))
@@ -76,6 +80,7 @@
         return errs
 
     def lookup(self, name, mapping):
+        name = normalize(name)
         for pre, suf in rpairs(name):
             try:
                 return mapping[pre], pre, suf