← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-07-11 04:19:50 UTC
  • mfrom: (2598.1.5 check-options)
  • Revision ID: pqm@pqm.ubuntu.com-20070711041950-ci5yz9nyhbcdmuqv
(mbp,r=jamesw,r=aaron) Make option grammar consistent and enforce that with a test

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
56
56
 
57
57
    See also bzr resolve.
58
58
    """
59
 
    takes_options = [Option('text', help='list text conflicts by pathname')]
 
59
    takes_options = [
 
60
            Option('text',
 
61
                   help='List paths of files with text conflicts.'),
 
62
        ]
60
63
 
61
64
    def run(self, text=False):
62
65
        from bzrlib.workingtree import WorkingTree
86
89
    """
87
90
    aliases = ['resolved']
88
91
    takes_args = ['file*']
89
 
    takes_options = [Option('all', help='Resolve all conflicts in this tree')]
 
92
    takes_options = [
 
93
            Option('all', help='Resolve all conflicts in this tree.'),
 
94
            ]
90
95
    def run(self, file_list=None, all=False):
91
96
        from bzrlib.workingtree import WorkingTree
92
97
        if all: