/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Parth Malwankar
  • Date: 2010-05-05 02:38:26 UTC
  • mto: This revision was merged to the branch mainline in revision 5216.
  • Revision ID: parth.malwankar@gmail.com-20100505023826-1stjc3ggho0f8rxy
cosmetic fix as per coding practice.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2028
2028
 
2029
2029
    hidden = True
2030
2030
    _see_also = ['status', 'ls']
2031
 
    takes_options = [
2032
 
            Option('null',
2033
 
                   help='Write an ascii NUL (\\0) separator '
2034
 
                   'between files rather than a newline.')
2035
 
            ]
 
2031
    takes_options = ['null']
2036
2032
 
2037
2033
    @display_command
2038
2034
    def run(self, null=False):
2051
2047
 
2052
2048
    hidden = True
2053
2049
    _see_also = ['status', 'ls']
2054
 
    takes_options = [
2055
 
            Option('null',
2056
 
                   help='Write an ascii NUL (\\0) separator '
2057
 
                   'between files rather than a newline.')
2058
 
            ]
 
2050
    takes_options = ['null']
2059
2051
 
2060
2052
    @display_command
2061
2053
    def run(self, null=False):
2528
2520
                   help='Recurse into subdirectories.'),
2529
2521
            Option('from-root',
2530
2522
                   help='Print paths relative to the root of the branch.'),
2531
 
            Option('unknown', help='Print unknown files.'),
 
2523
            Option('unknown', short_name='u',
 
2524
                help='Print unknown files.'),
2532
2525
            Option('versioned', help='Print versioned files.',
2533
2526
                   short_name='V'),
2534
 
            Option('ignored', help='Print ignored files.'),
2535
 
            Option('null',
2536
 
                   help='Write an ascii NUL (\\0) separator '
2537
 
                   'between files rather than a newline.'),
2538
 
            Option('kind',
 
2527
            Option('ignored', short_name='i',
 
2528
                help='Print ignored files.'),
 
2529
            Option('kind', short_name='k',
2539
2530
                   help='List entries of a particular kind: file, directory, symlink.',
2540
2531
                   type=unicode),
 
2532
            'null',
2541
2533
            'show-ids',
2542
2534
            ]
2543
2535
    @display_command
3073
3065
                         "the master branch until a normal commit "
3074
3066
                         "is performed."
3075
3067
                    ),
3076
 
             Option('show-diff', short_name='p',
 
3068
             Option('show-diff',
3077
3069
                    help='When no message is supplied, show the diff along'
3078
3070
                    ' with the status summary in the message editor.'),
3079
3071
             ]
4681
4673
 
4682
4674
class cmd_bind(Command):
4683
4675
    __doc__ = """Convert the current branch into a checkout of the supplied branch.
4684
 
    If no branch is supplied, rebind to the last bound location.
4685
4676
 
4686
4677
    Once converted into a checkout, commits must succeed on the master branch
4687
4678
    before they will be applied to the local branch.