Rev 419: Fix some bogus merge stuff for show_merge_points, and fix ghost handling. in http://bazaar.launchpad.net/~jameinel/loggerhead/history_db

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/loggerhead/history_db

------------------------------------------------------------
revno: 419
revision-id: john at arbash-meinel.com-20100504153632-c013i1vo60ceue38
parent: john at arbash-meinel.com-20100504042640-ta9l4ndobw5kr7pv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: history_db
timestamp: Tue 2010-05-04 10:36:32 -0500
message:
  Fix some bogus merge stuff for show_merge_points, and fix ghost handling.
-------------- next part --------------
=== modified file 'loggerhead/history.py'
--- a/loggerhead/history.py	2010-05-04 04:26:40 +0000
+++ b/loggerhead/history.py	2010-05-04 15:36:32 +0000
@@ -307,7 +307,6 @@
         #       simpler...
         self._querier.ensure_branch_tip()
         self._branch_nick = self._branch.get_config().get_nickname()
-        self._show_merge_points = show_merge_points
         self.log = logging.getLogger('loggerhead.%s' % (self._branch_nick,))
 
         self.last_revid = branch.last_revision()
@@ -352,10 +351,13 @@
         # querier returns dotted revno tuples
         query_revno_map = self._querier.get_dotted_revno_range_multi(
                             unknown)
+        ghosts = set(revids)
         for revid, dotted_revno in query_revno_map.iteritems():
             revno_str = '.'.join(map(str, dotted_revno))
             self._revno_revid_cache.set(revid, revno_str)
             revno_map[revid] = revno_str
+            ghosts.discard(revids)
+        revno_map.update([(n, 'unknown') for n in ghosts])
         return revno_map
 
     def get_revid_for_revno(self, revno_str):
@@ -647,10 +649,7 @@
                     for r in merge_revids]
         parity = 0
         for change in changes:
-            if self._show_merge_points:
-                change._set_property('merge_points', merge_points_callback)
-            else:
-                change.merge_points = []
+            change._set_property('merge_points', merge_points_callback)
             if len(change.parents) > 0:
                 change.parents = [util.Container(revid=r, revno=revno_map[r])
                                   for r in change.parents]