Rev 3327: don't show pending merges when given an explicit list of files (John in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3327
revision-id:pqm at pqm.ubuntu.com-20080402090835-uq4ef5jnwo7opd9t
parent: pqm at pqm.ubuntu.com-20080402050849-c07i1cjma61941ie
parent: ian.clatworthy at canonical.com-20080402073209-3p1x2zmx8453ab8l
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-04-02 10:08:35 +0100
message:
  don't show pending merges when given an explicit list of files (John
  	Arbash Meinel)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/tests/test_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
    ------------------------------------------------------------
    revno: 3326.1.1
    revision-id:ian.clatworthy at canonical.com-20080402073209-3p1x2zmx8453ab8l
    parent: pqm at pqm.ubuntu.com-20080402050849-c07i1cjma61941ie
    parent: john at arbash-meinel.com-20080320171401-uwkidro3gqqvy7ek
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: ianc-integration
    timestamp: Wed 2008-04-02 17:32:09 +1000
    message:
      don't show pending merges when given an explicit list of files (John Arbash Meinel)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
      bzrlib/tests/test_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
    ------------------------------------------------------------
    revno: 3298.1.1
    revision-id:john at arbash-meinel.com-20080320171401-uwkidro3gqqvy7ek
    parent: pqm at pqm.ubuntu.com-20080320074642-46bf1vcpyubnaptz
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: status_specific_files
    timestamp: Thu 2008-03-20 12:14:01 -0500
    message:
      Only show pending merges when not given a list of specific files.
    modified:
      bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
      bzrlib/tests/test_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
=== modified file 'NEWS'
--- a/NEWS	2008-04-02 05:08:49 +0000
+++ b/NEWS	2008-04-02 07:32:09 +0000
@@ -42,6 +42,9 @@
     * Merge is faster.  We no longer check a file's existence unnecessarily
       when merging the execute bit.  (Aaron Bentley)
 
+    * ``bzr status`` on an explicit list of files no longer shows pending
+      merges, making it much faster on large trees. (John Arbash Meinel)
+
     * The launchpad directory service now warns the user if they have not set
       their launchpad login and are trying to resolve a URL using it, just
       in case they want to do a write operation with it.  (James Westby)

=== modified file 'bzrlib/status.py'
--- a/bzrlib/status.py	2008-03-07 14:15:10 +0000
+++ b/bzrlib/status.py	2008-03-20 17:14:01 +0000
@@ -134,7 +134,8 @@
                 else:
                     prefix = ' '
                 to_file.write("%s %s\n" % (prefix, conflict))
-            if new_is_working_tree and show_pending:
+            if (new_is_working_tree and show_pending
+                and specific_files is None):
                 show_pending_merges(new, to_file, short)
         finally:
             old.unlock()

=== modified file 'bzrlib/tests/test_status.py'
--- a/bzrlib/tests/test_status.py	2006-10-05 05:37:25 +0000
+++ b/bzrlib/tests/test_status.py	2008-03-20 17:14:01 +0000
@@ -48,3 +48,20 @@
                      revision=[RevisionSpec.from_string("revid:%s" % r1_id),
                                RevisionSpec.from_string("revid:%s" % r2_id)])
         # return does not matter as long as it did not raise.
+
+    def test_pending_specific_files(self):
+        """With a specific file list, pending merges are not shown."""
+        tree = self.make_branch_and_tree('tree')
+        self.build_tree_contents([('tree/a', 'content of a\n')])
+        tree.add('a')
+        r1_id = tree.commit('one')
+        alt = tree.bzrdir.sprout('alt').open_workingtree()
+        self.build_tree_contents([('alt/a', 'content of a\nfrom alt\n')])
+        alt_id = alt.commit('alt')
+        tree.merge_from_branch(alt.branch)
+        output = StringIO()
+        show_tree_status(tree, to_file=output)
+        self.assertContainsRe(output.getvalue(), 'pending merges:')
+        output = StringIO()
+        show_tree_status(tree, to_file=output, specific_files=['a'])
+        self.assertNotContainsRe(output.getvalue(), 'pending merges:')