← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Aaron Bentley
  • Date: 2007-07-12 20:55:33 UTC
  • mfrom: (553.1.1 bzrtools)
  • Revision ID: abentley@panoramicfeedback.com-20070712205533-ael98t8ly97zuba3
Merge option help fixes from vila

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
105
105
 
106
106
    To check what clean-tree will do, use --dry-run.
107
107
    """
108
 
    takes_options = [Option('ignored', help='delete all ignored files.'),
109
 
                     Option('detritus', help='delete conflict files, merge'
 
108
    takes_options = [Option('ignored', help='Delete all ignored files.'),
 
109
                     Option('detritus', help='Delete conflict files, merge'
110
110
                            ' backups, and failed selftest dirs.'),
111
111
                     Option('unknown',
112
 
                            help='delete files unknown to bzr.  (default)'),
113
 
                     Option('dry-run', help='show files to delete instead of'
 
112
                            help='Delete files unknown to bzr (default).'),
 
113
                     Option('dry-run', help='Show files to delete instead of'
114
114
                            ' deleting them.')]
115
115
    def run(self, unknown=False, ignored=False, detritus=False, dry_run=False):
116
116
        from clean_tree import clean_tree
156
156
    be disabled with --no-antialias.
157
157
    """
158
158
    takes_args = ['file', 'merge_branch?']
159
 
    takes_options = [Option('no-collapse', help="Do not skip simple nodes"),
 
159
    takes_options = [Option('no-collapse', help="Do not skip simple nodes."),
160
160
                     Option('no-antialias',
161
 
                     help="Do not use rsvg to produce antialiased output"),
 
161
                     help="Do not use rsvg to produce antialiased output."),
162
162
                     Option('merge-branch', type=str,
163
 
                     help="Use this branch to calcuate a merge base"),
 
163
                     help="Use this branch to calcuate a merge base."),
164
164
                     Option('cluster', help="Use clustered output."),
165
165
                     Option('max-distance',
166
 
                            help="Show no nodes farther than this", type=int),
 
166
                            help="Show no nodes farther than this.", type=int),
167
167
                     Option('directory',
168
168
                            help='Source branch to use (default is current'
169
 
                            ' directory)',
 
169
                            ' directory).',
170
170
                            short_name='d',
171
171
                            type=unicode),
172
172
                    ]
205
205
    """
206
206
    takes_args = ['filename?']
207
207
    takes_options = [Option('strip', type=int, help=strip_help),
208
 
                     Option('silent', help='Suppress chatter')]
 
208
                     Option('silent', help='Suppress chatter.')]
209
209
    def run(self, filename=None, strip=None, silent=False):
210
210
        from patch import patch
211
211
        from bzrlib.workingtree import WorkingTree
250
250
            help='A message to associate with the shelved changes.',
251
251
            short_name='m'),
252
252
            'revision',
253
 
            Option('all', help='Shelve all changes without prompting'),
254
 
            Option('no-color', help='Never display changes in color')]
 
253
            Option('all', help='Shelve all changes without prompting.'),
 
254
            Option('no-color', help='Never display changes in color.')]
255
255
 
256
256
    def run(self, all=False, file_list=None, message=None, revision=None,
257
257
            no_color=False):
385
385
    See 'shelve' for more information.
386
386
    """
387
387
    takes_options = [
388
 
            Option('all', help='Unshelve all changes without prompting'),
389
 
            Option('force', help='Force unshelving even if errors occur'),
390
 
            Option('no-color', help='Never display changes in color')
 
388
            Option('all', help='Unshelve all changes without prompting.'),
 
389
            Option('force', help='Force unshelving even if errors occur.'),
 
390
            Option('no-color', help='Never display changes in color.')
391
391
        ]
392
392
    takes_args = ['patch?']
393
393
    def run(self, patch=None, all=False, force=False, no_color=False):
445
445
    If --branch is specified, the branch will be deleted too, but only if the
446
446
    the branch has no new commits (relative to its parent).
447
447
    """
448
 
    takes_options = [Option("branch", help="Remove associtated branch from"
449
 
                                           " repository")]
 
448
    takes_options = [Option("branch", help="Remove associated branch from"
 
449
                                           " repository.")]
450
450
    takes_args = ["checkout"]
451
451
    def run(self, checkout, branch=False):
452
452
        from zap import zap
473
473
    deprecated.
474
474
    """
475
475
    takes_options = [Option("lightweight",
476
 
                            help="Create a lightweight checkout"), 'revision']
 
476
                            help="Create a lightweight checkout."), 'revision']
477
477
    takes_args = ["source", "target?"]
478
478
    def run(self, source, target=None, lightweight=False, revision=None):
479
479
        from cbranch import cbranch
541
541
    These marks can be used to track a branch's status.
542
542
    """
543
543
    takes_args = ['mark?', 'branch?']
544
 
    takes_options = [Option('delete', help='Delete this mark')]
 
544
    takes_options = [Option('delete', help='Delete this mark.')]
545
545
    def run(self, mark=None, branch=None, delete=False):
546
546
        from branch_mark import branch_mark
547
547
        branch_mark(mark, branch, delete)
612
612
    """
613
613
    takes_args = ['to_root_dir', 'from_archive', 'reuse_history*']
614
614
    takes_options = ['verbose', Option('prefixes', type=str,
615
 
                     help="Prefixes of branches to import, colon-separated"),
 
615
                     help="Prefixes of branches to import, colon-separated."),
616
616
                     Option('encoding', type=str,
617
617
                     help='Force encoding to specified value.  See WARNING.')]
618
618
 
665
665
    """
666
666
    takes_args = ['location?']
667
667
    takes_options = [Option('overwrite', help='Ignore differences between'
668
 
                            ' branches and overwrite unconditionally'),
 
668
                            ' branches and overwrite unconditionally.'),
669
669
                     Option('no-tree', help='Do not push the working tree,'
670
670
                            ' just the .bzr.')]
671
671