Rev 3681: Replace 'reverse' by 'backward' when talking about revision order. in lp:~vila/bzr/233817-missing

Vincent Ladeuil v.ladeuil+lp at free.fr
Thu Sep 11 18:13:54 BST 2008


At lp:~vila/bzr/233817-missing

------------------------------------------------------------
revno: 3681
revision-id: v.ladeuil+lp at free.fr-20080911171346-f411nupzrv0iwerb
parent: v.ladeuil+lp at free.fr-20080910144915-ul6dhgtzd80ut9kb
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 233817-missing
timestamp: Thu 2008-09-11 19:13:46 +0200
message:
  Replace 'reverse' by 'backward' when talking about revision order.
  
  * tests/test_missing.py:
  (TestMissing.assertUnmerged): Use default value for order.
  (TestFindUnmerged.test_include_merges): Respect default order to
  keep all related tests coherent.
  
  * builtins.py:
  (cmd_missing.run): Reverse means forward.
  
  * missing.py:
  (find_unmerged, _enumerate_mainline, _enumerate_with_merges):
  Revert the 'reverse' parameter addition, renaming it
  'backward'. 'reverse' is too confusing, just re-read the previous
  sentence if you disagree (and I put quotes to help the reader...).
  
  * log.py:
  (get_view_revisions): Revert noisy cleanup.
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
  bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
-------------- next part --------------
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2008-09-03 16:33:27 +0000
+++ b/bzrlib/builtins.py	2008-09-11 17:13:46 +0000
@@ -3365,7 +3365,7 @@
             try:
                 local_extra, remote_extra = find_unmerged(
                     local_branch, remote_branch, restrict,
-                    reverse=reverse,
+                    backward=not reverse,
                     include_merges=include_merges)
 
                 if log_format is None:

=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py	2008-09-03 16:33:27 +0000
+++ b/bzrlib/log.py	2008-09-11 17:13:46 +0000
@@ -642,7 +642,7 @@
     elif direction != 'reverse':
         raise ValueError('invalid direction %r' % direction)
 
-    for seq, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
+    for sequence, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
         yield rev_id, '.'.join(map(str, revno)), merge_depth
 
 

=== modified file 'bzrlib/missing.py'
--- a/bzrlib/missing.py	2008-09-10 14:49:15 +0000
+++ b/bzrlib/missing.py	2008-09-11 17:13:46 +0000
@@ -45,7 +45,7 @@
 
 
 def find_unmerged(local_branch, remote_branch, restrict='all',
-                  include_merges=False, reverse=False):
+                  include_merges=False, backward=False):
     """Find revisions from each side that have not been merged.
 
     :param local_branch: Compare the history of local_branch
@@ -57,7 +57,7 @@
         the local revisions.
     :param include_merges: Show mainline revisions only if False,
         all revisions otherwise.
-    :param reverse: Show oldest versions first when True, newest versions
+    :param backward: Show oldest versions first when True, newest versions
         first when False. 
 
     :return: A list of [(revno, revision_id)] for the mainline revisions on
@@ -69,20 +69,22 @@
         try:
             return _find_unmerged(
                 local_branch, remote_branch, restrict=restrict,
-                include_merges=include_merges, reverse=reverse)
+                include_merges=include_merges, backward=backward)
         finally:
             remote_branch.unlock()
     finally:
         local_branch.unlock()
 
 
-def _enumerate_mainline(ancestry, graph, tip_revno, tip, reverse=False):
+def _enumerate_mainline(ancestry, graph, tip_revno, tip, backward=True):
     """Enumerate the mainline revisions for these revisions.
 
     :param ancestry: A set of revisions that we care about
     :param graph: A Graph which lets us find the parents for a revision
     :param tip_revno: The revision number for the tip revision
     :param tip: The tip of mainline
+    :param backward: Show oldest versions first when True, newest versions
+        first when False. 
     :return: [(revno, revision_id)] for all revisions in ancestry that
         are left-hand parents from tip, or None if ancestry is None.
     """
@@ -106,13 +108,13 @@
         mainline.append((str(cur_revno), cur))
         cur = parents[0]
         cur_revno -= 1
-    if reverse:
+    if not backward:
         mainline.reverse()
     return mainline
 
 
 def _enumerate_with_merges(branch, ancestry, graph, tip_revno, tip,
-                           reverse=False):
+                           backward=True):
     """Enumerate the revisions for the ancestry.
 
     :param branch: The branch we care about
@@ -120,6 +122,8 @@
     :param graph: A Graph which lets us find the parents for a revision
     :param tip_revno: The revision number for the tip revision
     :param tip: The tip of the ancsetry
+    :param backward: Show oldest versions first when True, newest versions
+        first when False. 
     :return: [(revno, revision_id)] for all revisions in ancestry that
         are parents from tip, or None if ancestry is None.
     """
@@ -154,7 +158,7 @@
     merge_sorted_revisions = [
         (s, revid, n, d, e) for s, revid, n, d, e in merge_sorted_revisions
         if revid in ancestry]
-    if reverse:
+    if not backward:
         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:
@@ -163,7 +167,7 @@
 
 
 def _find_unmerged(local_branch, remote_branch, restrict,
-                   include_merges, reverse):
+                   include_merges, backward):
     """See find_unmerged.
 
     The branches should already be locked before entering.
@@ -191,17 +195,17 @@
     if include_merges:
         locals = _enumerate_with_merges(local_branch, local_extra,
                                         graph, local_revno,
-                                        local_revision_id, reverse)
+                                        local_revision_id, backward)
         remotes = _enumerate_with_merges(remote_branch, remote_extra,
                                          graph, remote_revno,
-                                         remote_revision_id, reverse)
+                                         remote_revision_id, backward)
     else:
         # Now that we have unique ancestors, compute just the mainline, and
         # generate revnos for them.
         locals = _enumerate_mainline(local_extra, graph, local_revno,
-                                     local_revision_id, reverse)
+                                     local_revision_id, backward)
         remotes = _enumerate_mainline(remote_extra, graph, remote_revno,
-                                      remote_revision_id, reverse)
+                                      remote_revision_id, backward)
     return locals, remotes
 
 

=== modified file 'bzrlib/tests/test_missing.py'
--- a/bzrlib/tests/test_missing.py	2008-09-09 16:07:41 +0000
+++ b/bzrlib/tests/test_missing.py	2008-09-11 17:13:46 +0000
@@ -31,8 +31,7 @@
 class TestMissing(TestCaseWithTransport):
 
     def assertUnmerged(self, expected, source, target, restrict='all'):
-        unmerged = missing.find_unmerged(source, target, restrict=restrict,
-                                         reverse=True)
+        unmerged = missing.find_unmerged(source, target, restrict=restrict)
         self.assertEqual(expected, unmerged)
 
     def test_find_unmerged(self):
@@ -85,8 +84,7 @@
         child_tree.commit('rename b=>c', rev_id='c-5')
 
         base_extra, child_extra = missing.find_unmerged(base_tree.branch,
-                                                        child_tree.branch,
-                                                        reverse=True)
+                                                        child_tree.branch)
         results = list(iter_log_revisions(base_extra,
                             base_tree.branch.repository,
                             verbose=True))
@@ -195,9 +193,9 @@
         tree2.merge_from_branch(tree3.branch)
         rev6 = tree2.commit('six', rev_id='rev6')
 
-        self.assertUnmerged([], [('4', 'rev6'),
-                                 ('3.1.2', 'rev5'), ('3.1.1', 'rev4'),
-                                 ('3', 'rev3'), ('2', 'rev2'),
+        self.assertUnmerged([], [('2', 'rev2'), ('3', 'rev3'),
+                                 ('4', 'rev6'),
+                                 ('3.1.1', 'rev4'), ('3.1.2', 'rev5'),
                                  ],
                             tree.branch, tree2.branch, 'all',
                             include_merges=True)



More information about the bazaar-commits mailing list