# HG changeset patch # User mpm@selenic.com # Date 1119682694 28800 # Node ID 9ae0034f2772be63c24b511202aa8af49486304d # Parent 6409d9a0df43abaa69c34b35d460b89407cf2f64 [PATCH] /dev/null for other OS -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] /dev/null for other OS From: K Thananchayan Null device name is platform dependent. Introduce util.nulldev - - platform dependent constant and use it instead of '/dev/null' manifest hash: 95a1bfdb712c53ef97aaff73f7f4c87e9299cf59 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQCGywK+sNU5EO8RAiRBAKCcXasCCFT2+6wgklkgqIt4l3UwugCeKWii h/8iRYEw8Rp8B67abiFiwyY= =L3Mk -----END PGP SIGNATURE----- diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -413,7 +413,6 @@ def import_(ui, repo, patch1, *patches, d = opts["base"] strip = opts["strip"] - quiet = ui.quiet and "> /dev/null" or "" for patch in patches: ui.status("applying %s\n" % patch) diff --git a/mercurial/util.py b/mercurial/util.py --- a/mercurial/util.py +++ b/mercurial/util.py @@ -16,6 +16,8 @@ def rename(src, dst): # Platfor specific varients if os.name == 'nt': + nulldev = 'NUL:' + def is_exec(f, last): return last @@ -32,7 +34,10 @@ if os.name == 'nt': def readlock(pathname): return file(pathname).read() + else: + nulldev = '/dev/null' + def is_exec(f, last): return (os.stat(f).st_mode & 0100 != 0) @@ -57,5 +62,3 @@ else: def readlock(pathname): return os.readlink(pathname) - - diff --git a/mercurial/version.py b/mercurial/version.py --- a/mercurial/version.py +++ b/mercurial/version.py @@ -13,6 +13,7 @@ import os import os.path import re import time +import util unknown_version = 'unknown' remembered_version = False @@ -37,7 +38,7 @@ def remember_version(version=None): """Store version information.""" global remembered_version if not version and os.path.isdir(".hg"): - f = os.popen("hg identify 2>/dev/null") # use real hg installation + f = os.popen("hg identify 2> %s" % util.nulldev) # use real hg installation ident = f.read()[:-1] if not f.close() and ident: ids = ident.split(' ', 1)