170
170
takes_args = ['file*']
171
171
takes_options = ['show-ids', 'revision',
172
Option('short', help='Give short SVN-style status lines'),
173
Option('versioned', help='Only show versioned files')]
172
Option('short', help='Give short SVN-style status lines.'),
173
Option('versioned', help='Only show versioned files.')]
174
174
aliases = ['st', 'stat']
176
176
encoding_type = 'replace'
341
341
takes_args = ['file*']
342
342
takes_options = ['no-recurse', 'dry-run', 'verbose',
343
343
Option('file-ids-from', type=unicode,
344
help='Lookup file ids from here')]
344
help='Lookup file ids from this tree.')]
345
345
encoding_type = 'replace'
346
346
_see_also = ['remove']
509
509
takes_args = ['names*']
510
takes_options = [Option("after", help="move only the bzr identifier"
511
" of the file (file has already been moved). Use this flag if"
512
" bzr is not able to detect this itself.")]
510
takes_options = [Option("after", help="Move only the bzr identifier"
511
" of the file, because the file has already been moved."),
513
513
aliases = ['move', 'rename']
514
514
encoding_type = 'replace'
557
557
_see_also = ['push', 'update', 'status-flags']
558
558
takes_options = ['remember', 'overwrite', 'revision', 'verbose',
559
559
Option('directory',
560
help='branch to pull into, '
561
'rather than the one containing the working directory',
560
help='Branch to pull into, '
561
'rather than the one containing the working directory.',
665
665
takes_options = ['remember', 'overwrite', 'verbose',
666
666
Option('create-prefix',
667
667
help='Create the path leading up to the branch '
668
'if it does not already exist'),
668
'if it does not already exist.'),
669
669
Option('directory',
670
help='branch to push from, '
671
'rather than the one containing the working directory',
670
help='Branch to push from, '
671
'rather than the one containing the working directory.',
675
675
Option('use-existing-dir',
676
676
help='By default push will fail if the target'
677
677
' directory exists, but does not already'
678
' have a control directory. This flag will'
678
' have a control directory. This flag will'
679
679
' allow push to proceed.'),
681
681
takes_args = ['location?']
908
908
takes_args = ['branch_location?', 'to_location?']
909
909
takes_options = ['revision',
910
910
Option('lightweight',
911
help="perform a lightweight checkout. Lightweight "
911
help="Perform a lightweight checkout. Lightweight "
912
912
"checkouts depend on access to the branch for "
913
"every operation. Normal checkouts can perform "
913
"every operation. Normal checkouts can perform "
914
914
"common operations like diff and status without "
915
915
"such access, and also support local commits."
1071
1071
takes_args = ['file*']
1072
1072
takes_options = ['verbose',
1073
Option('new', help='remove newly-added files'),
1073
Option('new', help='Remove newly-added files.'),
1074
1074
RegistryOption.from_kwargs('file-deletion-strategy',
1075
1075
'The file deletion mode to be used',
1076
1076
title='Deletion Strategy', value_switches=True, enum_switch=False,
1329
1329
takes_args = ["location"]
1330
1330
takes_options = [RegistryOption('format',
1331
1331
help='Specify a format for this repository. See'
1332
' "bzr help formats" for details',
1332
' "bzr help formats" for details.',
1333
1333
registry=bzrdir.format_registry,
1334
1334
converter=bzrdir.format_registry.make_bzrdir,
1335
1335
value_switches=True, title='Repository format'),
1336
1336
Option('no-trees',
1337
1337
help='Branches in the repository will default to'
1338
' not having a working tree'),
1338
' not having a working tree.'),
1340
1340
aliases = ["init-repo"]
1394
1394
Option('prefix', type=str,
1395
1395
short_name='p',
1396
1396
help='Set prefixes to added to old and new filenames, as '
1397
'two values separated by a colon. (eg "old/:new/")'),
1397
'two values separated by a colon. (eg "old/:new/").'),
1399
1399
aliases = ['di', 'dif']
1400
1400
encoding_type = 'exact'
1585
1585
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1587
1587
takes_args = ['location?']
1588
takes_options = [Option('forward',
1589
help='show from oldest to newest'),
1593
help='show files changed in each revision'),
1594
'show-ids', 'revision',
1598
help='show revisions whose message matches this regexp',
1601
help='limit the output to the first N revisions',
1590
help='Show from oldest to newest.'),
1594
help='Show files changed in each revision.'),
1600
help='Show revisions whose message matches this '
1601
'regular expression.',
1604
help='Limit the output to the first N revisions.',
1604
1608
encoding_type = 'replace'
1606
1610
@display_command
1719
1723
_see_also = ['status', 'cat']
1720
1724
takes_args = ['path?']
1721
1725
# TODO: Take a revision or remote path and list that tree instead.
1722
takes_options = ['verbose', 'revision',
1723
Option('non-recursive',
1724
help='don\'t recurse into sub-directories'),
1726
help='Print all paths from the root of the branch.'),
1727
Option('unknown', help='Print unknown files'),
1728
Option('versioned', help='Print versioned files'),
1729
Option('ignored', help='Print ignored files'),
1731
Option('null', help='Null separate the files'),
1729
Option('non-recursive',
1730
help='Don\'t recurse into subdirectories.'),
1732
help='Print paths relative to the root of the branch.'),
1733
Option('unknown', help='Print unknown files.'),
1734
Option('versioned', help='Print versioned files.'),
1735
Option('ignored', help='Print ignored files.'),
1737
help='Write an ascii NUL (\\0) separator '
1738
'between files rather than a newline.'),
1734
1742
@display_command
1735
1743
def run(self, revision=None, verbose=False,
1736
1744
non_recursive=False, from_root=False,
1854
1862
_see_also = ['status', 'ignored']
1855
1863
takes_args = ['name_pattern*']
1856
1864
takes_options = [
1857
Option('old-default-rules',
1858
help='Out the ignore rules bzr < 0.9 always used.')
1865
Option('old-default-rules',
1866
help='Write out the ignore rules bzr < 0.9 always used.')
1861
1869
def run(self, name_pattern_list=None, old_default_rules=None):
1862
1870
from bzrlib.atomicfile import AtomicFile
2099
2107
_see_also = ['bugs', 'uncommit']
2100
2108
takes_args = ['selected*']
2101
takes_options = ['message', 'verbose',
2103
help='commit even if nothing has changed'),
2104
Option('file', type=str,
2107
help='file containing commit message'),
2109
help="refuse to commit if there are unknown "
2110
"files in the working tree."),
2111
ListOption('fixes', type=str,
2112
help="mark a bug as being fixed by this "
2115
help="perform a local only commit in a bound "
2116
"branch. Such commits are not pushed to "
2117
"the master branch until a normal commit "
2113
help='Commit even if nothing has changed.'),
2114
Option('file', type=str,
2117
help='Take commit message from this file.'),
2119
help="Refuse to commit if there are unknown "
2120
"files in the working tree."),
2121
ListOption('fixes', type=str,
2122
help="Mark a bug as being fixed by this revision."),
2124
help="Perform a local commit in a bound "
2125
"branch. Local commits are not pushed to "
2126
"the master branch until a normal commit "
2121
2130
aliases = ['ci', 'checkin']
2123
2132
def _get_bug_fix_properties(self, fixes, branch):
2254
2263
takes_options = [
2255
2264
RegistryOption('format',
2256
2265
help='Upgrade to a specific format. See "bzr help'
2257
' formats" for details',
2266
' formats" for details.',
2258
2267
registry=bzrdir.format_registry,
2259
2268
converter=bzrdir.format_registry.make_bzrdir,
2260
2269
value_switches=True, title='Branch format'),
2275
2284
bzr whoami 'Frank Chu <fchu@example.com>'
2277
2286
takes_options = [ Option('email',
2278
help='display email address only'),
2287
help='Display email address only.'),
2279
2288
Option('branch',
2280
help='set identity for the current branch instead of '
2289
help='Set identity for the current branch instead of '
2283
2292
takes_args = ['name?']
2284
2293
encoding_type = 'replace'
2398
2407
takes_args = ['testspecs*']
2399
2408
takes_options = ['verbose',
2401
help='stop when one test fails',
2410
help='Stop when one test fails.',
2402
2411
short_name='1',
2404
2413
Option('keep-output',
2405
help='keep output directories when tests fail'),
2414
help='Keep output directories when tests fail.'),
2406
2415
Option('transport',
2407
2416
help='Use a different transport by default '
2408
2417
'throughout the test suite.',
2409
2418
type=get_transport_type),
2410
Option('benchmark', help='run the bzr benchmarks.'),
2420
help='Run the benchmarks rather than selftests.'),
2411
2421
Option('lsprof-timed',
2412
help='generate lsprof output for benchmarked'
2422
help='Generate lsprof output for benchmarked'
2413
2423
' sections of code.'),
2414
2424
Option('cache-dir', type=str,
2415
help='a directory to cache intermediate'
2416
' benchmark steps'),
2425
help='Cache intermediate benchmark output in this '
2417
2427
Option('clean-output',
2418
help='clean temporary tests directories'
2419
' without running tests'),
2428
help='Clean temporary tests directories'
2429
' without running tests.'),
2420
2430
Option('first',
2421
help='run all tests, but run specified tests first',
2431
help='Run all tests, but run specified tests first.',
2422
2432
short_name='f',
2424
2434
Option('numbered-dirs',
2425
help='use numbered dirs for TestCaseInTempDir'),
2435
help='Use numbered dirs for TestCaseInTempDir.'),
2426
2436
Option('list-only',
2427
help='list the tests instead of running them'),
2437
help='List the tests instead of running them.'),
2428
2438
Option('randomize', type=str, argname="SEED",
2429
help='randomize the order of tests using the given'
2430
' seed or "now" for the current time'),
2439
help='Randomize the order of tests using the given'
2440
' seed or "now" for the current time.'),
2431
2441
Option('exclude', type=str, argname="PATTERN",
2432
2442
short_name='x',
2433
help='exclude tests that match this regular'
2443
help='Exclude tests that match this regular'
2436
2446
encoding_type = 'replace'
2591
2601
takes_args = ['branch?']
2592
2602
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2593
2603
Option('show-base', help="Show base revision text in "
2595
2605
Option('uncommitted', help='Apply uncommitted changes'
2596
' from a working copy, instead of branch changes'),
2606
' from a working copy, instead of branch changes.'),
2597
2607
Option('pull', help='If the destination is already'
2598
2608
' completely merged into the source, pull from the'
2599
' source rather than merging. When this happens,'
2609
' source rather than merging. When this happens,'
2600
2610
' you do not need to commit the result.'),
2601
2611
Option('directory',
2602
2612
help='Branch to merge into, '
2603
'rather than the one containing the working directory',
2613
'rather than the one containing the working directory.',
2604
2614
short_name='d',
2765
2775
additional processing to reduce the size of conflict regions.
2767
2777
takes_args = ['file*']
2768
takes_options = ['merge-type', 'reprocess',
2769
Option('show-base', help="Show base revision text in "
2782
help="Show base revision text in conflicts."),
2772
2785
def run(self, file_list=None, merge_type=None, show_base=False,
2773
2786
reprocess=False):
2947
2962
_see_also = ['merge', 'pull']
2948
2963
takes_args = ['other_branch?']
2949
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2951
'Display changes in the local branch only'),
2952
Option('this' , 'same as --mine-only'),
2953
Option('theirs-only',
2954
'Display changes in the remote branch only'),
2955
Option('other', 'same as --theirs-only'),
2965
Option('reverse', 'Reverse the order of revisions.'),
2967
'Display changes in the local branch only.'),
2968
Option('this' , 'Same as --mine-only.'),
2969
Option('theirs-only',
2970
'Display changes in the remote branch only.'),
2971
Option('other', 'Same as --theirs-only.'),
2960
2976
encoding_type = 'replace'
2962
2978
@display_command
3058
3074
class cmd_testament(Command):
3059
3075
"""Show testament (signing-form) of a revision."""
3060
takes_options = ['revision',
3061
Option('long', help='Produce long-format testament'),
3062
Option('strict', help='Produce a strict-format'
3078
Option('long', help='Produce long-format testament.'),
3080
help='Produce a strict-format testament.')]
3064
3081
takes_args = ['branch?']
3065
3082
@display_command
3066
3083
def run(self, branch=u'.', revision=None, long=False, strict=False):
3099
3116
# with new uncommitted lines marked
3100
3117
aliases = ['ann', 'blame', 'praise']
3101
3118
takes_args = ['filename']
3102
takes_options = [Option('all', help='show annotations on all lines'),
3103
Option('long', help='show date in annotations'),
3119
takes_options = [Option('all', help='Show annotations on all lines.'),
3120
Option('long', help='Show commit date in annotations.'),
3236
3253
# information in shared branches as well.
3237
3254
_see_also = ['commit']
3238
3255
takes_options = ['verbose', 'revision',
3239
Option('dry-run', help='Don\'t actually make changes'),
3256
Option('dry-run', help='Don\'t actually make changes.'),
3240
3257
Option('force', help='Say yes to all questions.')]
3241
3258
takes_args = ['location?']
3347
3364
takes_options = [
3349
help='serve on stdin/out for use from inetd or sshd'),
3366
help='Serve on stdin/out for use from inetd or sshd.'),
3351
help='listen for connections on nominated port of the form '
3352
'[hostname:]portnumber. Passing 0 as the port number will '
3353
'result in a dynamically allocated port. Default port is '
3368
help='Listen for connections on nominated port of the form '
3369
'[hostname:]portnumber. Passing 0 as the port number will '
3370
'result in a dynamically allocated port. The default port is '
3356
3373
Option('directory',
3357
help='serve contents of directory',
3374
help='Serve contents of this directory.',
3359
3376
Option('allow-writes',
3360
help='By default the server is a readonly server. Supplying '
3377
help='By default the server is a readonly server. Supplying '
3361
3378
'--allow-writes enables write access to the contents of '
3362
'the served directory and below. '
3379
'the served directory and below.'
3506
3525
takes_options = [
3507
3526
RegistryOption.from_kwargs('patch-type',
3508
3527
'The type of patch to include in the directive',
3509
title='Patch type', value_switches=True, enum_switch=False,
3510
bundle='Bazaar revision bundle (default)',
3511
diff='Normal unified diff',
3512
plain='No patch, just directive'),
3513
Option('sign', help='GPG-sign the directive'), 'revision',
3529
value_switches=True,
3531
bundle='Bazaar revision bundle (default).',
3532
diff='Normal unified diff.',
3533
plain='No patch, just directive.'),
3534
Option('sign', help='GPG-sign the directive.'), 'revision',
3514
3535
Option('mail-to', type=str,
3515
help='Instead of printing the directive, email to this address'),
3536
help='Instead of printing the directive, email to this address.'),
3516
3537
Option('message', type=str, short_name='m',
3517
help='Message to use when committing this merge')
3538
help='Message to use when committing this merge.')
3520
3541
encoding_type = 'exact'