Rev 3682: Indent merge revisions correctly. in lp:~vila/bzr/233817-missing

[Vincent Ladeuil]

At lp:~vila/bzr/233817-missing

------------------------------------------------------------
revno: 3682
revision-id: v.ladeuil+lp at free.fr-20080911193541-ihmjsp1azp1tq1o1
parent: v.ladeuil+lp at free.fr-20080911171346-f411nupzrv0iwerb
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 233817-missing
timestamp: Thu 2008-09-11 21:35:41 +0200
message:
  Indent merge revisions correctly.
  
  * tests/test_missing.py:
  (TestFindUnmerged.test_include_merges): Update test.
  
  * missing.py:
  (iter_log_revisions): Work around wrong API while maintaining
  backward compatibility (this should be in log.py and hopefully
  will be soon).
modified:
  bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
  bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
-------------- next part --------------
=== modified file 'bzrlib/missing.py'
--- a/bzrlib/missing.py	2008-09-11 17:13:46 +0000
+++ b/bzrlib/missing.py	2008-09-11 19:35:41 +0000
@@ -26,7 +26,14 @@
 def iter_log_revisions(revisions, revision_source, verbose):
     last_tree = revision_source.revision_tree(None)
     last_rev_id = None
-    for revno, rev_id in revisions:
+    for rev in revisions:
+        # We need the following for backward compatibilty (hopefully
+        # this will be deprecated soon :-/) -- vila 080911
+        if len(rev) == 2:
+            revno, rev_id = rev
+            merge_depth = 0
+        else:
+            revno, rev_id, merge_depth = rev
         rev = revision_source.get_revision(rev_id)
         if verbose:
             remote_tree = revision_source.revision_tree(rev_id)
@@ -41,7 +48,7 @@
             delta = revision_tree.changes_from(parent_tree)
         else:
             delta = None
-        yield log.LogRevision(rev, revno, delta=delta)
+        yield log.LogRevision(rev, revno, merge_depth, delta=delta)
 
 
 def find_unmerged(local_branch, remote_branch, restrict='all',
@@ -162,7 +169,7 @@
         merge_sorted_revisions = log.reverse_by_depth(merge_sorted_revisions)
     revline = []
     for seq, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
-        revline.append(('.'.join(map(str, revno)), rev_id))
+        revline.append(('.'.join(map(str, revno)), rev_id, merge_depth))
     return revline
 
 

=== modified file 'bzrlib/tests/test_missing.py'
--- a/bzrlib/tests/test_missing.py	2008-09-11 17:13:46 +0000
+++ b/bzrlib/tests/test_missing.py	2008-09-11 19:35:41 +0000
@@ -193,9 +193,9 @@
         tree2.merge_from_branch(tree3.branch)
         rev6 = tree2.commit('six', rev_id='rev6')
 
-        self.assertUnmerged([], [('2', 'rev2'), ('3', 'rev3'),
-                                 ('4', 'rev6'),
-                                 ('3.1.1', 'rev4'), ('3.1.2', 'rev5'),
+        self.assertUnmerged([], [('2', 'rev2', 0), ('3', 'rev3',0 ),
+                                 ('4', 'rev6', 0),
+                                 ('3.1.1', 'rev4', 1), ('3.1.2', 'rev5', 1),
                                  ],
                             tree.branch, tree2.branch, 'all',
                             include_merges=True)