Mercurial > hg-stable

changeset 35022:19ecd39223dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Kevin Bullock <kbullock+mercurial@ringworld.org>
date Fri, 03 Nov 2017 10:32:38 -0500
parents d8c2db6167b3 (current diff) f445b10dc7fb (diff)
children 3649c3f2cd90
files
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/pathutil.py	Fri Nov 03 21:14:57 2017 +0900
+++ b/mercurial/pathutil.py	Fri Nov 03 10:32:38 2017 -0500
@@ -184,8 +184,10 @@
         try:
             if cwd != root:
                 canonpath(root, root, myname, auditor)
-                hint = (_("consider using '--cwd %s'")
-                        % os.path.relpath(root, cwd))
+                relpath = util.pathto(root, cwd, '')
+                if relpath[-1] == pycompat.ossep:
+                    relpath = relpath[:-1]
+                hint = (_("consider using '--cwd %s'") % relpath)
         except error.Abort:
             pass