Rev 3517: Switch from note() to mutter() so we can still get the info from the log, but we don't clutter the screen as much. in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/merge3_per_file

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/merge3_per_file

------------------------------------------------------------
revno: 3517
revision-id: john at arbash-meinel.com-20080625174816-r8mgsvobyaruyj7w
parent: john at arbash-meinel.com-20080624224607-0ut2x6l0h2928qnv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge3_per_file
timestamp: Wed 2008-06-25 12:48:16 -0500
message:
  Switch from note() to mutter() so we can still get the info from the log, but we don't clutter the screen as much.
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2008-06-24 22:46:07 +0000
+++ b/bzrlib/merge.py	2008-06-25 17:48:16 +0000
@@ -1539,8 +1539,8 @@
                 other = b_rev
             else:
                 other = a_rev
-            note('found dominating revision for %s\n%s > %s', self.vf,
-                 self._head, other)
+            mutter('found dominating revision for %s\n%s > %s', self.vf,
+                   self._head, other)
         else:
             self._head = None
             self._build_weave()
@@ -1548,7 +1548,7 @@
     def _find_recursive_lcas(self):
         """Find all the ancestors back to a unique lca"""
         cur_ancestors = (self.a_rev, self.b_rev)
-        note('finding lcas for %s:\n%s', self.vf, cur_ancestors)
+        mutter('finding lcas for %s:\n%s', self.vf, cur_ancestors)
         ancestors = [cur_ancestors]
         while True:
             next_lcas = self.graph.find_lca(*cur_ancestors)
@@ -1579,7 +1579,8 @@
         self._weave = weave.Weave(weave_name='in_memory_weave',
                                   allow_reserved=True)
         lcas = self._find_recursive_lcas()
-        note('Found:\n => %s', '\n => '.join(str(sorted(lca)) for lca in lcas))
+        mutter('Found:\n     => %s',
+               '\n     => '.join(str(sorted(lca)) for lca in lcas))
 
         all_texts = self._get_interesting_texts(lcas)