Mercurial > hg-stable
changeset 27320:59d5f619e69e stable
paths: include #fragment again
Since 5f2a4fc3c4fa, #fragment was missing in "hg paths" output because
path.loc was changed to a parsed URL. "hg paths" should use path.rawloc to
show complete URLs.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Mon, 07 Dec 2015 21:42:50 +0900 |
| parents | cea1473ba468 |
| children | 944af8e2eb4c c48ecc0b5bc9 |
| files | mercurial/commands.py tests/test-paths.t |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Mon Dec 07 17:39:31 2015 +0100 +++ b/mercurial/commands.py Mon Dec 07 21:42:50 2015 +0900 @@ -5110,7 +5110,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")) @@ -5121,7 +5121,7 @@ ui.write("%s\n" % name) else: ui.write("%s = %s\n" % (name, - util.hidepassword(path.loc))) + util.hidepassword(path.rawloc))) @command('phase', [('p', 'public', False, _('set changeset phase to public')),
--- a/tests/test-paths.t Mon Dec 07 17:39:31 2015 +0100 +++ b/tests/test-paths.t Mon Dec 07 21:42:50 2015 +0900 @@ -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!