[PATCH 1 of 1] fix issue 1625: incorrect path separator and ui.slash setting handling on Windows
Alejandro Santos
alejolp at alejolp.com
Wed Apr 29 15:59:56 CDT 2009
# HG changeset patch
# User Alejandro Santos <alejolp at alejolp.com>
# Date 1241038456 10800
# Node ID 4e9884bcf947d76375298ac018ca319f7a2e8b3a
# Parent 344751cd8cb88bac208d630f4825068a3170c92f
fix issue 1625: incorrect path separator and ui.slash setting handling on Windows
diff -r 344751cd8cb8 -r 4e9884bcf947 mercurial/commands.py
--- a/mercurial/commands.py Sun Apr 26 16:50:44 2009 -0500
+++ b/mercurial/commands.py Wed Apr 29 17:54:16 2009 -0300
@@ -1853,6 +1853,9 @@
end = opts.get('print0') and '\0' or '\n'
rev = opts.get('rev') or None
+ fnfixslash = ui.configbool('ui', 'slash') and util.pconvert \
+ or util.localpath
+
ret = 1
m = cmdutil.match(repo, pats, opts, default='relglob')
m.bad = lambda x,y: False
@@ -1860,9 +1863,9 @@
if not rev and abs not in repo.dirstate:
continue
if opts.get('fullpath'):
- ui.write(repo.wjoin(abs), end)
+ ui.write(fnfixslash(repo.wjoin(abs)), end)
else:
- ui.write(((pats and m.rel(abs)) or abs), end)
+ ui.write(fnfixslash((pats and m.rel(abs)) or abs), end)
ret = 0
return ret
More information about the Mercurial-devel
mailing list