Redo c655432c2c24 (issue1860)
authorMads Kiilerich <mads@kiilerich.com>
Fri, 16 Oct 2009 11:16:42 +0200
changeset 9600 1e1809d7c35a
parent 9463 bd017f359c08 (diff)
parent 9462 1f54b1b7122f (current diff)
child 9601 11ace5726d02
Redo c655432c2c24 (issue1860)
--- a/hgext/win32mbcs.py	Thu Sep 10 23:15:37 2009 +0200
+++ b/hgext/win32mbcs.py	Fri Oct 16 11:16:42 2009 +0200
@@ -123,7 +123,7 @@
 funcs = '''os.path.join os.path.split os.path.splitext
  os.path.splitunc os.path.normpath os.path.normcase os.makedirs
  mercurial.util.endswithsep mercurial.util.splitpath mercurial.util.checkcase
- mercurial.util.fspath mercurial.util.pconvert'''
+ mercurial.util.fspath mercurial.util.pconvert mercurial.util.normpath'''
 
 # codec and alias names of sjis and big5 to be faked.
 problematic_encodings = '''big5 big5-tw csbig5 big5hkscs big5-hkscs
--- a/mercurial/demandimport.py	Thu Sep 10 23:15:37 2009 +0200
+++ b/mercurial/demandimport.py	Fri Oct 16 11:16:42 2009 +0200
@@ -127,6 +127,8 @@
     # imported by profile, itself imported by hotshot.stats,
     # not available under Windows
     'resource',
+    # this trips up many extension authors
+    'gtk',
     ]
 
 def enable():