--- a/contrib/wix/dist.wxs Sat Aug 04 20:20:48 2012 +0200
+++ b/contrib/wix/dist.wxs Fri Aug 24 17:51:47 2012 -0500
@@ -15,7 +15,7 @@
<File Name="mercurial.osutil.pyd" />
<File Name="mercurial.parsers.pyd" />
<File Name="pyexpat.pyd" />
- <File Name="python26.dll" />
+ <File Name="python27.dll" />
<File Name="bz2.pyd" />
<File Name="select.pyd" />
<File Name="unicodedata.pyd" />
--- a/hgext/convert/common.py Sat Aug 04 20:20:48 2012 +0200
+++ b/hgext/convert/common.py Fri Aug 24 17:51:47 2012 -0500
@@ -276,9 +276,9 @@
pass
cmdline = [util.shellquote(arg) for arg in cmdline]
if not self.ui.debugflag:
- cmdline += ['2>', util.nulldev]
+ cmdline += ['2>', os.devnull]
if closestdin:
- cmdline += ['<', util.nulldev]
+ cmdline += ['<', os.devnull]
cmdline = ' '.join(cmdline)
return cmdline
--- a/hgext/convert/gnuarch.py Sat Aug 04 20:20:48 2012 +0200
+++ b/hgext/convert/gnuarch.py Fri Aug 24 17:51:47 2012 -0500
@@ -184,7 +184,7 @@
cmdline = [self.execmd, cmd]
cmdline += args
cmdline = [util.shellquote(arg) for arg in cmdline]
- cmdline += ['>', util.nulldev, '2>', util.nulldev]
+ cmdline += ['>', os.devnull, '2>', os.devnull]
cmdline = util.quotecommand(' '.join(cmdline))
self.ui.debug(cmdline, '\n')
return os.system(cmdline)
--- a/mercurial/cmdutil.py Sat Aug 04 20:20:48 2012 +0200
+++ b/mercurial/cmdutil.py Fri Aug 24 17:51:47 2012 -0500
@@ -515,7 +515,7 @@
sys.stdout.flush()
sys.stderr.flush()
- nullfd = os.open(util.nulldev, os.O_RDWR)
+ nullfd = os.open(os.devnull, os.O_RDWR)
logfilefd = nullfd
if logfile:
logfilefd = os.open(logfile, os.O_RDWR | os.O_CREAT | os.O_APPEND)
--- a/mercurial/commands.py Sat Aug 04 20:20:48 2012 +0200
+++ b/mercurial/commands.py Fri Aug 24 17:51:47 2012 -0500
@@ -1998,6 +1998,10 @@
ui.write(_(" (check that your locale is properly set)\n"))
problems += 1
+ # Python lib
+ ui.status(_("checking Python lib (%s)...\n")
+ % os.path.dirname(os.__file__))
+
# compiled modules
ui.status(_("checking installed modules (%s)...\n")
% os.path.dirname(__file__))
--- a/mercurial/posix.py Sat Aug 04 20:20:48 2012 +0200
+++ b/mercurial/posix.py Fri Aug 24 17:51:47 2012 -0500
@@ -10,7 +10,6 @@
import os, sys, errno, stat, getpass, pwd, grp, tempfile, unicodedata
posixfile = open
-nulldev = '/dev/null'
normpath = os.path.normpath
samestat = os.path.samestat
oslink = os.link
--- a/mercurial/util.py Sat Aug 04 20:20:48 2012 +0200
+++ b/mercurial/util.py Fri Aug 24 17:51:47 2012 -0500
@@ -45,7 +45,6 @@
nlinks = platform.nlinks
normpath = platform.normpath
normcase = platform.normcase
-nulldev = platform.nulldev
openhardlinks = platform.openhardlinks
oslink = platform.oslink
parsepatchoutput = platform.parsepatchoutput
--- a/mercurial/windows.py Sat Aug 04 20:20:48 2012 +0200
+++ b/mercurial/windows.py Fri Aug 24 17:51:47 2012 -0500
@@ -24,7 +24,6 @@
testpid = win32.testpid
unlink = win32.unlink
-nulldev = 'NUL:'
umask = 0022
# wrap osutil.posixfile to provide friendlier exceptions
@@ -174,7 +173,7 @@
# Work around "popen spawned process may not write to stdout
# under windows"
# http://bugs.python.org/issue1366
- command += " 2> %s" % nulldev
+ command += " 2> %s" % os.devnull
return os.popen(quotecommand(command), mode)
def explainexit(code):
--- a/tests/test-install.t Sat Aug 04 20:20:48 2012 +0200
+++ b/tests/test-install.t Fri Aug 24 17:51:47 2012 -0500
@@ -1,6 +1,7 @@
hg debuginstall
$ hg debuginstall
checking encoding (ascii)...
+ checking Python lib (*lib*)... (glob)
checking installed modules (*mercurial)... (glob)
checking templates (*mercurial?templates)... (glob)
checking commit editor...
@@ -10,6 +11,7 @@
hg debuginstall with no username
$ HGUSER= hg debuginstall
checking encoding (ascii)...
+ checking Python lib (*lib*)... (glob)
checking installed modules (*mercurial)... (glob)
checking templates (*mercurial?templates)... (glob)
checking commit editor...