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
- browse files at revision 4797.23.1
- compare with another revision
- download diff
- download tarball
- view history from revision 4797.23.1
- Committer: Ian Clatworthy
- Date: 2010-02-19 05:08:31 UTC
- mfrom: (4797.22.2 whats-new)
- mto: (4797.2.20 2.1)
- mto: This revision was merged to the branch mainline in revision 5055.
- Revision ID: ian.clatworthy@canonical.com-20100219050831-9mpmhon76n6omda1
(igc) What's New in Bazaar 2.1 document
- files added:
- bzrlib/help_topics/es
- files removed:
- .testr.conf
- apport
- bzrlib/help_topics/es
- bzrlib/tests/per_bzrdir_colo
- files renamed:
- bzrlib/help_topics/es/conflict-types.txt => bzrlib/help_topics/es/conflicts.txt
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
54
54
)
55
55
from bzrlib.branch import Branch
56
56
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
57
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
58
from bzrlib.smtp_connection import SMTPConnection
60
59
from bzrlib.workingtree import WorkingTree
61
60
""")
62
61
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
62
from bzrlib.commands import Command, display_command
68
63
from bzrlib.option import (
69
64
ListOption,
70
65
Option,
232
227
return view_info
233
228
234
229
235
def _open_directory_or_containing_tree_or_branch(filename, directory):
236
"""Open the tree or branch containing the specified file, unless
237
the --directory option is used to specify a different branch."""
238
if directory is not None:
239
return (None, Branch.open(directory), filename)
240
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
241
242
243
230
# TODO: Make sure no commands unconditionally use the working directory as a
244
231
# branch. If a filename argument is used, the first of them should be used to
245
232
# specify the branch. (Perhaps this can be factored out into some kind of
247
234
# opens the branch?)
248
235
249
236
class cmd_status(Command):
250
__doc__ = """Display status summary.
237
"""Display status summary.
251
238
252
239
This reports on versioned and unknown files, reporting them
253
240
grouped by state. Possible states are:
340
327
341
328
342
329
class cmd_cat_revision(Command):
343
__doc__ = """Write out metadata for a revision.
330
"""Write out metadata for a revision.
344
331
345
332
The revision to print can either be specified by a specific
346
333
revision identifier, or you can use --revision.
348
335
349
336
hidden = True
350
337
takes_args = ['revision_id?']
351
takes_options = ['directory', 'revision']
338
takes_options = ['revision']
352
339
# cat-revision is more for frontends so should be exact
353
340
encoding = 'strict'
354
341
355
def print_revision(self, revisions, revid):
356
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
357
record = stream.next()
358
if record.storage_kind == 'absent':
359
raise errors.NoSuchRevision(revisions, revid)
360
revtext = record.get_bytes_as('fulltext')
361
self.outf.write(revtext.decode('utf-8'))
362
363
342
@display_command
364
def run(self, revision_id=None, revision=None, directory=u'.'):
343
def run(self, revision_id=None, revision=None):
365
344
if revision_id is not None and revision is not None:
366
345
raise errors.BzrCommandError('You can only supply one of'
367
346
' revision_id or --revision')
368
347
if revision_id is None and revision is None:
369
348
raise errors.BzrCommandError('You must supply either'
370
349
' --revision or a revision_id')
371
b = WorkingTree.open_containing(directory)[0].branch
372
373
revisions = b.repository.revisions
374
if revisions is None:
375
raise errors.BzrCommandError('Repository %r does not support '
376
'access to raw revision texts')
377
378
b.repository.lock_read()
379
try:
380
# TODO: jam 20060112 should cat-revision always output utf-8?
381
if revision_id is not None:
382
revision_id = osutils.safe_revision_id(revision_id, warn=False)
383
try:
384
self.print_revision(revisions, revision_id)
385
except errors.NoSuchRevision:
386
msg = "The repository %s contains no revision %s." % (
387
b.repository.base, revision_id)
388
raise errors.BzrCommandError(msg)
389
elif revision is not None:
390
for rev in revision:
391
if rev is None:
392
raise errors.BzrCommandError(
393
'You cannot specify a NULL revision.')
394
rev_id = rev.as_revision_id(b)
395
self.print_revision(revisions, rev_id)
396
finally:
397
b.repository.unlock()
398
350
b = WorkingTree.open_containing(u'.')[0].branch
351
352
# TODO: jam 20060112 should cat-revision always output utf-8?
353
if revision_id is not None:
354
revision_id = osutils.safe_revision_id(revision_id, warn=False)
355
try:
356
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
357
except errors.NoSuchRevision:
358
msg = "The repository %s contains no revision %s." % (b.repository.base,
359
revision_id)
360
raise errors.BzrCommandError(msg)
361
elif revision is not None:
362
for rev in revision:
363
if rev is None:
364
raise errors.BzrCommandError('You cannot specify a NULL'
365
' revision.')
366
rev_id = rev.as_revision_id(b)
367
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
368
399
369
400
370
class cmd_dump_btree(Command):
401
__doc__ = """Dump the contents of a btree index file to stdout.
371
"""Dump the contents of a btree index file to stdout.
402
372
403
373
PATH is a btree index file, it can be any URL. This includes things like
404
374
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
468
438
for node in bt.iter_all_entries():
469
439
# Node is made up of:
470
440
# (index, key, value, [references])
471
try:
472
refs = node[3]
473
except IndexError:
474
refs_as_tuples = None
475
else:
476
refs_as_tuples = static_tuple.as_tuples(refs)
441
refs_as_tuples = static_tuple.as_tuples(node[3])
477
442
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
478
443
self.outf.write('%s\n' % (as_tuple,))
479
444
480
445
481
446
class cmd_remove_tree(Command):
482
__doc__ = """Remove the working tree from a given branch/checkout.
447
"""Remove the working tree from a given branch/checkout.
483
448
484
449
Since a lightweight checkout is little more than a working tree
485
450
this will refuse to run against one.
487
452
To re-create the working tree, use "bzr checkout".
488
453
"""
489
454
_see_also = ['checkout', 'working-trees']
490
takes_args = ['location*']
455
takes_args = ['location?']
491
456
takes_options = [
492
457
Option('force',
493
458
help='Remove the working tree even if it has '
494
459
'uncommitted changes.'),
495
460
]
496
461
497
def run(self, location_list, force=False):
498
if not location_list:
499
location_list=['.']
500
501
for location in location_list:
502
d = bzrdir.BzrDir.open(location)
503
504
try:
505
working = d.open_workingtree()
506
except errors.NoWorkingTree:
507
raise errors.BzrCommandError("No working tree to remove")
508
except errors.NotLocalUrl:
509
raise errors.BzrCommandError("You cannot remove the working tree"
510
" of a remote path")
511
if not force:
512
if (working.has_changes()):
513
raise errors.UncommittedChanges(working)
514
515
if working.user_url != working.branch.user_url:
516
raise errors.BzrCommandError("You cannot remove the working tree"
517
" from a lightweight checkout")
518
519
d.destroy_workingtree()
462
def run(self, location='.', force=False):
463
d = bzrdir.BzrDir.open(location)
464
465
try:
466
working = d.open_workingtree()
467
except errors.NoWorkingTree:
468
raise errors.BzrCommandError("No working tree to remove")
469
except errors.NotLocalUrl:
470
raise errors.BzrCommandError("You cannot remove the working tree"
471
" of a remote path")
472
if not force:
473
if (working.has_changes()):
474
raise errors.UncommittedChanges(working)
475
476
working_path = working.bzrdir.root_transport.base
477
branch_path = working.branch.bzrdir.root_transport.base
478
if working_path != branch_path:
479
raise errors.BzrCommandError("You cannot remove the working tree"
480
" from a lightweight checkout")
481
482
d.destroy_workingtree()
520
483
521
484
522
485
class cmd_revno(Command):
523
__doc__ = """Show current revision number.
486
"""Show current revision number.
524
487
525
488
This is equal to the number of revisions on this branch.
526
489
"""
536
499
if tree:
537
500
try:
538
501
wt = WorkingTree.open_containing(location)[0]
539
self.add_cleanup(wt.lock_read().unlock)
502
wt.lock_read()
540
503
except (errors.NoWorkingTree, errors.NotLocalUrl):
541
504
raise errors.NoWorkingTree(location)
505
self.add_cleanup(wt.unlock)
542
506
revid = wt.last_revision()
543
507
try:
544
508
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
547
511
revno = ".".join(str(n) for n in revno_t)
548
512
else:
549
513
b = Branch.open_containing(location)[0]
550
self.add_cleanup(b.lock_read().unlock)
514
b.lock_read()
515
self.add_cleanup(b.unlock)
551
516
revno = b.revno()
552
517
self.cleanup_now()
553
518
self.outf.write(str(revno) + '\n')
554
519
555
520
556
521
class cmd_revision_info(Command):
557
__doc__ = """Show revision number and revision id for a given revision identifier.
522
"""Show revision number and revision id for a given revision identifier.
558
523
"""
559
524
hidden = True
560
525
takes_args = ['revision_info*']
561
526
takes_options = [
562
527
'revision',
563
custom_help('directory',
528
Option('directory',
564
529
help='Branch to examine, '
565
'rather than the one containing the working directory.'),
530
'rather than the one containing the working directory.',
531
short_name='d',
532
type=unicode,
533
),
566
534
Option('tree', help='Show revno of working tree'),
567
535
]
568
536
573
541
try:
574
542
wt = WorkingTree.open_containing(directory)[0]
575
543
b = wt.branch
576
self.add_cleanup(wt.lock_read().unlock)
544
wt.lock_read()
545
self.add_cleanup(wt.unlock)
577
546
except (errors.NoWorkingTree, errors.NotLocalUrl):
578
547
wt = None
579
548
b = Branch.open_containing(directory)[0]
580
self.add_cleanup(b.lock_read().unlock)
549
b.lock_read()
550
self.add_cleanup(b.unlock)
581
551
revision_ids = []
582
552
if revision is not None:
583
553
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
611
581
612
582
613
583
class cmd_add(Command):
614
__doc__ = """Add specified files or directories.
584
"""Add specified files or directories.
615
585
616
586
In non-recursive mode, all the named items are added, regardless
617
587
of whether they were previously ignored. A warning is given if
682
652
should_print=(not is_quiet()))
683
653
684
654
if base_tree:
685
self.add_cleanup(base_tree.lock_read().unlock)
655
base_tree.lock_read()
656
self.add_cleanup(base_tree.unlock)
686
657
tree, file_list = tree_files_for_add(file_list)
687
658
added, ignored = tree.smart_add(file_list, not
688
659
no_recurse, action=action, save=not dry_run)
696
667
697
668
698
669
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
670
"""Create a new versioned directory.
700
671
701
672
This is equivalent to creating the directory and then adding it.
702
673
"""
706
677
707
678
def run(self, dir_list):
708
679
for d in dir_list:
680
os.mkdir(d)
709
681
wt, dd = WorkingTree.open_containing(d)
710
base = os.path.dirname(dd)
711
id = wt.path2id(base)
712
if id != None:
713
os.mkdir(d)
714
wt.add([dd])
715
self.outf.write('added %s\n' % d)
716
else:
717
raise errors.NotVersionedError(path=base)
682
wt.add([dd])
683
self.outf.write('added %s\n' % d)
718
684
719
685
720
686
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
687
"""Show path of a file relative to root"""
722
688
723
689
takes_args = ['filename']
724
690
hidden = True
733
699
734
700
735
701
class cmd_inventory(Command):
736
__doc__ = """Show inventory of the current working copy or a revision.
702
"""Show inventory of the current working copy or a revision.
737
703
738
704
It is possible to limit the output to a particular entry
739
705
type using the --kind option. For example: --kind file.
760
726
761
727
revision = _get_one_revision('inventory', revision)
762
728
work_tree, file_list = tree_files(file_list)
763
self.add_cleanup(work_tree.lock_read().unlock)
729
work_tree.lock_read()
730
self.add_cleanup(work_tree.unlock)
764
731
if revision is not None:
765
732
tree = revision.as_tree(work_tree.branch)
766
733
767
734
extra_trees = [work_tree]
768
self.add_cleanup(tree.lock_read().unlock)
735
tree.lock_read()
736
self.add_cleanup(tree.unlock)
769
737
else:
770
738
tree = work_tree
771
739
extra_trees = []
792
760
793
761
794
762
class cmd_mv(Command):
795
__doc__ = """Move or rename a file.
763
"""Move or rename a file.
796
764
797
765
:Usage:
798
766
bzr mv OLDNAME NEWNAME
831
799
if len(names_list) < 2:
832
800
raise errors.BzrCommandError("missing file argument")
833
801
tree, rel_names = tree_files(names_list, canonicalize=False)
834
self.add_cleanup(tree.lock_tree_write().unlock)
802
tree.lock_tree_write()
803
self.add_cleanup(tree.unlock)
835
804
self._run(tree, names_list, rel_names, after)
836
805
837
806
def run_auto(self, names_list, after, dry_run):
842
811
raise errors.BzrCommandError('--after cannot be specified with'
843
812
' --auto.')
844
813
work_tree, file_list = tree_files(names_list, default_branch='.')
845
self.add_cleanup(work_tree.lock_tree_write().unlock)
814
work_tree.lock_tree_write()
815
self.add_cleanup(work_tree.unlock)
846
816
rename_map.RenameMap.guess_renames(work_tree, dry_run)
847
817
848
818
def _run(self, tree, names_list, rel_names, after):
927
897
928
898
929
899
class cmd_pull(Command):
930
__doc__ = """Turn this branch into a mirror of another branch.
900
"""Turn this branch into a mirror of another branch.
931
901
932
902
By default, this command only works on branches that have not diverged.
933
903
Branches are considered diverged if the destination branch's most recent
956
926
takes_options = ['remember', 'overwrite', 'revision',
957
927
custom_help('verbose',
958
928
help='Show logs of pulled revisions.'),
959
custom_help('directory',
929
Option('directory',
960
930
help='Branch to pull into, '
961
'rather than the one containing the working directory.'),
931
'rather than the one containing the working directory.',
932
short_name='d',
933
type=unicode,
934
),
962
935
Option('local',
963
936
help="Perform a local pull in a bound "
964
937
"branch. Local pulls are not applied to "
979
952
try:
980
953
tree_to = WorkingTree.open_containing(directory)[0]
981
954
branch_to = tree_to.branch
982
self.add_cleanup(tree_to.lock_write().unlock)
983
955
except errors.NoWorkingTree:
984
956
tree_to = None
985
957
branch_to = Branch.open_containing(directory)[0]
986
self.add_cleanup(branch_to.lock_write().unlock)
987
958
988
959
if local and not branch_to.get_bound_location():
989
960
raise errors.LocalRequiresBoundBranch()
990
961
1020
991
else:
1021
992
branch_from = Branch.open(location,
1022
993
possible_transports=possible_transports)
1023
self.add_cleanup(branch_from.lock_read().unlock)
1024
994
1025
995
if branch_to.get_parent() is None or remember:
1026
996
branch_to.set_parent(branch_from.base)
1027
997
998
if branch_from is not branch_to:
999
branch_from.lock_read()
1000
self.add_cleanup(branch_from.unlock)
1028
1001
if revision is not None:
1029
1002
revision_id = revision.as_revision_id(branch_from)
1030
1003
1004
branch_to.lock_write()
1005
self.add_cleanup(branch_to.unlock)
1031
1006
if tree_to is not None:
1032
1007
view_info = _get_view_info_for_change_reporter(tree_to)
1033
1008
change_reporter = delta._ChangeReporter(
1048
1023
1049
1024
1050
1025
class cmd_push(Command):
1051
__doc__ = """Update a mirror of this branch.
1026
"""Update a mirror of this branch.
1052
1027
1053
1028
The target branch will not have its working tree populated because this
1054
1029
is both expensive, and is not supported on remote file systems.
1078
1053
Option('create-prefix',
1079
1054
help='Create the path leading up to the branch '
1080
1055
'if it does not already exist.'),
1081
custom_help('directory',
1056
Option('directory',
1082
1057
help='Branch to push from, '
1083
'rather than the one containing the working directory.'),
1058
'rather than the one containing the working directory.',
1059
short_name='d',
1060
type=unicode,
1061
),
1084
1062
Option('use-existing-dir',
1085
1063
help='By default push will fail if the target'
1086
1064
' directory exists, but does not already'
1112
1090
# Get the source branch
1113
1091
(tree, br_from,
1114
1092
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1093
if strict is None:
1094
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1095
if strict is None: strict = True # default value
1115
1096
# Get the tip's revision_id
1116
1097
revision = _get_one_revision('push', revision)
1117
1098
if revision is not None:
1118
1099
revision_id = revision.in_history(br_from).rev_id
1119
1100
else:
1120
1101
revision_id = None
1121
if tree is not None and revision_id is None:
1122
tree.check_changed_or_out_of_date(
1123
strict, 'push_strict',
1124
more_error='Use --no-strict to force the push.',
1125
more_warning='Uncommitted changes will not be pushed.')
1102
if strict and tree is not None and revision_id is None:
1103
if (tree.has_changes()):
1104
raise errors.UncommittedChanges(
1105
tree, more='Use --no-strict to force the push.')
1106
if tree.last_revision() != tree.branch.last_revision():
1107
# The tree has lost sync with its branch, there is little
1108
# chance that the user is aware of it but he can still force
1109
# the push with --no-strict
1110
raise errors.OutOfDateTree(
1111
tree, more='Use --no-strict to force the push.')
1112
1126
1113
# Get the stacked_on branch, if any
1127
1114
if stacked_on is not None:
1128
1115
stacked_on = urlutils.normalize_url(stacked_on)
1160
1147
1161
1148
1162
1149
class cmd_branch(Command):
1163
__doc__ = """Create a new branch that is a copy of an existing branch.
1150
"""Create a new branch that is a copy of an existing branch.
1164
1151
1165
1152
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1166
1153
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1206
1193
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1207
1194
from_location)
1208
1195
revision = _get_one_revision('branch', revision)
1209
self.add_cleanup(br_from.lock_read().unlock)
1196
br_from.lock_read()
1197
self.add_cleanup(br_from.unlock)
1210
1198
if revision is not None:
1211
1199
revision_id = revision.as_revision_id(br_from)
1212
1200
else:
1272
1260
1273
1261
1274
1262
class cmd_checkout(Command):
1275
__doc__ = """Create a new checkout of an existing branch.
1263
"""Create a new checkout of an existing branch.
1276
1264
1277
1265
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1278
1266
the branch found in '.'. This is useful if you have removed the working tree
1336
1324
except errors.NoWorkingTree:
1337
1325
source.bzrdir.create_workingtree(revision_id)
1338
1326
return
1339
1340
if not lightweight:
1341
message = ('Copying history to "%s". '
1342
'To checkout without local history use --lightweight.' % to_location)
1343
ui.ui_factory.show_message(message)
1344
1327
source.create_checkout(to_location, revision_id, lightweight,
1345
1328
accelerator_tree, hardlink)
1346
1329
1347
1330
1348
1331
class cmd_renames(Command):
1349
__doc__ = """Show list of renamed files.
1332
"""Show list of renamed files.
1350
1333
"""
1351
1334
# TODO: Option to show renames between two historical versions.
1352
1335
1357
1340
@display_command
1358
1341
def run(self, dir=u'.'):
1359
1342
tree = WorkingTree.open_containing(dir)[0]
1360
self.add_cleanup(tree.lock_read().unlock)
1343
tree.lock_read()
1344
self.add_cleanup(tree.unlock)
1361
1345
new_inv = tree.inventory
1362
1346
old_tree = tree.basis_tree()
1363
self.add_cleanup(old_tree.lock_read().unlock)
1347
old_tree.lock_read()
1348
self.add_cleanup(old_tree.unlock)
1364
1349
old_inv = old_tree.inventory
1365
1350
renames = []
1366
1351
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1376
1361
1377
1362
1378
1363
class cmd_update(Command):
1379
__doc__ = """Update a tree to have the latest code committed to its branch.
1364
"""Update a tree to have the latest code committed to its branch.
1380
1365
1381
1366
This will perform a merge into the working tree, and may generate
1382
1367
conflicts. If you have any local changes, you will still
1404
1389
master = branch.get_master_branch(
1405
1390
possible_transports=possible_transports)
1406
1391
if master is not None:
1392
tree.lock_write()
1407
1393
branch_location = master.base
1408
tree.lock_write()
1409
1394
else:
1395
tree.lock_tree_write()
1410
1396
branch_location = tree.branch.base
1411
tree.lock_tree_write()
1412
1397
self.add_cleanup(tree.unlock)
1413
1398
# get rid of the final '/' and be ready for display
1414
branch_location = urlutils.unescape_for_display(
1415
branch_location.rstrip('/'),
1416
self.outf.encoding)
1399
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1400
self.outf.encoding)
1417
1401
existing_pending_merges = tree.get_parent_ids()[1:]
1418
1402
if master is None:
1419
1403
old_tip = None
1427
1411
else:
1428
1412
revision_id = branch.last_revision()
1429
1413
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1430
revno = branch.revision_id_to_dotted_revno(revision_id)
1431
note("Tree is up to date at revision %s of branch %s" %
1432
('.'.join(map(str, revno)), branch_location))
1414
revno = branch.revision_id_to_revno(revision_id)
1415
note("Tree is up to date at revision %d of branch %s" %
1416
(revno, branch_location))
1433
1417
return 0
1434
1418
view_info = _get_view_info_for_change_reporter(tree)
1435
1419
change_reporter = delta._ChangeReporter(
1447
1431
"bzr update --revision only works"
1448
1432
" for a revision in the branch history"
1449
1433
% (e.revision))
1450
revno = tree.branch.revision_id_to_dotted_revno(
1434
revno = tree.branch.revision_id_to_revno(
1451
1435
_mod_revision.ensure_null(tree.last_revision()))
1452
note('Updated to revision %s of branch %s' %
1453
('.'.join(map(str, revno)), branch_location))
1454
parent_ids = tree.get_parent_ids()
1455
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1436
note('Updated to revision %d of branch %s' %
1437
(revno, branch_location))
1438
if tree.get_parent_ids()[1:] != existing_pending_merges:
1456
1439
note('Your local commits will now show as pending merges with '
1457
1440
"'bzr status', and can be committed with 'bzr commit'.")
1458
1441
if conflicts != 0:
1462
1445
1463
1446
1464
1447
class cmd_info(Command):
1465
__doc__ = """Show information about a working tree, branch or repository.
1448
"""Show information about a working tree, branch or repository.
1466
1449
1467
1450
This command will show all known locations and formats associated to the
1468
1451
tree, branch or repository.
1506
1489
1507
1490
1508
1491
class cmd_remove(Command):
1509
__doc__ = """Remove files or directories.
1492
"""Remove files or directories.
1510
1493
1511
1494
This makes bzr stop tracking changes to the specified files. bzr will delete
1512
1495
them if they can easily be recovered using revert. If no options or
1534
1517
if file_list is not None:
1535
1518
file_list = [f for f in file_list]
1536
1519
1537
self.add_cleanup(tree.lock_write().unlock)
1520
tree.lock_write()
1521
self.add_cleanup(tree.unlock)
1538
1522
# Heuristics should probably all move into tree.remove_smart or
1539
1523
# some such?
1540
1524
if new:
1559
1543
1560
1544
1561
1545
class cmd_file_id(Command):
1562
__doc__ = """Print file_id of a particular file or directory.
1546
"""Print file_id of a particular file or directory.
1563
1547
1564
1548
The file_id is assigned when the file is first added and remains the
1565
1549
same through all revisions where the file exists, even when it is
1581
1565
1582
1566
1583
1567
class cmd_file_path(Command):
1584
__doc__ = """Print path of file_ids to a file or directory.
1568
"""Print path of file_ids to a file or directory.
1585
1569
1586
1570
This prints one line for each directory down to the target,
1587
1571
starting at the branch root.
1603
1587
1604
1588
1605
1589
class cmd_reconcile(Command):
1606
__doc__ = """Reconcile bzr metadata in a branch.
1590
"""Reconcile bzr metadata in a branch.
1607
1591
1608
1592
This can correct data mismatches that may have been caused by
1609
1593
previous ghost operations or bzr upgrades. You should only
1631
1615
1632
1616
1633
1617
class cmd_revision_history(Command):
1634
__doc__ = """Display the list of revision ids on a branch."""
1618
"""Display the list of revision ids on a branch."""
1635
1619
1636
1620
_see_also = ['log']
1637
1621
takes_args = ['location?']
1647
1631
1648
1632
1649
1633
class cmd_ancestry(Command):
1650
__doc__ = """List all revisions merged into this branch."""
1634
"""List all revisions merged into this branch."""
1651
1635
1652
1636
_see_also = ['log', 'revision-history']
1653
1637
takes_args = ['location?']
1672
1656
1673
1657
1674
1658
class cmd_init(Command):
1675
__doc__ = """Make a directory into a versioned branch.
1659
"""Make a directory into a versioned branch.
1676
1660
1677
1661
Use this to create an empty branch, or before importing an
1678
1662
existing project.
1781
1765
1782
1766
1783
1767
class cmd_init_repository(Command):
1784
__doc__ = """Create a shared repository for branches to share storage space.
1768
"""Create a shared repository for branches to share storage space.
1785
1769
1786
1770
New branches created under the repository directory will store their
1787
1771
revisions in the repository, not in the branch directory. For branches
1841
1825
1842
1826
1843
1827
class cmd_diff(Command):
1844
__doc__ = """Show differences in the working tree, between revisions or branches.
1828
"""Show differences in the working tree, between revisions or branches.
1845
1829
1846
1830
If no arguments are given, all changes for the current tree are listed.
1847
1831
If files are given, only the changes in those files are listed.
1933
1917
help='Use this command to compare files.',
1934
1918
type=unicode,
1935
1919
),
1936
RegistryOption('format',
1937
help='Diff format to use.',
1938
lazy_registry=('bzrlib.diff', 'format_registry'),
1939
value_switches=False, title='Diff format'),
1940
1920
]
1941
1921
aliases = ['di', 'dif']
1942
1922
encoding_type = 'exact'
1943
1923
1944
1924
@display_command
1945
1925
def run(self, revision=None, file_list=None, diff_options=None,
1946
prefix=None, old=None, new=None, using=None, format=None):
1947
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1948
show_diff_trees)
1926
prefix=None, old=None, new=None, using=None):
1927
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1949
1928
1950
1929
if (prefix is None) or (prefix == '0'):
1951
1930
# diff -p0 format
1965
1944
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1966
1945
' one or two revision specifiers')
1967
1946
1968
if using is not None and format is not None:
1969
raise errors.BzrCommandError('--using and --format are mutually '
1970
'exclusive.')
1971
1972
1947
(old_tree, new_tree,
1973
1948
old_branch, new_branch,
1974
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1975
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1949
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1950
file_list, revision, old, new, apply_view=True)
1976
1951
return show_diff_trees(old_tree, new_tree, sys.stdout,
1977
1952
specific_files=specific_files,
1978
1953
external_diff_options=diff_options,
1979
1954
old_label=old_label, new_label=new_label,
1980
extra_trees=extra_trees, using=using,
1981
format_cls=format)
1955
extra_trees=extra_trees, using=using)
1982
1956
1983
1957
1984
1958
class cmd_deleted(Command):
1985
__doc__ = """List files deleted in the working tree.
1959
"""List files deleted in the working tree.
1986
1960
"""
1987
1961
# TODO: Show files deleted since a previous revision, or
1988
1962
# between two revisions.
1991
1965
# level of effort but possibly much less IO. (Or possibly not,
1992
1966
# if the directories are very large...)
1993
1967
_see_also = ['status', 'ls']
1994
takes_options = ['directory', 'show-ids']
1968
takes_options = ['show-ids']
1995
1969
1996
1970
@display_command
1997
def run(self, show_ids=False, directory=u'.'):
1998
tree = WorkingTree.open_containing(directory)[0]
1999
self.add_cleanup(tree.lock_read().unlock)
1971
def run(self, show_ids=False):
1972
tree = WorkingTree.open_containing(u'.')[0]
1973
tree.lock_read()
1974
self.add_cleanup(tree.unlock)
2000
1975
old = tree.basis_tree()
2001
self.add_cleanup(old.lock_read().unlock)
1976
old.lock_read()
1977
self.add_cleanup(old.unlock)
2002
1978
for path, ie in old.inventory.iter_entries():
2003
1979
if not tree.has_id(ie.file_id):
2004
1980
self.outf.write(path)
2009
1985
2010
1986
2011
1987
class cmd_modified(Command):
2012
__doc__ = """List files modified in working tree.
1988
"""List files modified in working tree.
2013
1989
"""
2014
1990
2015
1991
hidden = True
2016
1992
_see_also = ['status', 'ls']
2017
takes_options = ['directory', 'null']
1993
takes_options = [
1994
Option('null',
1995
help='Write an ascii NUL (\\0) separator '
1996
'between files rather than a newline.')
1997
]
2018
1998
2019
1999
@display_command
2020
def run(self, null=False, directory=u'.'):
2021
tree = WorkingTree.open_containing(directory)[0]
2000
def run(self, null=False):
2001
tree = WorkingTree.open_containing(u'.')[0]
2022
2002
td = tree.changes_from(tree.basis_tree())
2023
2003
for path, id, kind, text_modified, meta_modified in td.modified:
2024
2004
if null:
2028
2008
2029
2009
2030
2010
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
2011
"""List files added in working tree.
2032
2012
"""
2033
2013
2034
2014
hidden = True
2035
2015
_see_also = ['status', 'ls']
2036
takes_options = ['directory', 'null']
2016
takes_options = [
2017
Option('null',
2018
help='Write an ascii NUL (\\0) separator '
2019
'between files rather than a newline.')
2020
]
2037
2021
2038
2022
@display_command
2039
def run(self, null=False, directory=u'.'):
2040
wt = WorkingTree.open_containing(directory)[0]
2041
self.add_cleanup(wt.lock_read().unlock)
2023
def run(self, null=False):
2024
wt = WorkingTree.open_containing(u'.')[0]
2025
wt.lock_read()
2026
self.add_cleanup(wt.unlock)
2042
2027
basis = wt.basis_tree()
2043
self.add_cleanup(basis.lock_read().unlock)
2028
basis.lock_read()
2029
self.add_cleanup(basis.unlock)
2044
2030
basis_inv = basis.inventory
2045
2031
inv = wt.inventory
2046
2032
for file_id in inv:
2049
2035
if inv.is_root(file_id) and len(basis_inv) == 0:
2050
2036
continue
2051
2037
path = inv.id2path(file_id)
2052
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2038
if not os.access(osutils.abspath(path), os.F_OK):
2053
2039
continue
2054
2040
if null:
2055
2041
self.outf.write(path + '\0')
2058
2044
2059
2045
2060
2046
class cmd_root(Command):
2061
__doc__ = """Show the tree root directory.
2047
"""Show the tree root directory.
2062
2048
2063
2049
The root is the nearest enclosing directory with a .bzr control
2064
2050
directory."""
2088
2074
2089
2075
2090
2076
class cmd_log(Command):
2091
__doc__ = """Show historical log for a branch or subset of a branch.
2077
"""Show historical log for a branch or subset of a branch.
2092
2078
2093
2079
log is bzr's default tool for exploring the history of a branch.
2094
2080
The branch to use is taken from the first parameter. If no parameters
2205
2191
:Tips & tricks:
2206
2192
2207
2193
GUI tools and IDEs are often better at exploring history than command
2208
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2209
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2210
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2211
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2194
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2195
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2196
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2197
2198
Web interfaces are often better at exploring history than command line
2199
tools, particularly for branches on servers. You may prefer Loggerhead
2200
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2212
2201
2213
2202
You may find it useful to add the aliases below to ``bazaar.conf``::
2214
2203
2255
2244
help='Show just the specified revision.'
2256
2245
' See also "help revisionspec".'),
2257
2246
'log-format',
2258
RegistryOption('authors',
2259
'What names to list as authors - first, all or committer.',
2260
title='Authors',
2261
lazy_registry=('bzrlib.log', 'author_list_registry'),
2262
),
2263
2247
Option('levels',
2264
2248
short_name='n',
2265
2249
help='Number of levels to display - 0 for all, 1 for flat.',
2280
2264
help='Show changes made in each revision as a patch.'),
2281
2265
Option('include-merges',
2282
2266
help='Show merged revisions like --levels 0 does.'),
2283
Option('exclude-common-ancestry',
2284
help='Display only the revisions that are not part'
2285
' of both ancestries (require -rX..Y)'
2286
)
2287
2267
]
2288
2268
encoding_type = 'replace'
2289
2269
2299
2279
message=None,
2300
2280
limit=None,
2301
2281
show_diff=False,
2302
include_merges=False,
2303
authors=None,
2304
exclude_common_ancestry=False,
2305
):
2282
include_merges=False):
2306
2283
from bzrlib.log import (
2307
2284
Logger,
2308
2285
make_log_request_dict,
2309
2286
_get_info_for_log_files,
2310
2287
)
2311
2288
direction = (forward and 'forward') or 'reverse'
2312
if (exclude_common_ancestry
2313
and (revision is None or len(revision) != 2)):
2314
raise errors.BzrCommandError(
2315
'--exclude-common-ancestry requires -r with two revisions')
2316
2289
if include_merges:
2317
2290
if levels is None:
2318
2291
levels = 0
2334
2307
if file_list:
2335
2308
# find the file ids to log and check for directory filtering
2336
2309
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2337
revision, file_list, self.add_cleanup)
2310
revision, file_list)
2311
self.add_cleanup(b.unlock)
2338
2312
for relpath, file_id, kind in file_info_list:
2339
2313
if file_id is None:
2340
2314
raise errors.BzrCommandError(
2358
2332
location = '.'
2359
2333
dir, relpath = bzrdir.BzrDir.open_containing(location)
2360
2334
b = dir.open_branch()
2361
self.add_cleanup(b.lock_read().unlock)
2335
b.lock_read()
2336
self.add_cleanup(b.unlock)
2362
2337
rev1, rev2 = _get_revision_range(revision, b, self.name())
2363
2338
2364
2339
# Decide on the type of delta & diff filtering to use
2384
2359
show_timezone=timezone,
2385
2360
delta_format=get_verbosity_level(),
2386
2361
levels=levels,
2387
show_advice=levels is None,
2388
author_list_handler=authors)
2362
show_advice=levels is None)
2389
2363
2390
2364
# Choose the algorithm for doing the logging. It's annoying
2391
2365
# having multiple code paths like this but necessary until
2410
2384
direction=direction, specific_fileids=file_ids,
2411
2385
start_revision=rev1, end_revision=rev2, limit=limit,
2412
2386
message_search=message, delta_type=delta_type,
2413
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2414
exclude_common_ancestry=exclude_common_ancestry,
2415
)
2387
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2416
2388
Logger(b, rqst).show(lf)
2417
2389
2418
2390
2437
2409
raise errors.BzrCommandError(
2438
2410
"bzr %s doesn't accept two revisions in different"
2439
2411
" branches." % command_name)
2440
if start_spec.spec is None:
2441
# Avoid loading all the history.
2442
rev1 = RevisionInfo(branch, None, None)
2443
else:
2444
rev1 = start_spec.in_history(branch)
2412
rev1 = start_spec.in_history(branch)
2445
2413
# Avoid loading all of history when we know a missing
2446
2414
# end of range means the last revision ...
2447
2415
if end_spec.spec is None:
2476
2444
2477
2445
2478
2446
class cmd_touching_revisions(Command):
2479
__doc__ = """Return revision-ids which affected a particular file.
2447
"""Return revision-ids which affected a particular file.
2480
2448
2481
2449
A more user-friendly interface is "bzr log FILE".
2482
2450
"""
2489
2457
tree, relpath = WorkingTree.open_containing(filename)
2490
2458
file_id = tree.path2id(relpath)
2491
2459
b = tree.branch
2492
self.add_cleanup(b.lock_read().unlock)
2460
b.lock_read()
2461
self.add_cleanup(b.unlock)
2493
2462
touching_revs = log.find_touching_revisions(b, file_id)
2494
2463
for revno, revision_id, what in touching_revs:
2495
2464
self.outf.write("%6d %s\n" % (revno, what))
2496
2465
2497
2466
2498
2467
class cmd_ls(Command):
2499
__doc__ = """List files in a tree.
2468
"""List files in a tree.
2500
2469
"""
2501
2470
2502
2471
_see_also = ['status', 'cat']
2508
2477
help='Recurse into subdirectories.'),
2509
2478
Option('from-root',
2510
2479
help='Print paths relative to the root of the branch.'),
2511
Option('unknown', short_name='u',
2512
help='Print unknown files.'),
2480
Option('unknown', help='Print unknown files.'),
2513
2481
Option('versioned', help='Print versioned files.',
2514
2482
short_name='V'),
2515
Option('ignored', short_name='i',
2516
help='Print ignored files.'),
2517
Option('kind', short_name='k',
2483
Option('ignored', help='Print ignored files.'),
2484
Option('null',
2485
help='Write an ascii NUL (\\0) separator '
2486
'between files rather than a newline.'),
2487
Option('kind',
2518
2488
help='List entries of a particular kind: file, directory, symlink.',
2519
2489
type=unicode),
2520
'null',
2521
2490
'show-ids',
2522
'directory',
2523
2491
]
2524
2492
@display_command
2525
2493
def run(self, revision=None, verbose=False,
2526
2494
recursive=False, from_root=False,
2527
2495
unknown=False, versioned=False, ignored=False,
2528
null=False, kind=None, show_ids=False, path=None, directory=None):
2496
null=False, kind=None, show_ids=False, path=None):
2529
2497
2530
2498
if kind and kind not in ('file', 'directory', 'symlink'):
2531
2499
raise errors.BzrCommandError('invalid kind specified')
2543
2511
raise errors.BzrCommandError('cannot specify both --from-root'
2544
2512
' and PATH')
2545
2513
fs_path = path
2546
tree, branch, relpath = \
2547
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2514
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2515
fs_path)
2548
2516
2549
2517
# Calculate the prefix to use
2550
2518
prefix = None
2565
2533
view_str = views.view_display_str(view_files)
2566
2534
note("Ignoring files outside view. View is %s" % view_str)
2567
2535
2568
self.add_cleanup(tree.lock_read().unlock)
2536
tree.lock_read()
2537
self.add_cleanup(tree.unlock)
2569
2538
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2570
2539
from_dir=relpath, recursive=recursive):
2571
2540
# Apply additional masking
2613
2582
2614
2583
2615
2584
class cmd_unknowns(Command):
2616
__doc__ = """List unknown files.
2585
"""List unknown files.
2617
2586
"""
2618
2587
2619
2588
hidden = True
2620
2589
_see_also = ['ls']
2621
takes_options = ['directory']
2622
2590
2623
2591
@display_command
2624
def run(self, directory=u'.'):
2625
for f in WorkingTree.open_containing(directory)[0].unknowns():
2592
def run(self):
2593
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2626
2594
self.outf.write(osutils.quotefn(f) + '\n')
2627
2595
2628
2596
2629
2597
class cmd_ignore(Command):
2630
__doc__ = """Ignore specified files or patterns.
2598
"""Ignore specified files or patterns.
2631
2599
2632
2600
See ``bzr help patterns`` for details on the syntax of patterns.
2633
2601
2642
2610
using this command or directly by using an editor, be sure to commit
2643
2611
it.
2644
2612
2645
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2646
the global ignore file can be found in the application data directory as
2647
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2648
Global ignores are not touched by this command. The global ignore file
2649
can be edited directly using an editor.
2650
2651
2613
Patterns prefixed with '!' are exceptions to ignore patterns and take
2652
2614
precedence over regular ignores. Such exceptions are used to specify
2653
2615
files that should be versioned which would otherwise be ignored.
2693
2655
2694
2656
_see_also = ['status', 'ignored', 'patterns']
2695
2657
takes_args = ['name_pattern*']
2696
takes_options = ['directory',
2697
Option('default-rules',
2698
help='Display the default ignore rules that bzr uses.')
2658
takes_options = [
2659
Option('old-default-rules',
2660
help='Write out the ignore rules bzr < 0.9 always used.')
2699
2661
]
2700
2662
2701
def run(self, name_pattern_list=None, default_rules=None,
2702
directory=u'.'):
2663
def run(self, name_pattern_list=None, old_default_rules=None):
2703
2664
from bzrlib import ignores
2704
if default_rules is not None:
2705
# dump the default rules and exit
2706
for pattern in ignores.USER_DEFAULTS:
2707
self.outf.write("%s\n" % pattern)
2665
if old_default_rules is not None:
2666
# dump the rules and exit
2667
for pattern in ignores.OLD_DEFAULTS:
2668
print pattern
2708
2669
return
2709
2670
if not name_pattern_list:
2710
2671
raise errors.BzrCommandError("ignore requires at least one "
2711
"NAME_PATTERN or --default-rules.")
2672
"NAME_PATTERN or --old-default-rules")
2712
2673
name_pattern_list = [globbing.normalize_pattern(p)
2713
2674
for p in name_pattern_list]
2714
2675
for name_pattern in name_pattern_list:
2716
2677
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2717
2678
raise errors.BzrCommandError(
2718
2679
"NAME_PATTERN should not be an absolute path")
2719
tree, relpath = WorkingTree.open_containing(directory)
2680
tree, relpath = WorkingTree.open_containing(u'.')
2720
2681
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2721
2682
ignored = globbing.Globster(name_pattern_list)
2722
2683
matches = []
2726
2687
if id is not None:
2727
2688
filename = entry[0]
2728
2689
if ignored.match(filename):
2729
matches.append(filename)
2690
matches.append(filename.encode('utf-8'))
2730
2691
tree.unlock()
2731
2692
if len(matches) > 0:
2732
self.outf.write("Warning: the following files are version controlled and"
2733
" match your ignore pattern:\n%s"
2734
"\nThese files will continue to be version controlled"
2735
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2693
print "Warning: the following files are version controlled and" \
2694
" match your ignore pattern:\n%s" \
2695
"\nThese files will continue to be version controlled" \
2696
" unless you 'bzr remove' them." % ("\n".join(matches),)
2736
2697
2737
2698
2738
2699
class cmd_ignored(Command):
2739
__doc__ = """List ignored files and the patterns that matched them.
2700
"""List ignored files and the patterns that matched them.
2740
2701
2741
2702
List all the ignored files and the ignore pattern that caused the file to
2742
2703
be ignored.
2748
2709
2749
2710
encoding_type = 'replace'
2750
2711
_see_also = ['ignore', 'ls']
2751
takes_options = ['directory']
2752
2712
2753
2713
@display_command
2754
def run(self, directory=u'.'):
2755
tree = WorkingTree.open_containing(directory)[0]
2756
self.add_cleanup(tree.lock_read().unlock)
2714
def run(self):
2715
tree = WorkingTree.open_containing(u'.')[0]
2716
tree.lock_read()
2717
self.add_cleanup(tree.unlock)
2757
2718
for path, file_class, kind, file_id, entry in tree.list_files():
2758
2719
if file_class != 'I':
2759
2720
continue
2763
2724
2764
2725
2765
2726
class cmd_lookup_revision(Command):
2766
__doc__ = """Lookup the revision-id from a revision-number
2727
"""Lookup the revision-id from a revision-number
2767
2728
2768
2729
:Examples:
2769
2730
bzr lookup-revision 33
2770
2731
"""
2771
2732
hidden = True
2772
2733
takes_args = ['revno']
2773
takes_options = ['directory']
2774
2734
2775
2735
@display_command
2776
def run(self, revno, directory=u'.'):
2736
def run(self, revno):
2777
2737
try:
2778
2738
revno = int(revno)
2779
2739
except ValueError:
2780
raise errors.BzrCommandError("not a valid revision-number: %r"
2781
% revno)
2782
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2783
self.outf.write("%s\n" % revid)
2740
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2741
2742
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2784
2743
2785
2744
2786
2745
class cmd_export(Command):
2787
__doc__ = """Export current or past revision to a destination directory or archive.
2746
"""Export current or past revision to a destination directory or archive.
2788
2747
2789
2748
If no revision is specified this exports the last committed revision.
2790
2749
2812
2771
================= =========================
2813
2772
"""
2814
2773
takes_args = ['dest', 'branch_or_subdir?']
2815
takes_options = ['directory',
2774
takes_options = [
2816
2775
Option('format',
2817
2776
help="Type of file to export to.",
2818
2777
type=unicode),
2822
2781
Option('root',
2823
2782
type=str,
2824
2783
help="Name of the root directory inside the exported file."),
2825
Option('per-file-timestamps',
2826
help='Set modification time of files to that of the last '
2827
'revision in which it was changed.'),
2828
2784
]
2829
2785
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2830
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2786
root=None, filters=False):
2831
2787
from bzrlib.export import export
2832
2788
2833
2789
if branch_or_subdir is None:
2834
tree = WorkingTree.open_containing(directory)[0]
2790
tree = WorkingTree.open_containing(u'.')[0]
2835
2791
b = tree.branch
2836
2792
subdir = None
2837
2793
else:
2840
2796
2841
2797
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2842
2798
try:
2843
export(rev_tree, dest, format, root, subdir, filtered=filters,
2844
per_file_timestamps=per_file_timestamps)
2799
export(rev_tree, dest, format, root, subdir, filtered=filters)
2845
2800
except errors.NoSuchExportFormat, e:
2846
2801
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2847
2802
2848
2803
2849
2804
class cmd_cat(Command):
2850
__doc__ = """Write the contents of a file as of a given revision to standard output.
2805
"""Write the contents of a file as of a given revision to standard output.
2851
2806
2852
2807
If no revision is nominated, the last revision is used.
2853
2808
2856
2811
"""
2857
2812
2858
2813
_see_also = ['ls']
2859
takes_options = ['directory',
2814
takes_options = [
2860
2815
Option('name-from-revision', help='The path name in the old tree.'),
2861
2816
Option('filters', help='Apply content filters to display the '
2862
2817
'convenience form.'),
2867
2822
2868
2823
@display_command
2869
2824
def run(self, filename, revision=None, name_from_revision=False,
2870
filters=False, directory=None):
2825
filters=False):
2871
2826
if revision is not None and len(revision) != 1:
2872
2827
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2873
2828
" one revision specifier")
2874
2829
tree, branch, relpath = \
2875
_open_directory_or_containing_tree_or_branch(filename, directory)
2876
self.add_cleanup(branch.lock_read().unlock)
2830
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2831
branch.lock_read()
2832
self.add_cleanup(branch.unlock)
2877
2833
return self._run(tree, branch, relpath, filename, revision,
2878
2834
name_from_revision, filters)
2879
2835
2882
2838
if tree is None:
2883
2839
tree = b.basis_tree()
2884
2840
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2885
self.add_cleanup(rev_tree.lock_read().unlock)
2841
rev_tree.lock_read()
2842
self.add_cleanup(rev_tree.unlock)
2886
2843
2887
2844
old_file_id = rev_tree.path2id(relpath)
2888
2845
2931
2888
2932
2889
2933
2890
class cmd_local_time_offset(Command):
2934
__doc__ = """Show the offset in seconds from GMT to local time."""
2891
"""Show the offset in seconds from GMT to local time."""
2935
2892
hidden = True
2936
2893
@display_command
2937
2894
def run(self):
2938
self.outf.write("%s\n" % osutils.local_time_offset())
2895
print osutils.local_time_offset()
2939
2896
2940
2897
2941
2898
2942
2899
class cmd_commit(Command):
2943
__doc__ = """Commit changes into a new revision.
2900
"""Commit changes into a new revision.
2944
2901
2945
2902
An explanatory message needs to be given for each commit. This is
2946
2903
often done by using the --message option (getting the message from the
3054
3011
"the master branch until a normal commit "
3055
3012
"is performed."
3056
3013
),
3057
Option('show-diff', short_name='p',
3014
Option('show-diff',
3058
3015
help='When no message is supplied, show the diff along'
3059
3016
' with the status summary in the message editor.'),
3060
3017
]
3140
3097
'(use --file "%(f)s" to take commit message from that file)'
3141
3098
% { 'f': message })
3142
3099
ui.ui_factory.show_warning(warning_msg)
3143
if '\r' in message:
3144
message = message.replace('\r\n', '\n')
3145
message = message.replace('\r', '\n')
3146
if file:
3147
raise errors.BzrCommandError(
3148
"please specify either --message or --file")
3149
3100
3150
3101
def get_message(commit_obj):
3151
3102
"""Callback to get commit message"""
3152
if file:
3153
my_message = codecs.open(
3154
file, 'rt', osutils.get_user_encoding()).read()
3155
elif message is not None:
3156
my_message = message
3157
else:
3158
# No message supplied: make one up.
3159
# text is the status of the tree
3160
text = make_commit_message_template_encoded(tree,
3103
my_message = message
3104
if my_message is not None and '\r' in my_message:
3105
my_message = my_message.replace('\r\n', '\n')
3106
my_message = my_message.replace('\r', '\n')
3107
if my_message is None and not file:
3108
t = make_commit_message_template_encoded(tree,
3161
3109
selected_list, diff=show_diff,
3162
3110
output_encoding=osutils.get_user_encoding())
3163
# start_message is the template generated from hooks
3164
# XXX: Warning - looks like hooks return unicode,
3165
# make_commit_message_template_encoded returns user encoding.
3166
# We probably want to be using edit_commit_message instead to
3167
# avoid this.
3168
3111
start_message = generate_commit_message_template(commit_obj)
3169
my_message = edit_commit_message_encoded(text,
3112
my_message = edit_commit_message_encoded(t,
3170
3113
start_message=start_message)
3171
3114
if my_message is None:
3172
3115
raise errors.BzrCommandError("please specify a commit"
3173
3116
" message with either --message or --file")
3117
elif my_message and file:
3118
raise errors.BzrCommandError(
3119
"please specify either --message or --file")
3120
if file:
3121
my_message = codecs.open(file, 'rt',
3122
osutils.get_user_encoding()).read()
3174
3123
if my_message == "":
3175
3124
raise errors.BzrCommandError("empty commit message specified")
3176
3125
return my_message
3188
3137
timezone=offset,
3189
3138
exclude=safe_relpath_files(tree, exclude))
3190
3139
except PointlessCommit:
3140
# FIXME: This should really happen before the file is read in;
3141
# perhaps prepare the commit; get the message; then actually commit
3191
3142
raise errors.BzrCommandError("No changes to commit."
3192
3143
" Use --unchanged to commit anyhow.")
3193
3144
except ConflictsInTree:
3198
3149
raise errors.BzrCommandError("Commit refused because there are"
3199
3150
" unknown files in the working tree.")
3200
3151
except errors.BoundBranchOutOfDate, e:
3201
e.extra_help = ("\n"
3202
'To commit to master branch, run update and then commit.\n'
3203
'You can also pass --local to commit to continue working '
3204
'disconnected.')
3205
raise
3152
raise errors.BzrCommandError(str(e) + "\n"
3153
'To commit to master branch, run update and then commit.\n'
3154
'You can also pass --local to commit to continue working '
3155
'disconnected.')
3206
3156
3207
3157
3208
3158
class cmd_check(Command):
3209
__doc__ = """Validate working tree structure, branch consistency and repository history.
3159
"""Validate working tree structure, branch consistency and repository history.
3210
3160
3211
3161
This command checks various invariants about branch and repository storage
3212
3162
to detect data corruption or bzr bugs.
3276
3226
3277
3227
3278
3228
class cmd_upgrade(Command):
3279
__doc__ = """Upgrade branch storage to current format.
3229
"""Upgrade branch storage to current format.
3280
3230
3281
3231
The check command or bzr developers may sometimes advise you to run
3282
3232
this command. When the default format has changed you may also be warned
3300
3250
3301
3251
3302
3252
class cmd_whoami(Command):
3303
__doc__ = """Show or set bzr user id.
3253
"""Show or set bzr user id.
3304
3254
3305
3255
:Examples:
3306
3256
Show the email of the current user::
3350
3300
3351
3301
3352
3302
class cmd_nick(Command):
3353
__doc__ = """Print or set the branch nickname.
3303
"""Print or set the branch nickname.
3354
3304
3355
3305
If unset, the tree root directory name is used as the nickname.
3356
3306
To print the current nickname, execute with no argument.
3361
3311
3362
3312
_see_also = ['info']
3363
3313
takes_args = ['nickname?']
3364
takes_options = ['directory']
3365
def run(self, nickname=None, directory=u'.'):
3366
branch = Branch.open_containing(directory)[0]
3314
def run(self, nickname=None):
3315
branch = Branch.open_containing(u'.')[0]
3367
3316
if nickname is None:
3368
3317
self.printme(branch)
3369
3318
else:
3371
3320
3372
3321
@display_command
3373
3322
def printme(self, branch):
3374
self.outf.write('%s\n' % branch.nick)
3323
print branch.nick
3375
3324
3376
3325
3377
3326
class cmd_alias(Command):
3378
__doc__ = """Set/unset and display aliases.
3327
"""Set/unset and display aliases.
3379
3328
3380
3329
:Examples:
3381
3330
Show the current aliases::
3445
3394
3446
3395
3447
3396
class cmd_selftest(Command):
3448
__doc__ = """Run internal test suite.
3397
"""Run internal test suite.
3449
3398
3450
3399
If arguments are given, they are regular expressions that say which tests
3451
3400
should run. Tests matching any expression are run, and other tests are
3498
3447
from bzrlib.tests import stub_sftp
3499
3448
return stub_sftp.SFTPAbsoluteServer
3500
3449
if typestring == "memory":
3501
from bzrlib.tests import test_server
3502
return memory.MemoryServer
3450
from bzrlib.transport.memory import MemoryServer
3451
return MemoryServer
3503
3452
if typestring == "fakenfs":
3504
from bzrlib.tests import test_server
3505
return test_server.FakeNFSServer
3453
from bzrlib.transport.fakenfs import FakeNFSServer
3454
return FakeNFSServer
3506
3455
msg = "No known transport type %s. Supported types are: sftp\n" %\
3507
3456
(typestring)
3508
3457
raise errors.BzrCommandError(msg)
3592
3541
raise errors.BzrCommandError("subunit not available. subunit "
3593
3542
"needs to be installed to use --subunit.")
3594
3543
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3595
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3596
# stdout, which would corrupt the subunit stream.
3597
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3598
import msvcrt
3599
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3600
3544
if parallel:
3601
3545
self.additional_selftest_args.setdefault(
3602
3546
'suite_decorators', []).append(parallel)
3633
3577
3634
3578
3635
3579
class cmd_version(Command):
3636
__doc__ = """Show version of bzr."""
3580
"""Show version of bzr."""
3637
3581
3638
3582
encoding_type = 'replace'
3639
3583
takes_options = [
3650
3594
3651
3595
3652
3596
class cmd_rocks(Command):
3653
__doc__ = """Statement of optimism."""
3597
"""Statement of optimism."""
3654
3598
3655
3599
hidden = True
3656
3600
3657
3601
@display_command
3658
3602
def run(self):
3659
self.outf.write("It sure does!\n")
3603
print "It sure does!"
3660
3604
3661
3605
3662
3606
class cmd_find_merge_base(Command):
3663
__doc__ = """Find and print a base revision for merging two branches."""
3607
"""Find and print a base revision for merging two branches."""
3664
3608
# TODO: Options to specify revisions on either side, as if
3665
3609
# merging only part of the history.
3666
3610
takes_args = ['branch', 'other']
3672
3616
3673
3617
branch1 = Branch.open_containing(branch)[0]
3674
3618
branch2 = Branch.open_containing(other)[0]
3675
self.add_cleanup(branch1.lock_read().unlock)
3676
self.add_cleanup(branch2.lock_read().unlock)
3619
branch1.lock_read()
3620
self.add_cleanup(branch1.unlock)
3621
branch2.lock_read()
3622
self.add_cleanup(branch2.unlock)
3677
3623
last1 = ensure_null(branch1.last_revision())
3678
3624
last2 = ensure_null(branch2.last_revision())
3679
3625
3680
3626
graph = branch1.repository.get_graph(branch2.repository)
3681
3627
base_rev_id = graph.find_unique_lca(last1, last2)
3682
3628
3683
self.outf.write('merge base is revision %s\n' % base_rev_id)
3629
print 'merge base is revision %s' % base_rev_id
3684
3630
3685
3631
3686
3632
class cmd_merge(Command):
3687
__doc__ = """Perform a three-way merge.
3633
"""Perform a three-way merge.
3688
3634
3689
3635
The source of the merge can be specified either in the form of a branch,
3690
3636
or in the form of a path to a file containing a merge directive generated
3773
3719
' completely merged into the source, pull from the'
3774
3720
' source rather than merging. When this happens,'
3775
3721
' you do not need to commit the result.'),
3776
custom_help('directory',
3722
Option('directory',
3777
3723
help='Branch to merge into, '
3778
'rather than the one containing the working directory.'),
3724
'rather than the one containing the working directory.',
3725
short_name='d',
3726
type=unicode,
3727
),
3779
3728
Option('preview', help='Instead of merging, show a diff of the'
3780
3729
' merge.'),
3781
3730
Option('interactive', help='Select changes interactively.',
3814
3763
unversioned_filter=tree.is_ignored, view_info=view_info)
3815
3764
pb = ui.ui_factory.nested_progress_bar()
3816
3765
self.add_cleanup(pb.finished)
3817
self.add_cleanup(tree.lock_write().unlock)
3766
tree.lock_write()
3767
self.add_cleanup(tree.unlock)
3818
3768
if location is not None:
3819
3769
try:
3820
3770
mergeable = bundle.read_mergeable_from_url(location,
3830
3780
raise errors.BzrCommandError(
3831
3781
'Cannot use -r with merge directives or bundles')
3832
3782
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3833
mergeable, None)
3783
mergeable, pb)
3834
3784
3835
3785
if merger is None and uncommitted:
3836
3786
if revision is not None and len(revision) > 0:
3837
3787
raise errors.BzrCommandError('Cannot use --uncommitted and'
3838
3788
' --revision at the same time.')
3839
merger = self.get_merger_from_uncommitted(tree, location, None)
3789
merger = self.get_merger_from_uncommitted(tree, location, pb)
3840
3790
allow_pending = False
3841
3791
3842
3792
if merger is None:
3843
3793
merger, allow_pending = self._get_merger_from_branch(tree,
3844
location, revision, remember, possible_transports, None)
3794
location, revision, remember, possible_transports, pb)
3845
3795
3846
3796
merger.merge_type = merge_type
3847
3797
merger.reprocess = reprocess
4041
3991
4042
3992
4043
3993
class cmd_remerge(Command):
4044
__doc__ = """Redo a merge.
3994
"""Redo a merge.
4045
3995
4046
3996
Use this if you want to try a different merge technique while resolving
4047
3997
conflicts. Some merge techniques are better than others, and remerge
4072
4022
4073
4023
def run(self, file_list=None, merge_type=None, show_base=False,
4074
4024
reprocess=False):
4075
from bzrlib.conflicts import restore
4076
4025
if merge_type is None:
4077
4026
merge_type = _mod_merge.Merge3Merger
4078
4027
tree, file_list = tree_files(file_list)
4079
self.add_cleanup(tree.lock_write().unlock)
4028
tree.lock_write()
4029
self.add_cleanup(tree.unlock)
4080
4030
parents = tree.get_parent_ids()
4081
4031
if len(parents) != 2:
4082
4032
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4118
4068
# list, we imply that the working tree text has seen and rejected
4119
4069
# all the changes from the other tree, when in fact those changes
4120
4070
# have not yet been seen.
4071
pb = ui.ui_factory.nested_progress_bar()
4121
4072
tree.set_parent_ids(parents[:1])
4122
4073
try:
4123
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4074
merger = _mod_merge.Merger.from_revision_ids(pb,
4075
tree, parents[1])
4124
4076
merger.interesting_ids = interesting_ids
4125
4077
merger.merge_type = merge_type
4126
4078
merger.show_base = show_base
4128
4080
conflicts = merger.do_merge()
4129
4081
finally:
4130
4082
tree.set_parent_ids(parents)
4083
pb.finished()
4131
4084
if conflicts > 0:
4132
4085
return 1
4133
4086
else:
4135
4088
4136
4089
4137
4090
class cmd_revert(Command):
4138
__doc__ = """Revert files to a previous revision.
4091
"""Revert files to a previous revision.
4139
4092
4140
4093
Giving a list of files will revert only those files. Otherwise, all files
4141
4094
will be reverted. If the revision is not specified with '--revision', the
4192
4145
def run(self, revision=None, no_backup=False, file_list=None,
4193
4146
forget_merges=None):
4194
4147
tree, file_list = tree_files(file_list)
4195
self.add_cleanup(tree.lock_tree_write().unlock)
4148
tree.lock_write()
4149
self.add_cleanup(tree.unlock)
4196
4150
if forget_merges:
4197
4151
tree.set_parent_ids(tree.get_parent_ids()[:1])
4198
4152
else:
4201
4155
@staticmethod
4202
4156
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4203
4157
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4204
tree.revert(file_list, rev_tree, not no_backup, None,
4205
report_changes=True)
4158
pb = ui.ui_factory.nested_progress_bar()
4159
try:
4160
tree.revert(file_list, rev_tree, not no_backup, pb,
4161
report_changes=True)
4162
finally:
4163
pb.finished()
4206
4164
4207
4165
4208
4166
class cmd_assert_fail(Command):
4209
__doc__ = """Test reporting of assertion failures"""
4167
"""Test reporting of assertion failures"""
4210
4168
# intended just for use in testing
4211
4169
4212
4170
hidden = True
4216
4174
4217
4175
4218
4176
class cmd_help(Command):
4219
__doc__ = """Show help on a command or other topic.
4177
"""Show help on a command or other topic.
4220
4178
"""
4221
4179
4222
4180
_see_also = ['topics']
4235
4193
4236
4194
4237
4195
class cmd_shell_complete(Command):
4238
__doc__ = """Show appropriate completions for context.
4196
"""Show appropriate completions for context.
4239
4197
4240
4198
For a list of all available commands, say 'bzr shell-complete'.
4241
4199
"""
4250
4208
4251
4209
4252
4210
class cmd_missing(Command):
4253
__doc__ = """Show unmerged/unpulled revisions between two branches.
4211
"""Show unmerged/unpulled revisions between two branches.
4254
4212
4255
4213
OTHER_BRANCH may be local or remote.
4256
4214
4334
4292
restrict = 'remote'
4335
4293
4336
4294
local_branch = Branch.open_containing(u".")[0]
4337
self.add_cleanup(local_branch.lock_read().unlock)
4338
4339
4295
parent = local_branch.get_parent()
4340
4296
if other_branch is None:
4341
4297
other_branch = parent
4350
4306
remote_branch = Branch.open(other_branch)
4351
4307
if remote_branch.base == local_branch.base:
4352
4308
remote_branch = local_branch
4353
else:
4354
self.add_cleanup(remote_branch.lock_read().unlock)
4355
4309
4310
local_branch.lock_read()
4311
self.add_cleanup(local_branch.unlock)
4356
4312
local_revid_range = _revision_range_to_revid_range(
4357
4313
_get_revision_range(my_revision, local_branch,
4358
4314
self.name()))
4359
4315
4316
remote_branch.lock_read()
4317
self.add_cleanup(remote_branch.unlock)
4360
4318
remote_revid_range = _revision_range_to_revid_range(
4361
4319
_get_revision_range(revision,
4362
4320
remote_branch, self.name()))
4412
4370
message("Branches are up to date.\n")
4413
4371
self.cleanup_now()
4414
4372
if not status_code and parent is None and other_branch is not None:
4415
self.add_cleanup(local_branch.lock_write().unlock)
4373
local_branch.lock_write()
4374
self.add_cleanup(local_branch.unlock)
4416
4375
# handle race conditions - a parent might be set while we run.
4417
4376
if local_branch.get_parent() is None:
4418
4377
local_branch.set_parent(remote_branch.base)
4420
4379
4421
4380
4422
4381
class cmd_pack(Command):
4423
__doc__ = """Compress the data within a repository.
4424
4425
This operation compresses the data within a bazaar repository. As
4426
bazaar supports automatic packing of repository, this operation is
4427
normally not required to be done manually.
4428
4429
During the pack operation, bazaar takes a backup of existing repository
4430
data, i.e. pack files. This backup is eventually removed by bazaar
4431
automatically when it is safe to do so. To save disk space by removing
4432
the backed up pack files, the --clean-obsolete-packs option may be
4433
used.
4434
4435
Warning: If you use --clean-obsolete-packs and your machine crashes
4436
during or immediately after repacking, you may be left with a state
4437
where the deletion has been written to disk but the new packs have not
4438
been. In this case the repository may be unusable.
4439
"""
4382
"""Compress the data within a repository."""
4440
4383
4441
4384
_see_also = ['repositories']
4442
4385
takes_args = ['branch_or_repo?']
4443
takes_options = [
4444
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4445
]
4446
4386
4447
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4387
def run(self, branch_or_repo='.'):
4448
4388
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4449
4389
try:
4450
4390
branch = dir.open_branch()
4451
4391
repository = branch.repository
4452
4392
except errors.NotBranchError:
4453
4393
repository = dir.open_repository()
4454
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4394
repository.pack()
4455
4395
4456
4396
4457
4397
class cmd_plugins(Command):
4458
__doc__ = """List the installed plugins.
4398
"""List the installed plugins.
4459
4399
4460
4400
This command displays the list of installed plugins including
4461
4401
version of plugin and a short description of each.
4468
4408
adding new commands, providing additional network transports and
4469
4409
customizing log output.
4470
4410
4471
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4472
for further information on plugins including where to find them and how to
4473
install them. Instructions are also provided there on how to write new
4474
plugins using the Python programming language.
4411
See the Bazaar web site, http://bazaar-vcs.org, for further
4412
information on plugins including where to find them and how to
4413
install them. Instructions are also provided there on how to
4414
write new plugins using the Python programming language.
4475
4415
"""
4476
4416
takes_options = ['verbose']
4477
4417
4492
4432
doc = '(no description)'
4493
4433
result.append((name_ver, doc, plugin.path()))
4494
4434
for name_ver, doc, path in sorted(result):
4495
self.outf.write("%s\n" % name_ver)
4496
self.outf.write(" %s\n" % doc)
4435
print name_ver
4436
print ' ', doc
4497
4437
if verbose:
4498
self.outf.write(" %s\n" % path)
4499
self.outf.write("\n")
4438
print ' ', path
4439
print
4500
4440
4501
4441
4502
4442
class cmd_testament(Command):
4503
__doc__ = """Show testament (signing-form) of a revision."""
4443
"""Show testament (signing-form) of a revision."""
4504
4444
takes_options = [
4505
4445
'revision',
4506
4446
Option('long', help='Produce long-format testament.'),
4518
4458
b = Branch.open_containing(branch)[0]
4519
4459
else:
4520
4460
b = Branch.open(branch)
4521
self.add_cleanup(b.lock_read().unlock)
4461
b.lock_read()
4462
self.add_cleanup(b.unlock)
4522
4463
if revision is None:
4523
4464
rev_id = b.last_revision()
4524
4465
else:
4531
4472
4532
4473
4533
4474
class cmd_annotate(Command):
4534
__doc__ = """Show the origin of each line in a file.
4475
"""Show the origin of each line in a file.
4535
4476
4536
4477
This prints out the given file with an annotation on the left side
4537
4478
indicating which revision, author and date introduced the change.
4548
4489
Option('long', help='Show commit date in annotations.'),
4549
4490
'revision',
4550
4491
'show-ids',
4551
'directory',
4552
4492
]
4553
4493
encoding_type = 'exact'
4554
4494
4555
4495
@display_command
4556
4496
def run(self, filename, all=False, long=False, revision=None,
4557
show_ids=False, directory=None):
4497
show_ids=False):
4558
4498
from bzrlib.annotate import annotate_file, annotate_file_tree
4559
4499
wt, branch, relpath = \
4560
_open_directory_or_containing_tree_or_branch(filename, directory)
4500
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4561
4501
if wt is not None:
4562
self.add_cleanup(wt.lock_read().unlock)
4502
wt.lock_read()
4503
self.add_cleanup(wt.unlock)
4563
4504
else:
4564
self.add_cleanup(branch.lock_read().unlock)
4505
branch.lock_read()
4506
self.add_cleanup(branch.unlock)
4565
4507
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4566
self.add_cleanup(tree.lock_read().unlock)
4508
tree.lock_read()
4509
self.add_cleanup(tree.unlock)
4567
4510
if wt is not None:
4568
4511
file_id = wt.path2id(relpath)
4569
4512
else:
4582
4525
4583
4526
4584
4527
class cmd_re_sign(Command):
4585
__doc__ = """Create a digital signature for an existing revision."""
4528
"""Create a digital signature for an existing revision."""
4586
4529
# TODO be able to replace existing ones.
4587
4530
4588
4531
hidden = True # is this right ?
4589
4532
takes_args = ['revision_id*']
4590
takes_options = ['directory', 'revision']
4533
takes_options = ['revision']
4591
4534
4592
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4535
def run(self, revision_id_list=None, revision=None):
4593
4536
if revision_id_list is not None and revision is not None:
4594
4537
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4595
4538
if revision_id_list is None and revision is None:
4596
4539
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4597
b = WorkingTree.open_containing(directory)[0].branch
4598
self.add_cleanup(b.lock_write().unlock)
4540
b = WorkingTree.open_containing(u'.')[0].branch
4541
b.lock_write()
4542
self.add_cleanup(b.unlock)
4599
4543
return self._run(b, revision_id_list, revision)
4600
4544
4601
4545
def _run(self, b, revision_id_list, revision):
4647
4591
4648
4592
4649
4593
class cmd_bind(Command):
4650
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4651
If no branch is supplied, rebind to the last bound location.
4594
"""Convert the current branch into a checkout of the supplied branch.
4652
4595
4653
4596
Once converted into a checkout, commits must succeed on the master branch
4654
4597
before they will be applied to the local branch.
4660
4603
4661
4604
_see_also = ['checkouts', 'unbind']
4662
4605
takes_args = ['location?']
4663
takes_options = ['directory']
4606
takes_options = []
4664
4607
4665
def run(self, location=None, directory=u'.'):
4666
b, relpath = Branch.open_containing(directory)
4608
def run(self, location=None):
4609
b, relpath = Branch.open_containing(u'.')
4667
4610
if location is None:
4668
4611
try:
4669
4612
location = b.get_old_bound_location()
4672
4615
'This format does not remember old locations.')
4673
4616
else:
4674
4617
if location is None:
4675
if b.get_bound_location() is not None:
4676
raise errors.BzrCommandError('Branch is already bound')
4677
else:
4678
raise errors.BzrCommandError('No location supplied '
4679
'and no previous location known')
4618
raise errors.BzrCommandError('No location supplied and no '
4619
'previous location known')
4680
4620
b_other = Branch.open(location)
4681
4621
try:
4682
4622
b.bind(b_other)
4688
4628
4689
4629
4690
4630
class cmd_unbind(Command):
4691
__doc__ = """Convert the current checkout into a regular branch.
4631
"""Convert the current checkout into a regular branch.
4692
4632
4693
4633
After unbinding, the local branch is considered independent and subsequent
4694
4634
commits will be local only.
4696
4636
4697
4637
_see_also = ['checkouts', 'bind']
4698
4638
takes_args = []
4699
takes_options = ['directory']
4639
takes_options = []
4700
4640
4701
def run(self, directory=u'.'):
4702
b, relpath = Branch.open_containing(directory)
4641
def run(self):
4642
b, relpath = Branch.open_containing(u'.')
4703
4643
if not b.unbind():
4704
4644
raise errors.BzrCommandError('Local branch is not bound')
4705
4645
4706
4646
4707
4647
class cmd_uncommit(Command):
4708
__doc__ = """Remove the last committed revision.
4648
"""Remove the last committed revision.
4709
4649
4710
4650
--verbose will print out what is being removed.
4711
4651
--dry-run will go through all the motions, but not actually
4751
4691
b = control.open_branch()
4752
4692
4753
4693
if tree is not None:
4754
self.add_cleanup(tree.lock_write().unlock)
4694
tree.lock_write()
4695
self.add_cleanup(tree.unlock)
4755
4696
else:
4756
self.add_cleanup(b.lock_write().unlock)
4697
b.lock_write()
4698
self.add_cleanup(b.unlock)
4757
4699
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4758
4700
4759
4701
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4792
4734
end_revision=last_revno)
4793
4735
4794
4736
if dry_run:
4795
self.outf.write('Dry-run, pretending to remove'
4796
' the above revisions.\n')
4737
print 'Dry-run, pretending to remove the above revisions.'
4738
if not force:
4739
val = raw_input('Press <enter> to continue')
4797
4740
else:
4798
self.outf.write('The above revision(s) will be removed.\n')
4799
4800
if not force:
4801
if not ui.ui_factory.get_boolean('Are you sure'):
4802
self.outf.write('Canceled')
4803
return 0
4741
print 'The above revision(s) will be removed.'
4742
if not force:
4743
val = raw_input('Are you sure [y/N]? ')
4744
if val.lower() not in ('y', 'yes'):
4745
print 'Canceled'
4746
return 0
4804
4747
4805
4748
mutter('Uncommitting from {%s} to {%s}',
4806
4749
last_rev_id, rev_id)
4807
4750
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4808
4751
revno=revno, local=local)
4809
self.outf.write('You can restore the old tip by running:\n'
4810
' bzr pull . -r revid:%s\n' % last_rev_id)
4752
note('You can restore the old tip by running:\n'
4753
' bzr pull . -r revid:%s', last_rev_id)
4811
4754
4812
4755
4813
4756
class cmd_break_lock(Command):
4814
__doc__ = """Break a dead lock on a repository, branch or working directory.
4757
"""Break a dead lock on a repository, branch or working directory.
4815
4758
4816
4759
CAUTION: Locks should only be broken when you are sure that the process
4817
4760
holding the lock has been stopped.
4836
4779
4837
4780
4838
4781
class cmd_wait_until_signalled(Command):
4839
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4782
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4840
4783
4841
4784
This just prints a line to signal when it is ready, then blocks on stdin.
4842
4785
"""
4850
4793
4851
4794
4852
4795
class cmd_serve(Command):
4853
__doc__ = """Run the bzr server."""
4796
"""Run the bzr server."""
4854
4797
4855
4798
aliases = ['server']
4856
4799
4867
4810
'result in a dynamically allocated port. The default port '
4868
4811
'depends on the protocol.',
4869
4812
type=str),
4870
custom_help('directory',
4871
help='Serve contents of this directory.'),
4813
Option('directory',
4814
help='Serve contents of this directory.',
4815
type=unicode),
4872
4816
Option('allow-writes',
4873
4817
help='By default the server is a readonly server. Supplying '
4874
4818
'--allow-writes enables write access to the contents of '
4915
4859
4916
4860
4917
4861
class cmd_join(Command):
4918
__doc__ = """Combine a tree into its containing tree.
4862
"""Combine a tree into its containing tree.
4919
4863
4920
4864
This command requires the target tree to be in a rich-root format.
4921
4865
4961
4905
4962
4906
4963
4907
class cmd_split(Command):
4964
__doc__ = """Split a subdirectory of a tree into a separate tree.
4908
"""Split a subdirectory of a tree into a separate tree.
4965
4909
4966
4910
This command will produce a target tree in a format that supports
4967
4911
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4987
4931
4988
4932
4989
4933
class cmd_merge_directive(Command):
4990
__doc__ = """Generate a merge directive for auto-merge tools.
4934
"""Generate a merge directive for auto-merge tools.
4991
4935
4992
4936
A directive requests a merge to be performed, and also provides all the
4993
4937
information necessary to do so. This means it must either include a
5086
5030
5087
5031
5088
5032
class cmd_send(Command):
5089
__doc__ = """Mail or create a merge-directive for submitting changes.
5033
"""Mail or create a merge-directive for submitting changes.
5090
5034
5091
5035
A merge directive provides many things needed for requesting merges:
5092
5036
5174
5118
short_name='f',
5175
5119
type=unicode),
5176
5120
Option('output', short_name='o',
5177
help='Write merge directive to this file or directory; '
5121
help='Write merge directive to this file; '
5178
5122
'use - for stdout.',
5179
5123
type=unicode),
5180
5124
Option('strict',
5203
5147
5204
5148
5205
5149
class cmd_bundle_revisions(cmd_send):
5206
__doc__ = """Create a merge-directive for submitting changes.
5150
"""Create a merge-directive for submitting changes.
5207
5151
5208
5152
A merge directive provides many things needed for requesting merges:
5209
5153
5276
5220
5277
5221
5278
5222
class cmd_tag(Command):
5279
__doc__ = """Create, remove or modify a tag naming a revision.
5223
"""Create, remove or modify a tag naming a revision.
5280
5224
5281
5225
Tags give human-meaningful names to revisions. Commands that take a -r
5282
5226
(--revision) option can be given -rtag:X, where X is any previously
5290
5234
5291
5235
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5292
5236
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5293
5294
If no tag name is specified it will be determined through the
5295
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5296
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5297
details.
5298
5237
"""
5299
5238
5300
5239
_see_also = ['commit', 'tags']
5301
takes_args = ['tag_name?']
5240
takes_args = ['tag_name']
5302
5241
takes_options = [
5303
5242
Option('delete',
5304
5243
help='Delete this tag rather than placing it.',
5305
5244
),
5306
custom_help('directory',
5307
help='Branch in which to place the tag.'),
5245
Option('directory',
5246
help='Branch in which to place the tag.',
5247
short_name='d',
5248
type=unicode,
5249
),
5308
5250
Option('force',
5309
5251
help='Replace existing tags.',
5310
5252
),
5311
5253
'revision',
5312
5254
]
5313
5255
5314
def run(self, tag_name=None,
5256
def run(self, tag_name,
5315
5257
delete=None,
5316
5258
directory='.',
5317
5259
force=None,
5318
5260
revision=None,
5319
5261
):
5320
5262
branch, relpath = Branch.open_containing(directory)
5321
self.add_cleanup(branch.lock_write().unlock)
5263
branch.lock_write()
5264
self.add_cleanup(branch.unlock)
5322
5265
if delete:
5323
if tag_name is None:
5324
raise errors.BzrCommandError("No tag specified to delete.")
5325
5266
branch.tags.delete_tag(tag_name)
5326
5267
self.outf.write('Deleted tag %s.\n' % tag_name)
5327
5268
else:
5333
5274
revision_id = revision[0].as_revision_id(branch)
5334
5275
else:
5335
5276
revision_id = branch.last_revision()
5336
if tag_name is None:
5337
tag_name = branch.automatic_tag_name(revision_id)
5338
if tag_name is None:
5339
raise errors.BzrCommandError(
5340
"Please specify a tag name.")
5341
5277
if (not force) and branch.tags.has_tag(tag_name):
5342
5278
raise errors.TagAlreadyExists(tag_name)
5343
5279
branch.tags.set_tag(tag_name, revision_id)
5345
5281
5346
5282
5347
5283
class cmd_tags(Command):
5348
__doc__ = """List tags.
5284
"""List tags.
5349
5285
5350
5286
This command shows a table of tag names and the revisions they reference.
5351
5287
"""
5352
5288
5353
5289
_see_also = ['tag']
5354
5290
takes_options = [
5355
custom_help('directory',
5356
help='Branch whose tags should be displayed.'),
5291
Option('directory',
5292
help='Branch whose tags should be displayed.',
5293
short_name='d',
5294
type=unicode,
5295
),
5357
5296
RegistryOption.from_kwargs('sort',
5358
5297
'Sort tags by different criteria.', title='Sorting',
5359
5298
alpha='Sort tags lexicographically (default).',
5376
5315
if not tags:
5377
5316
return
5378
5317
5379
self.add_cleanup(branch.lock_read().unlock)
5318
branch.lock_read()
5319
self.add_cleanup(branch.unlock)
5380
5320
if revision:
5381
5321
graph = branch.repository.get_graph()
5382
5322
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5415
5355
5416
5356
5417
5357
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5358
"""Reconfigure the type of a bzr directory.
5419
5359
5420
5360
A target configuration must be specified.
5421
5361
5506
5446
5507
5447
5508
5448
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5449
"""Set the branch of a checkout and update.
5510
5450
5511
5451
For lightweight checkouts, this changes the branch being referenced.
5512
5452
For heavyweight checkouts, this checks that there are no local commits
5602
5542
5603
5543
5604
5544
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5545
"""Manage filtered views.
5606
5546
5607
5547
Views provide a mask over the tree so that users can focus on
5608
5548
a subset of a tree when doing their work. After creating a view,
5756
5696
5757
5697
5758
5698
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5699
"""Show hooks."""
5760
5700
5761
5701
hidden = True
5762
5702
5775
5715
self.outf.write(" <no hooks installed>\n")
5776
5716
5777
5717
5778
class cmd_remove_branch(Command):
5779
__doc__ = """Remove a branch.
5780
5781
This will remove the branch from the specified location but
5782
will keep any working tree or repository in place.
5783
5784
:Examples:
5785
5786
Remove the branch at repo/trunk::
5787
5788
bzr remove-branch repo/trunk
5789
5790
"""
5791
5792
takes_args = ["location?"]
5793
5794
aliases = ["rmbranch"]
5795
5796
def run(self, location=None):
5797
if location is None:
5798
location = "."
5799
branch = Branch.open_containing(location)[0]
5800
branch.bzrdir.destroy_branch()
5801
5802
5803
5718
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5719
"""Temporarily set aside some changes from the current tree.
5805
5720
5806
5721
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5722
ie. out of the way, until a later time when you can bring them back from
5860
5775
5861
5776
def run_for_list(self):
5862
5777
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5778
tree.lock_read()
5779
self.add_cleanup(tree.unlock)
5864
5780
manager = tree.get_shelf_manager()
5865
5781
shelves = manager.active_shelves()
5866
5782
if len(shelves) == 0:
5875
5791
5876
5792
5877
5793
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5794
"""Restore shelved changes.
5879
5795
5880
5796
By default, the most recently shelved changes are restored. However if you
5881
5797
specify a shelf by id those changes will be restored instead. This works
5907
5823
5908
5824
5909
5825
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5826
"""Remove unwanted files from working tree.
5911
5827
5912
5828
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5829
files are never deleted.
5921
5837
5922
5838
To check what clean-tree will do, use --dry-run.
5923
5839
"""
5924
takes_options = ['directory',
5925
Option('ignored', help='Delete all ignored files.'),
5840
takes_options = [Option('ignored', help='Delete all ignored files.'),
5926
5841
Option('detritus', help='Delete conflict files, merge'
5927
5842
' backups, and failed selftest dirs.'),
5928
5843
Option('unknown',
5931
5846
' deleting them.'),
5932
5847
Option('force', help='Do not prompt before deleting.')]
5933
5848
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5934
force=False, directory=u'.'):
5849
force=False):
5935
5850
from bzrlib.clean_tree import clean_tree
5936
5851
if not (unknown or ignored or detritus):
5937
5852
unknown = True
5938
5853
if dry_run:
5939
5854
force = True
5940
clean_tree(directory, unknown=unknown, ignored=ignored,
5941
detritus=detritus, dry_run=dry_run, no_prompt=force)
5855
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5856
dry_run=dry_run, no_prompt=force)
5942
5857
5943
5858
5944
5859
class cmd_reference(Command):
5945
__doc__ = """list, view and set branch locations for nested trees.
5860
"""list, view and set branch locations for nested trees.
5946
5861
5947
5862
If no arguments are provided, lists the branch locations for nested trees.
5948
5863
If one argument is provided, display the branch location for that tree.
5988
5903
self.outf.write('%s %s\n' % (path, location))
5989
5904
5990
5905
5991
def _register_lazy_builtins():
5992
# register lazy builtins from other modules; called at startup and should
5993
# be only called once.
5994
for (name, aliases, module_name) in [
5995
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5996
('cmd_dpush', [], 'bzrlib.foreign'),
5997
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5998
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5999
('cmd_conflicts', [], 'bzrlib.conflicts'),
6000
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6001
]:
6002
builtin_command_registry.register_lazy(name, aliases, module_name)
5906
# these get imported and then picked up by the scan for cmd_*
5907
# TODO: Some more consistent way to split command definitions across files;
5908
# we do need to load at least some information about them to know of
5909
# aliases. ideally we would avoid loading the implementation until the
5910
# details were needed.
5911
from bzrlib.cmd_version_info import cmd_version_info
5912
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5913
from bzrlib.bundle.commands import (
5914
cmd_bundle_info,
5915
)
5916
from bzrlib.foreign import cmd_dpush
5917
from bzrlib.sign_my_commits import cmd_sign_my_commits
5918
from bzrlib.weave_commands import cmd_versionedfile_list, \
5919
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0