Mercurial > hg > mercurial-crew-with-dirclash
changeset 3906:1063a631cb8e
merge with crew-stable
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Sat, 16 Dec 2006 02:51:16 -0200 |
| parents | f9136599700f (current diff) a8c0365b2ace (diff) |
| children | dd86f99e3c02 |
| files | mercurial/templater.py mercurial/util.py |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/templater.py +++ b/mercurial/templater.py @@ -203,7 +203,7 @@ def nl2br(text): return text.replace('\n', '<br/>\n') def obfuscate(text): - text = unicode(text, 'utf-8', 'replace') + text = unicode(text, util._encoding, 'replace') return ''.join(['&#%d;' % ord(c) for c in text]) def domain(author):
--- a/mercurial/util.py +++ b/mercurial/util.py @@ -500,6 +500,9 @@ def system(cmd, environ={}, cwd=None, on oldenv[k] = os.environ.get(k) if cwd is not None: oldcwd = os.getcwd() + origcmd = cmd + if os.name == 'nt': + cmd = '"%s"' % cmd try: for k, v in environ.iteritems(): os.environ[k] = py2shell(v) @@ -507,7 +510,7 @@ def system(cmd, environ={}, cwd=None, on os.chdir(cwd) rc = os.system(cmd) if rc and onerr: - errmsg = '%s %s' % (os.path.basename(cmd.split(None, 1)[0]), + errmsg = '%s %s' % (os.path.basename(origcmd.split(None, 1)[0]), explain_exit(rc)[0]) if errprefix: errmsg = '%s: %s' % (errprefix, errmsg)