--- a/mercurial/commands.py Thu Jan 03 18:52:59 2013 +0100
+++ b/mercurial/commands.py Wed Dec 12 02:38:14 2012 +0100
@@ -1827,8 +1827,8 @@
force=True)
common = set(common)
if not opts.get('nonheads'):
- ui.write(("unpruned common: %s\n") % " ".join([short(n)
- for n in common]))
+ ui.write(("unpruned common: %s\n") %
+ " ".join(sorted(short(n) for n in common)))
dag = dagutil.revlogdag(repo.changelog)
all = dag.ancestorset(dag.internalizeall(common))
common = dag.externalizeall(dag.headsetofconnecteds(all))
@@ -1837,7 +1837,8 @@
common = set(common)
rheads = set(hds)
lheads = set(repo.heads())
- ui.write(("common heads: %s\n") % " ".join([short(n) for n in common]))
+ ui.write(("common heads: %s\n") %
+ " ".join(sorted(short(n) for n in common)))
if lheads <= common:
ui.write(("local is subset\n"))
elif rheads <= common:
@@ -2134,7 +2135,8 @@
ui.write(' ')
ui.write(hex(repl))
ui.write(' %X ' % m._data[2])
- ui.write(m.metadata())
+ ui.write('{%s}' % (', '.join('%r: %r' % t for t in
+ sorted(m.metadata().items()))))
ui.write('\n')
@command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'))
--- a/tests/test-setdiscovery.t Thu Jan 03 18:52:59 2013 +0100
+++ b/tests/test-setdiscovery.t Wed Dec 12 02:38:14 2012 +0100
@@ -36,8 +36,8 @@
% -- a -> b tree
comparing with b
searching for changes
- unpruned common: b5714e113bc0 66f7d451a68b 01241442b3c2
- common heads: b5714e113bc0 01241442b3c2
+ unpruned common: 01241442b3c2 66f7d451a68b b5714e113bc0
+ common heads: 01241442b3c2 b5714e113bc0
local is subset
% -- a -> b set
@@ -45,14 +45,14 @@
query 1; heads
searching for changes
all local heads known remotely
- common heads: b5714e113bc0 01241442b3c2
+ common heads: 01241442b3c2 b5714e113bc0
local is subset
% -- b -> a tree
comparing with a
searching for changes
- unpruned common: b5714e113bc0 01241442b3c2
- common heads: b5714e113bc0 01241442b3c2
+ unpruned common: 01241442b3c2 b5714e113bc0
+ common heads: 01241442b3c2 b5714e113bc0
remote is subset
% -- b -> a set
@@ -60,7 +60,7 @@
query 1; heads
searching for changes
all remote heads known locally
- common heads: b5714e113bc0 01241442b3c2
+ common heads: 01241442b3c2 b5714e113bc0
remote is subset
@@ -89,7 +89,7 @@
% -- b -> a tree
comparing with a
searching for changes
- unpruned common: bebd167eb94d 66f7d451a68b
+ unpruned common: 66f7d451a68b bebd167eb94d
common heads: bebd167eb94d
% -- b -> a set
@@ -128,7 +128,7 @@
% -- b -> a tree
comparing with a
searching for changes
- unpruned common: 66f7d451a68b 2dc09a01254d
+ unpruned common: 2dc09a01254d 66f7d451a68b
common heads: 2dc09a01254d
% -- b -> a set