mercurial/commands.py
changeset 24400 03c84c966ef5
parent 24398 c0096a2bd3ff
child 24413 a8595176dd64
--- a/mercurial/commands.py	Thu Mar 19 23:36:05 2015 +0900
+++ b/mercurial/commands.py	Thu Mar 19 23:36:06 2015 +0900
@@ -5982,14 +5982,11 @@
             t.append(_('%d outgoing') % len(o))
         other = dother or sother
         if 'bookmarks' in other.listkeys('namespaces'):
-            lmarks = repo.listkeys('bookmarks')
-            rmarks = other.listkeys('bookmarks')
-            diff = set(rmarks) - set(lmarks)
-            if len(diff) > 0:
-                t.append(_('%d incoming bookmarks') % len(diff))
-            diff = set(lmarks) - set(rmarks)
-            if len(diff) > 0:
-                t.append(_('%d outgoing bookmarks') % len(diff))
+            counts = bookmarks.summary(repo, other)
+            if counts[0] > 0:
+                t.append(_('%d incoming bookmarks') % counts[0])
+            if counts[1] > 0:
+                t.append(_('%d outgoing bookmarks') % counts[1])
 
         if t:
             # i18n: column positioning for "hg summary"