Rev 554: Fix option help strings to comply with the style guide. in file:///v/home/vila/src/plugins/bzrtools/

Vincent Ladeuil v.ladeuil+lp at free.fr
Thu Jul 12 16:51:42 BST 2007


At file:///v/home/vila/src/plugins/bzrtools/

------------------------------------------------------------
revno: 554
revision-id: v.ladeuil+lp at free.fr-20070712155141-k6gefud377fmgpxp
parent: abentley at panoramicfeedback.com-20070710173536-5n7fhn083qa0w9s3
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzrtools
timestamp: Thu 2007-07-12 17:51:41 +0200
message:
  Fix option help strings to comply with the style guide.
modified:
  __init__.py                    __init__.py-20051019101947-f758f1a696725014
  show_paths.py                  __init__.py-20060509165031-0886cb6a6c5a2ade
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2007-06-18 20:23:45 +0000
+++ b/__init__.py	2007-07-12 15:51:41 +0000
@@ -105,12 +105,12 @@
 
     To check what clean-tree will do, use --dry-run.
     """
-    takes_options = [Option('ignored', help='delete all ignored files.'),
-                     Option('detritus', help='delete conflict files, merge'
+    takes_options = [Option('ignored', help='Delete all ignored files.'),
+                     Option('detritus', help='Delete conflict files, merge'
                             ' backups, and failed selftest dirs.'),
                      Option('unknown',
-                            help='delete files unknown to bzr.  (default)'),
-                     Option('dry-run', help='show files to delete instead of'
+                            help='Delete files unknown to bzr (default).'),
+                     Option('dry-run', help='Show files to delete instead of'
                             ' deleting them.')]
     def run(self, unknown=False, ignored=False, detritus=False, dry_run=False):
         from clean_tree import clean_tree
@@ -156,17 +156,17 @@
     be disabled with --no-antialias.
     """
     takes_args = ['file', 'merge_branch?']
-    takes_options = [Option('no-collapse', help="Do not skip simple nodes"),
+    takes_options = [Option('no-collapse', help="Do not skip simple nodes."),
                      Option('no-antialias',
-                     help="Do not use rsvg to produce antialiased output"),
+                     help="Do not use rsvg to produce antialiased output."),
                      Option('merge-branch', type=str,
-                     help="Use this branch to calcuate a merge base"),
+                     help="Use this branch to calcuate a merge base."),
                      Option('cluster', help="Use clustered output."),
                      Option('max-distance',
-                            help="Show no nodes farther than this", type=int),
+                            help="Show no nodes farther than this.", type=int),
                      Option('directory',
                             help='Source branch to use (default is current'
-                            ' directory)',
+                            ' directory).',
                             short_name='d',
                             type=unicode),
                     ]
@@ -205,7 +205,7 @@
     """
     takes_args = ['filename?']
     takes_options = [Option('strip', type=int, help=strip_help),
-                     Option('silent', help='Suppress chatter')]
+                     Option('silent', help='Suppress chatter.')]
     def run(self, filename=None, strip=None, silent=False):
         from patch import patch
         from bzrlib.workingtree import WorkingTree
@@ -247,8 +247,8 @@
 
     takes_args = ['file*']
     takes_options = ['message', 'revision',
-            Option('all', help='Shelve all changes without prompting'),
-            Option('no-color', help='Never display changes in color')]
+            Option('all', help='Shelve all changes without prompting.'),
+            Option('no-color', help='Never display changes in color.')]
 
     def run(self, all=False, file_list=None, message=None, revision=None,
             no_color=False):
@@ -382,9 +382,9 @@
     See 'shelve' for more information.
     """
     takes_options = [
-            Option('all', help='Unshelve all changes without prompting'),
-            Option('force', help='Force unshelving even if errors occur'),
-            Option('no-color', help='Never display changes in color')
+            Option('all', help='Unshelve all changes without prompting.'),
+            Option('force', help='Force unshelving even if errors occur.'),
+            Option('no-color', help='Never display changes in color.')
         ]
     takes_args = ['patch?']
     def run(self, patch=None, all=False, force=False, no_color=False):
@@ -442,8 +442,8 @@
     If --branch is specified, the branch will be deleted too, but only if the
     the branch has no new commits (relative to its parent).
     """
-    takes_options = [Option("branch", help="Remove associtated branch from"
-                                           " repository")]
+    takes_options = [Option("branch", help="Remove associated branch from"
+                                           " repository.")]
     takes_args = ["checkout"]
     def run(self, checkout, branch=False):
         from zap import zap
@@ -470,7 +470,7 @@
     deprecated.
     """
     takes_options = [Option("lightweight",
-                            help="Create a lightweight checkout"), 'revision']
+                            help="Create a lightweight checkout."), 'revision']
     takes_args = ["source", "target?"]
     def run(self, source, target=None, lightweight=False, revision=None):
         from cbranch import cbranch
@@ -538,7 +538,7 @@
     These marks can be used to track a branch's status.
     """
     takes_args = ['mark?', 'branch?']
-    takes_options = [Option('delete', help='Delete this mark')]
+    takes_options = [Option('delete', help='Delete this mark.')]
     def run(self, mark=None, branch=None, delete=False):
         from branch_mark import branch_mark
         branch_mark(mark, branch, delete)
@@ -609,7 +609,7 @@
     """
     takes_args = ['to_root_dir', 'from_archive', 'reuse_history*']
     takes_options = ['verbose', Option('prefixes', type=str,
-                     help="Prefixes of branches to import, colon-separated"),
+                     help="Prefixes of branches to import, colon-separated."),
                      Option('encoding', type=str,
                      help='Force encoding to specified value.  See WARNING.')]
 
@@ -662,7 +662,7 @@
     """
     takes_args = ['location?']
     takes_options = [Option('overwrite', help='Ignore differences between'
-                            ' branches and overwrite unconditionally'),
+                            ' branches and overwrite unconditionally.'),
                      Option('no-tree', help='Do not push the working tree,'
                             ' just the .bzr.')]
 

=== modified file 'show_paths.py'
--- a/show_paths.py	2007-03-26 16:26:09 +0000
+++ b/show_paths.py	2007-07-12 15:51:41 +0000
@@ -58,7 +58,7 @@
         * submit to   - default reference location for bundle generation
     """
 
-    takes_options = [Option('system', help='Show full bzr system information'),
+    takes_options = [Option('system', help='Show full bzr system information.'),
                     ]
     takes_args = ['branch?']
 



More information about the bazaar-commits mailing list