Show More
@@ -2156,7 +2156,7 b' def debugpushkey(ui, repopath, namespace' | |||||
2156 | ui.status(str(r) + '\n') |
|
2156 | ui.status(str(r) + '\n') | |
2157 | return not r |
|
2157 | return not r | |
2158 | else: |
|
2158 | else: | |
2159 | for k, v in target.listkeys(namespace).iteritems(): |
|
2159 | for k, v in sorted(target.listkeys(namespace).iteritems()): | |
2160 | ui.write("%s\t%s\n" % (k.encode('string-escape'), |
|
2160 | ui.write("%s\t%s\n" % (k.encode('string-escape'), | |
2161 | v.encode('string-escape'))) |
|
2161 | v.encode('string-escape'))) | |
2162 |
|
2162 |
@@ -51,12 +51,12 b' import bookmark by name' | |||||
51 | Z 0:4e3505fd9583 |
|
51 | Z 0:4e3505fd9583 | |
52 | $ hg debugpushkey ../a namespaces |
|
52 | $ hg debugpushkey ../a namespaces | |
53 | bookmarks |
|
53 | bookmarks | |
54 | phases |
|
|||
55 | namespaces |
|
54 | namespaces | |
56 | obsolete |
|
55 | obsolete | |
|
56 | phases | |||
57 | $ hg debugpushkey ../a bookmarks |
|
57 | $ hg debugpushkey ../a bookmarks | |
|
58 | X 4e3505fd95835d721066b76e75dbb8cc554d7f77 | |||
58 | Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
|
59 | Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 | |
59 | X 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
|
|||
60 | Z 4e3505fd95835d721066b76e75dbb8cc554d7f77 |
|
60 | Z 4e3505fd95835d721066b76e75dbb8cc554d7f77 | |
61 | $ hg pull -B X ../a |
|
61 | $ hg pull -B X ../a | |
62 | pulling from ../a |
|
62 | pulling from ../a | |
@@ -292,16 +292,16 b' hgweb' | |||||
292 |
|
292 | |||
293 | $ hg debugpushkey http://localhost:$HGPORT/ namespaces |
|
293 | $ hg debugpushkey http://localhost:$HGPORT/ namespaces | |
294 | bookmarks |
|
294 | bookmarks | |
295 | phases |
|
|||
296 | namespaces |
|
295 | namespaces | |
297 | obsolete |
|
296 | obsolete | |
|
297 | phases | |||
298 | $ hg debugpushkey http://localhost:$HGPORT/ bookmarks |
|
298 | $ hg debugpushkey http://localhost:$HGPORT/ bookmarks | |
299 | @ 9b140be1080824d768c5a4691a564088eede71f9 |
|
299 | @ 9b140be1080824d768c5a4691a564088eede71f9 | |
|
300 | X 9b140be1080824d768c5a4691a564088eede71f9 | |||
|
301 | Y c922c0139ca03858f655e4a2af4dd02796a63969 | |||
|
302 | Z 0d2164f0ce0d8f1d6f94351eba04b794909be66c | |||
300 | foo 0000000000000000000000000000000000000000 |
|
303 | foo 0000000000000000000000000000000000000000 | |
301 | foobar 9b140be1080824d768c5a4691a564088eede71f9 |
|
304 | foobar 9b140be1080824d768c5a4691a564088eede71f9 | |
302 | Y c922c0139ca03858f655e4a2af4dd02796a63969 |
|
|||
303 | X 9b140be1080824d768c5a4691a564088eede71f9 |
|
|||
304 | Z 0d2164f0ce0d8f1d6f94351eba04b794909be66c |
|
|||
305 | $ hg out -B http://localhost:$HGPORT/ |
|
305 | $ hg out -B http://localhost:$HGPORT/ | |
306 | comparing with http://localhost:$HGPORT/ |
|
306 | comparing with http://localhost:$HGPORT/ | |
307 | searching for changed bookmarks |
|
307 | searching for changed bookmarks |
@@ -165,8 +165,8 b' test pushkeys and bookmarks' | |||||
165 | $ cd ../local |
|
165 | $ cd ../local | |
166 | $ hg debugpushkey --config ui.ssh="python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote namespaces |
|
166 | $ hg debugpushkey --config ui.ssh="python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote namespaces | |
167 | bookmarks |
|
167 | bookmarks | |
|
168 | namespaces | |||
168 | phases |
|
169 | phases | |
169 | namespaces |
|
|||
170 | $ hg book foo -r 0 |
|
170 | $ hg book foo -r 0 | |
171 | $ hg out -B |
|
171 | $ hg out -B | |
172 | comparing with ssh://user@dummy/remote |
|
172 | comparing with ssh://user@dummy/remote |
General Comments 0
You need to be logged in to leave comments.
Login now