--- 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():