Rev 2573: Merge Daniel Watkin's fix for #113436 (including use of new test API) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Jul 3 06:57:17 BST 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 2573
revision-id: pqm at pqm.ubuntu.com-20070703055715-ij91yrkomctki31m
parent: pqm at pqm.ubuntu.com-20070703052458-wh36exfav0xnj9nf
parent: ian.clatworthy at internode.on.net-20070703013005-6t3szn696zlxppzu
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-07-03 06:57:15 +0100
message:
Merge Daniel Watkin's fix for #113436 (including use of new test API)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
------------------------------------------------------------
revno: 2571.1.2
merged: ian.clatworthy at internode.on.net-20070703013005-6t3szn696zlxppzu
parent: ian.clatworthy at internode.on.net-20070703004004-qilp1re0a7q9rag3
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Tue 2007-07-03 11:30:05 +1000
message:
Fix PQM failure - use new test API
------------------------------------------------------------
revno: 2571.1.1
merged: ian.clatworthy at internode.on.net-20070703004004-qilp1re0a7q9rag3
parent: pqm at pqm.ubuntu.com-20070702183615-qkiquhju4t2grtf9
parent: d.m.watkins at warwick.ac.uk-20070612021457-q0p6f7ezdldxigwb
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Tue 2007-07-03 10:40:04 +1000
message:
Merge Daniel Watkin's fix for #113436
------------------------------------------------------------
revno: 2520.1.7
merged: d.m.watkins at warwick.ac.uk-20070612021457-q0p6f7ezdldxigwb
parent: d.m.watkins at warwick.ac.uk-20070612021242-johprm857jsmbpzc
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 113436.1
timestamp: Tue 2007-06-12 03:14:57 +0100
message:
Commands that use status flags now have a reference to 'help status-flags', fixing bug #113436.
------------------------------------------------------------
revno: 2520.1.6
merged: d.m.watkins at warwick.ac.uk-20070612021242-johprm857jsmbpzc
parent: d.m.watkins at warwick.ac.uk-20070608195438-gu45k2p8gnhdqude
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 113436.1
timestamp: Tue 2007-06-12 03:12:42 +0100
message:
Fixed 'pull' help.
------------------------------------------------------------
revno: 2520.1.5
merged: d.m.watkins at warwick.ac.uk-20070608195438-gu45k2p8gnhdqude
parent: d.m.watkins at warwick.ac.uk-20070608195413-bq1iro4mrqfx8e89
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 113436.1
timestamp: Fri 2007-06-08 20:54:38 +0100
message:
'help merge' now points to 'help status-flags'.
------------------------------------------------------------
revno: 2520.1.4
merged: d.m.watkins at warwick.ac.uk-20070608195413-bq1iro4mrqfx8e89
parent: d.m.watkins at warwick.ac.uk-20070608195330-5mbalaf9uzut17b1
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 113436.1
timestamp: Fri 2007-06-08 20:54:13 +0100
message:
'help pull' now points to 'help status-flags'.
------------------------------------------------------------
revno: 2520.1.3
merged: d.m.watkins at warwick.ac.uk-20070608195330-5mbalaf9uzut17b1
parent: d.m.watkins at warwick.ac.uk-20070608195302-r9304tm0yazwov8o
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 113436.1
timestamp: Fri 2007-06-08 20:53:30 +0100
message:
'help status' now points to 'help status-flags'.
------------------------------------------------------------
revno: 2520.1.2
merged: d.m.watkins at warwick.ac.uk-20070608195302-r9304tm0yazwov8o
parent: d.m.watkins at warwick.ac.uk-20070608194605-odbz8k4k40dg54c7
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 113436.1
timestamp: Fri 2007-06-08 20:53:02 +0100
message:
Added test for 'help status-flags'.
------------------------------------------------------------
revno: 2520.1.1
merged: d.m.watkins at warwick.ac.uk-20070608194605-odbz8k4k40dg54c7
parent: pqm at pqm.ubuntu.com-20070608134340-flu6dlpzyo7izrrs
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 113436.1
timestamp: Fri 2007-06-08 20:46:05 +0100
message:
Added 'help status-flags'.
=== modified file 'NEWS'
--- a/NEWS 2007-07-02 15:01:18 +0000
+++ b/NEWS 2007-07-03 00:40:04 +0000
@@ -9,6 +9,9 @@
a file that is not present in the specified revision.
(James Westby, #122656)
+ * Commands that use status flags now have a reference to 'help
+ status-flags'. (Daniel Watkins, #113436)
+
IMPROVEMENTS:
* The --lsprof-file option now dumps a text rendering of the profiling
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2007-06-28 20:50:14 +0000
+++ b/bzrlib/builtins.py 2007-07-03 00:40:04 +0000
@@ -155,23 +155,6 @@
--short gives a status flags for each item, similar to the SVN's status
command.
- Column 1: versioning / renames
- + File versioned
- - File unversioned
- R File renamed
- ? File unknown
- C File has conflicts
- P Entry for a pending merge (not a file)
-
- Column 2: Contents
- N File created
- D File deleted
- K File kind changed
- M File modified
-
- Column 3: Execute
- * The execute bit was changed
-
If no arguments are specified, the status of the entire working
directory is shown. Otherwise, only the status of the specified
files or directories is reported. If a directory is given, status
@@ -190,7 +173,7 @@
aliases = ['st', 'stat']
encoding_type = 'replace'
- _see_also = ['diff', 'revert']
+ _see_also = ['diff', 'revert', 'status-flags']
@display_command
def run(self, show_ids=False, file_list=None, revision=None, short=False,
@@ -565,7 +548,7 @@
location can be accessed.
"""
- _see_also = ['push', 'update']
+ _see_also = ['push', 'update', 'status-flags']
takes_options = ['remember', 'overwrite', 'revision', 'verbose',
Option('directory',
help='branch to pull into, '
@@ -2609,7 +2592,7 @@
--force is given.
"""
- _see_also = ['update', 'remerge']
+ _see_also = ['update', 'remerge', 'status-flags']
takes_args = ['branch?']
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
Option('show-base', help="Show base revision text in "
=== modified file 'bzrlib/help_topics.py'
--- a/bzrlib/help_topics.py 2007-06-12 14:46:46 +0000
+++ b/bzrlib/help_topics.py 2007-07-03 00:40:04 +0000
@@ -357,6 +357,32 @@
this will update the tree to match the branch.
"""
+_status_flags = \
+"""Status Flags
+
+Status flags are used to summarise changes to the working tree in a concise
+manner. They are in the form:
+ xxx <filename>
+where the columns' meanings are as follows.
+
+Column 1: versioning / renames
+ + File versioned
+ - File unversioned
+ R File renamed
+ ? File unknown
+ C File has conflicts
+ P Entry for a pending merge (not a file)
+
+Column 2: Contents
+ N File created
+ D File deleted
+ K File kind changed
+ M File modified
+
+Column 3: Execute
+ * The execute bit was changed
+"""
+
topic_registry.register("revisionspec", _help_on_revisionspec,
"Explain how to use --revision")
@@ -372,6 +398,8 @@
'Information on what a checkout is')
topic_registry.register('urlspec', _help_on_transport,
"Supported transport protocols")
+topic_registry.register('status-flags', _status_flags,
+ "Help on status flags")
def get_bugs_topic(topic):
from bzrlib import bugtracker
return bugtracker.tracker_registry.help_topic(topic)
=== modified file 'bzrlib/tests/blackbox/test_help.py'
--- a/bzrlib/tests/blackbox/test_help.py 2007-06-26 08:02:36 +0000
+++ b/bzrlib/tests/blackbox/test_help.py 2007-07-03 01:30:05 +0000
@@ -80,6 +80,11 @@
out, err = self.run_bzr('help working-trees')
self.assertEqual(bzrlib.help_topics._working_trees, out)
+ def test_help_status_flags(self):
+ """Smoke test for 'bzr help status-flags'"""
+ out, err = self.run_bzr('help status-flags')
+ self.assertEqual(bzrlib.help_topics._status_flags, out)
+
def test_help_commands(self):
dash_help = self.run_bzr('--help commands')[0]
commands = self.run_bzr('help commands')[0]
More information about the bazaar-commits
mailing list