Rev 6339: (vila) Don't show shelf info when status is asked about specific in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/
Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Dec 2 13:01:23 UTC 2011
At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 6339 [merge]
revision-id: pqm at pqm.ubuntu.com-20111202130123-kak5duj7dxwwjla9
parent: pqm at pqm.ubuntu.com-20111202122758-51hwrv7xal5mccv2
parent: v.ladeuil+lp at free.fr-20111202123510-2oyuj2jcfy414ldk
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2011-12-02 13:01:23 +0000
message:
(vila) Don't show shelf info when status is asked about specific
files (Francis Devereux)
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
=== 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-02 11:52:04 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt 2011-12-02 12:35:10 +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,10 +45,17 @@
* Plugins can now register additional "location aliases".
(Jelmer Vernooij)
+* ``bzr status`` no longer shows shelves if files are specified.
+ (Francis Devereux)
+
* Revision specifiers will now only browse as much history as they
need to, rather than grabbing the whole history unnecessarily in some
cases. (Jelmer Vernooij)
+* 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
*********
@@ -96,7 +99,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)
@@ -112,11 +114,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
@@ -163,8 +160,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``,
@@ -180,11 +180,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