Mercurial > hg
changeset 18255:7ca534f31a83
debugpushkey: list keys sorted
| author | Mads Kiilerich <mads at kiilerich.com> |
|---|---|
| date | Sun, 16 Dec 2012 20:50:57 +0100 |
| parents | 2dfe519d435d |
| children | d084df89d948 |
| files | mercurial/commands.py tests/test-bookmarks-pushpull.t tests/test-ssh.t |
| diffstat | 3 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Dec 12 02:38:14 2012 +0100 +++ b/mercurial/commands.py Sun Dec 16 20:50:57 2012 +0100 @@ -2156,7 +2156,7 @@ ui.status(str(r) + '\n') return not r else: - for k, v in target.listkeys(namespace).iteritems(): + for k, v in sorted(target.listkeys(namespace).iteritems()): ui.write("%s\t%s\n" % (k.encode('string-escape'), v.encode('string-escape')))
--- a/tests/test-bookmarks-pushpull.t Wed Dec 12 02:38:14 2012 +0100 +++ b/tests/test-bookmarks-pushpull.t Sun Dec 16 20:50:57 2012 +0100 @@ -51,12 +51,12 @@ Z 0:4e3505fd9583 $ hg debugpushkey ../a namespaces bookmarks - phases namespaces obsolete + phases $ hg debugpushkey ../a bookmarks + X 4e3505fd95835d721066b76e75dbb8cc554d7f77 Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 - X 4e3505fd95835d721066b76e75dbb8cc554d7f77 Z 4e3505fd95835d721066b76e75dbb8cc554d7f77 $ hg pull -B X ../a pulling from ../a @@ -292,16 +292,16 @@ $ hg debugpushkey http://localhost:$HGPORT/ namespaces bookmarks - phases namespaces obsolete + phases $ hg debugpushkey http://localhost:$HGPORT/ bookmarks @ 9b140be1080824d768c5a4691a564088eede71f9 + X 9b140be1080824d768c5a4691a564088eede71f9 + Y c922c0139ca03858f655e4a2af4dd02796a63969 + Z 0d2164f0ce0d8f1d6f94351eba04b794909be66c foo 0000000000000000000000000000000000000000 foobar 9b140be1080824d768c5a4691a564088eede71f9 - Y c922c0139ca03858f655e4a2af4dd02796a63969 - X 9b140be1080824d768c5a4691a564088eede71f9 - Z 0d2164f0ce0d8f1d6f94351eba04b794909be66c $ hg out -B http://localhost:$HGPORT/ comparing with http://localhost:$HGPORT/ searching for changed bookmarks
--- a/tests/test-ssh.t Wed Dec 12 02:38:14 2012 +0100 +++ b/tests/test-ssh.t Sun Dec 16 20:50:57 2012 +0100 @@ -165,8 +165,8 @@ $ cd ../local $ hg debugpushkey --config ui.ssh="python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote namespaces bookmarks + namespaces phases - namespaces $ hg book foo -r 0 $ hg out -B comparing with ssh://user@dummy/remote