Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorMatt Mackall <mpm@selenic.com>
Fri, 11 Dec 2015 17:45:19 -0600
changeset 27329 944af8e2eb4c
parent 27328 96dc6664fa9c (current diff)
parent 27320 59d5f619e69e (diff)
child 27330 6fbf1159a85a
merge with stable
mercurial/commands.py file | annotate | diff | comparison | revisions
tests/test-paths.t file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Fri Dec 11 12:21:26 2015 +0000
+++ b/mercurial/commands.py	Fri Dec 11 17:45:19 2015 -0600
@@ -5360,7 +5360,7 @@
     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 @@
                 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))
 
--- a/tests/test-paths.t	Fri Dec 11 12:21:26 2015 +0000
+++ b/tests/test-paths.t	Fri Dec 11 17:45:19 2015 -0600
@@ -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!
Mercurial