diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -5360,7 +5360,7 @@ def paths(ui, repo, search=None): if search: for name, path in sorted(ui.paths.iteritems()): if name == search: - ui.status("%s\n" % util.hidepassword(path.loc)) + ui.status("%s\n" % util.hidepassword(path.rawloc)) return if not ui.quiet: ui.warn(_("not found!\n")) @@ -5371,7 +5371,7 @@ def paths(ui, repo, search=None): ui.write("%s\n" % name) else: ui.write("%s = %s\n" % (name, - util.hidepassword(path.loc))) + util.hidepassword(path.rawloc))) for subopt, value in sorted(path.suboptions.items()): ui.write('%s:%s = %s\n' % (name, subopt, value)) diff --git a/tests/test-paths.t b/tests/test-paths.t --- a/tests/test-paths.t +++ b/tests/test-paths.t @@ -4,7 +4,7 @@ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd a $ echo '[paths]' >> .hg/hgrc - $ echo 'dupe = ../b' >> .hg/hgrc + $ echo 'dupe = ../b#tip' >> .hg/hgrc $ echo 'expand = $SOMETHING/bar' >> .hg/hgrc $ hg in dupe comparing with $TESTTMP/b (glob) @@ -17,25 +17,25 @@ [1] $ cd a $ hg paths - dupe = $TESTTMP/b (glob) + dupe = $TESTTMP/b#tip (glob) expand = $TESTTMP/a/$SOMETHING/bar (glob) $ SOMETHING=foo hg paths - dupe = $TESTTMP/b (glob) + dupe = $TESTTMP/b#tip (glob) expand = $TESTTMP/a/foo/bar (glob) #if msys $ SOMETHING=//foo hg paths - dupe = $TESTTMP/b (glob) + dupe = $TESTTMP/b#tip (glob) expand = /foo/bar #else $ SOMETHING=/foo hg paths - dupe = $TESTTMP/b (glob) + dupe = $TESTTMP/b#tip (glob) expand = /foo/bar #endif $ hg paths -q dupe expand $ hg paths dupe - $TESTTMP/b (glob) + $TESTTMP/b#tip (glob) $ hg paths -q dupe $ hg paths unknown not found!