Rev 6338: Merge trunk resolving conflicts in http://bazaar.launchpad.net/~vila/bzr/integration/

Vincent Ladeuil v.ladeuil+lp at free.fr
Fri Dec 2 12:28:29 UTC 2011


At http://bazaar.launchpad.net/~vila/bzr/integration/

------------------------------------------------------------
revno: 6338 [merge]
revision-id: v.ladeuil+lp at free.fr-20111202122829-qfj1bcb435vatrrn
parent: pqm at pqm.ubuntu.com-20111202120254-kccrfj6buuqt1iui
parent: francis at devrx.org-20111130004841-ytecw6xs791o8ye5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Fri 2011-12-02 13:28:29 +0100
message:
  Merge trunk resolving conflicts
modified:
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
-------------- next part --------------
=== modified file 'bzrlib/status.py'
--- a/bzrlib/status.py	2011-11-21 19:27:55 +0000
+++ b/bzrlib/status.py	2011-11-16 19:42:41 +0000
@@ -453,6 +453,10 @@
 
     :param params: StatusHookParams.
     """
+    # Don't show shelves if status of specific files is being shown, only if
+    # no file arguments have been passed
+    if params.specific_files:
+        return
     get_shelf_manager = getattr(params.new_tree, 'get_shelf_manager', None)
     if get_shelf_manager is None:
         return

=== modified file 'bzrlib/tests/blackbox/test_status.py'
--- a/bzrlib/tests/blackbox/test_status.py	2011-06-03 08:45:36 +0000
+++ b/bzrlib/tests/blackbox/test_status.py	2011-11-17 20:11:33 +0000
@@ -53,24 +53,25 @@
             status._show_shelve_summary,
             'bzr status')
 
-    def assertStatus(self, expected_lines, working_tree,
+    def assertStatus(self, expected_lines, working_tree, specific_files=None,
         revision=None, short=False, pending=True, verbose=False):
         """Run status in working_tree and look for output.
 
         :param expected_lines: The lines to look for.
         :param working_tree: The tree to run status in.
         """
-        output_string = self.status_string(working_tree, revision, short,
+        output_string = self.status_string(working_tree, specific_files, revision, short,
                 pending, verbose)
         self.assertEqual(expected_lines, output_string.splitlines(True))
 
-    def status_string(self, wt, revision=None, short=False, pending=True,
-        verbose=False):
+    def status_string(self, wt, specific_files=None, revision=None,
+        short=False, pending=True, verbose=False):
         # use a real file rather than StringIO because it doesn't handle
         # Unicode very well.
         tof = codecs.getwriter('utf-8')(TemporaryFile())
-        show_tree_status(wt, to_file=tof, revision=revision, short=short,
-                show_pending=pending, verbose=verbose)
+        show_tree_status(wt, specific_files=specific_files, to_file=tof,
+                revision=revision, short=short, show_pending=pending,
+                verbose=verbose)
         tof.seek(0)
         return tof.read().decode('utf-8')
 
@@ -569,14 +570,22 @@
             ],
             wt)
         self.run_bzr(['shelve', '--all', '-m', 'bar'])
-        self.build_tree(['spam.c'])
+        self.build_tree(['eggs.c', 'spam.c'])
+        wt.add('eggs.c')
         wt.add('spam.c')
         self.assertStatus([
                 'added:\n',
+                '  eggs.c\n',
                 '  spam.c\n',
                 '2 shelves exist. See "bzr shelve --list" for details.\n',
             ],
             wt)
+        self.assertStatus([
+                'added:\n',
+                '  spam.c\n',
+            ],
+            wt,
+            specific_files=['spam.c'])
 
 
 class CheckoutStatus(BranchStatus):

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2011-12-01 12:18:55 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2011-12-02 12:28:29 +0000
@@ -30,10 +30,6 @@
 .. Improvements to existing commands, especially improved performance 
    or memory usage, or better results.
 
-* When using ``bzr switch`` to switch to a sibling of the current
-  branch, the relative branch name should no longer be url-encoded.
-  (Jelmer Vernooij)
-
 * ``bzr export --uncommitted`` will export the uncommitted tree.
   (Jelmer Vernooij, #555613)
 
@@ -49,6 +45,13 @@
 * Plugins can now register additional "location aliases".
   (Jelmer Vernooij)
 
+* ``bzr status`` no longer shows shelves if files are specified.
+  (Francis Devereux)
+
+* When using ``bzr switch`` to switch to a sibling of the current
+  branch, the relative branch name should no longer be url-encoded.
+  (Jelmer Vernooij)
+
 Bug Fixes
 *********
 
@@ -92,7 +95,6 @@
 * Provide names for lazily registered hooks. 
   (Neil Martinsen-Burrell, #894609)
 
-
 * Raise BadIndexKey exception in btree_index when a key is too large, fixing 
   an infinite recursion issue. (Shannon Weyrick, #720853)
 
@@ -108,11 +110,6 @@
 * Support verifying signatures on remote repositories.
   (Jelmer Vernooij, #889694)
 
-* Fixed parsing of the timestamp given to ``commit --commit-time``. Now
-  prohibits several invalid strings, reads the correct number of seconds,
-  and gives a better error message if the time zone offset is not given.
-  (Matt Giuca, #892657)
-
 * Teach the bzr client how to reconnect if we get ``ConnectionReset``
   while making an RPC request. This doesn't handle all possible network
   disconnects, but it should at least handle when the server is asked to
@@ -155,8 +152,11 @@
 * ``bzr config`` uses the new configuration implementation.
   (Vincent Ladeuil)
 
-* ``RemoteBranch.get_config_stack`` and ``RemoteBzrDir.get_config_stack``
-  will now use HPSS calls where possible. (Jelmer Vernooij)
+* Add HPSS call for ``Repository.pack``. (Jelmer Vernooij, #894461)
+
+* Custom HPSS error handlers can now be installed in the smart server client
+  using the ``error_translators`` and ``no_context_error_translators``
+  registries. (Jelmer Vernooij)
 
 * New HPSS calls ``Repository.has_signature_for_revision_id``,
   ``Repository.make_working_trees``, ``BzrDir.destroy_repository``,
@@ -172,11 +172,8 @@
   ``Repository.get_revision_signature_text``.
   (Jelmer Vernooij)
 
-* Add HPSS call for ``Repository.pack``. (Jelmer Vernooij, #894461)
-
-* Custom HPSS error handlers can now be installed in the smart server client
-  using the ``error_translators`` and ``no_context_error_translators``
-  registries. (Jelmer Vernooij)
+* ``RemoteBranch.get_config_stack`` and ``RemoteBzrDir.get_config_stack``
+  will now use HPSS calls where possible. (Jelmer Vernooij)
 
 * The registry of merge types has been moved to ``merge`` from ``option`` but
   ``merge.get_merge_type_registry`` remains as an accessor. (Martin Packman)



More information about the bazaar-commits mailing list