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 5060.2.1
- compare with another revision
- download diff
- download tarball
- view history from revision 5060.2.1
- Committer: Robert Collins
- Date: 2010-02-28 10:08:29 UTC
- mto: This revision was merged to the branch mainline in revision 5062.
- Revision ID: robertc@robertcollins.net-20100228100829-nroa3qp8zi8jwxke
* bzr now has a ``.testr.conf`` file in its source tree configured
appropriately for running tests with Testrepository
(``https://launchpad.net/testrepository``). (Robert Collins)
* Documentation about testing with ``subunit`` has been tweaked.
(Robert Collins)
appropriately for running tests with Testrepository
(``https://launchpad.net/testrepository``). (Robert Collins)
* Documentation about testing with ``subunit`` has been tweaked.
(Robert Collins)
- files removed:
- NEWS-template.txt
- bzrlib/tests/per_bzrdir_colo
- files renamed:
- apport/ => contrib/apport/
- apport/bzr-crashdb.conf => contrib/apport/bzr.conf
- files modified:
- .bzrignore
added
removed
bzrlib/builtins.py
60
60
from bzrlib.workingtree import WorkingTree
61
61
""")
62
62
63
from bzrlib.commands import (
64
Command,
65
builtin_command_registry,
66
display_command,
67
)
63
from bzrlib.commands import Command, display_command
68
64
from bzrlib.option import (
69
65
ListOption,
70
66
Option,
232
228
return view_info
233
229
234
230
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
231
# TODO: Make sure no commands unconditionally use the working directory as a
244
232
# branch. If a filename argument is used, the first of them should be used to
245
233
# specify the branch. (Perhaps this can be factored out into some kind of
247
235
# opens the branch?)
248
236
249
237
class cmd_status(Command):
250
__doc__ = """Display status summary.
238
"""Display status summary.
251
239
252
240
This reports on versioned and unknown files, reporting them
253
241
grouped by state. Possible states are:
340
328
341
329
342
330
class cmd_cat_revision(Command):
343
__doc__ = """Write out metadata for a revision.
331
"""Write out metadata for a revision.
344
332
345
333
The revision to print can either be specified by a specific
346
334
revision identifier, or you can use --revision.
348
336
349
337
hidden = True
350
338
takes_args = ['revision_id?']
351
takes_options = ['directory', 'revision']
339
takes_options = ['revision']
352
340
# cat-revision is more for frontends so should be exact
353
341
encoding = 'strict'
354
342
361
349
self.outf.write(revtext.decode('utf-8'))
362
350
363
351
@display_command
364
def run(self, revision_id=None, revision=None, directory=u'.'):
352
def run(self, revision_id=None, revision=None):
365
353
if revision_id is not None and revision is not None:
366
354
raise errors.BzrCommandError('You can only supply one of'
367
355
' revision_id or --revision')
368
356
if revision_id is None and revision is None:
369
357
raise errors.BzrCommandError('You must supply either'
370
358
' --revision or a revision_id')
371
b = WorkingTree.open_containing(directory)[0].branch
359
b = WorkingTree.open_containing(u'.')[0].branch
372
360
373
361
revisions = b.repository.revisions
374
362
if revisions is None:
398
386
399
387
400
388
class cmd_dump_btree(Command):
401
__doc__ = """Dump the contents of a btree index file to stdout.
389
"""Dump the contents of a btree index file to stdout.
402
390
403
391
PATH is a btree index file, it can be any URL. This includes things like
404
392
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
468
456
for node in bt.iter_all_entries():
469
457
# Node is made up of:
470
458
# (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)
459
refs_as_tuples = static_tuple.as_tuples(node[3])
477
460
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
478
461
self.outf.write('%s\n' % (as_tuple,))
479
462
480
463
481
464
class cmd_remove_tree(Command):
482
__doc__ = """Remove the working tree from a given branch/checkout.
465
"""Remove the working tree from a given branch/checkout.
483
466
484
467
Since a lightweight checkout is little more than a working tree
485
468
this will refuse to run against one.
512
495
if (working.has_changes()):
513
496
raise errors.UncommittedChanges(working)
514
497
515
if working.user_url != working.branch.user_url:
498
working_path = working.bzrdir.root_transport.base
499
branch_path = working.branch.bzrdir.root_transport.base
500
if working_path != branch_path:
516
501
raise errors.BzrCommandError("You cannot remove the working tree"
517
502
" from a lightweight checkout")
518
503
520
505
521
506
522
507
class cmd_revno(Command):
523
__doc__ = """Show current revision number.
508
"""Show current revision number.
524
509
525
510
This is equal to the number of revisions on this branch.
526
511
"""
536
521
if tree:
537
522
try:
538
523
wt = WorkingTree.open_containing(location)[0]
539
self.add_cleanup(wt.lock_read().unlock)
524
wt.lock_read()
540
525
except (errors.NoWorkingTree, errors.NotLocalUrl):
541
526
raise errors.NoWorkingTree(location)
527
self.add_cleanup(wt.unlock)
542
528
revid = wt.last_revision()
543
529
try:
544
530
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
547
533
revno = ".".join(str(n) for n in revno_t)
548
534
else:
549
535
b = Branch.open_containing(location)[0]
550
self.add_cleanup(b.lock_read().unlock)
536
b.lock_read()
537
self.add_cleanup(b.unlock)
551
538
revno = b.revno()
552
539
self.cleanup_now()
553
540
self.outf.write(str(revno) + '\n')
554
541
555
542
556
543
class cmd_revision_info(Command):
557
__doc__ = """Show revision number and revision id for a given revision identifier.
544
"""Show revision number and revision id for a given revision identifier.
558
545
"""
559
546
hidden = True
560
547
takes_args = ['revision_info*']
561
548
takes_options = [
562
549
'revision',
563
custom_help('directory',
550
Option('directory',
564
551
help='Branch to examine, '
565
'rather than the one containing the working directory.'),
552
'rather than the one containing the working directory.',
553
short_name='d',
554
type=unicode,
555
),
566
556
Option('tree', help='Show revno of working tree'),
567
557
]
568
558
573
563
try:
574
564
wt = WorkingTree.open_containing(directory)[0]
575
565
b = wt.branch
576
self.add_cleanup(wt.lock_read().unlock)
566
wt.lock_read()
567
self.add_cleanup(wt.unlock)
577
568
except (errors.NoWorkingTree, errors.NotLocalUrl):
578
569
wt = None
579
570
b = Branch.open_containing(directory)[0]
580
self.add_cleanup(b.lock_read().unlock)
571
b.lock_read()
572
self.add_cleanup(b.unlock)
581
573
revision_ids = []
582
574
if revision is not None:
583
575
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
611
603
612
604
613
605
class cmd_add(Command):
614
__doc__ = """Add specified files or directories.
606
"""Add specified files or directories.
615
607
616
608
In non-recursive mode, all the named items are added, regardless
617
609
of whether they were previously ignored. A warning is given if
682
674
should_print=(not is_quiet()))
683
675
684
676
if base_tree:
685
self.add_cleanup(base_tree.lock_read().unlock)
677
base_tree.lock_read()
678
self.add_cleanup(base_tree.unlock)
686
679
tree, file_list = tree_files_for_add(file_list)
687
680
added, ignored = tree.smart_add(file_list, not
688
681
no_recurse, action=action, save=not dry_run)
696
689
697
690
698
691
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
692
"""Create a new versioned directory.
700
693
701
694
This is equivalent to creating the directory and then adding it.
702
695
"""
706
699
707
700
def run(self, dir_list):
708
701
for d in dir_list:
702
os.mkdir(d)
709
703
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)
704
wt.add([dd])
705
self.outf.write('added %s\n' % d)
718
706
719
707
720
708
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
709
"""Show path of a file relative to root"""
722
710
723
711
takes_args = ['filename']
724
712
hidden = True
733
721
734
722
735
723
class cmd_inventory(Command):
736
__doc__ = """Show inventory of the current working copy or a revision.
724
"""Show inventory of the current working copy or a revision.
737
725
738
726
It is possible to limit the output to a particular entry
739
727
type using the --kind option. For example: --kind file.
760
748
761
749
revision = _get_one_revision('inventory', revision)
762
750
work_tree, file_list = tree_files(file_list)
763
self.add_cleanup(work_tree.lock_read().unlock)
751
work_tree.lock_read()
752
self.add_cleanup(work_tree.unlock)
764
753
if revision is not None:
765
754
tree = revision.as_tree(work_tree.branch)
766
755
767
756
extra_trees = [work_tree]
768
self.add_cleanup(tree.lock_read().unlock)
757
tree.lock_read()
758
self.add_cleanup(tree.unlock)
769
759
else:
770
760
tree = work_tree
771
761
extra_trees = []
792
782
793
783
794
784
class cmd_mv(Command):
795
__doc__ = """Move or rename a file.
785
"""Move or rename a file.
796
786
797
787
:Usage:
798
788
bzr mv OLDNAME NEWNAME
831
821
if len(names_list) < 2:
832
822
raise errors.BzrCommandError("missing file argument")
833
823
tree, rel_names = tree_files(names_list, canonicalize=False)
834
self.add_cleanup(tree.lock_tree_write().unlock)
824
tree.lock_tree_write()
825
self.add_cleanup(tree.unlock)
835
826
self._run(tree, names_list, rel_names, after)
836
827
837
828
def run_auto(self, names_list, after, dry_run):
842
833
raise errors.BzrCommandError('--after cannot be specified with'
843
834
' --auto.')
844
835
work_tree, file_list = tree_files(names_list, default_branch='.')
845
self.add_cleanup(work_tree.lock_tree_write().unlock)
836
work_tree.lock_tree_write()
837
self.add_cleanup(work_tree.unlock)
846
838
rename_map.RenameMap.guess_renames(work_tree, dry_run)
847
839
848
840
def _run(self, tree, names_list, rel_names, after):
927
919
928
920
929
921
class cmd_pull(Command):
930
__doc__ = """Turn this branch into a mirror of another branch.
922
"""Turn this branch into a mirror of another branch.
931
923
932
924
By default, this command only works on branches that have not diverged.
933
925
Branches are considered diverged if the destination branch's most recent
956
948
takes_options = ['remember', 'overwrite', 'revision',
957
949
custom_help('verbose',
958
950
help='Show logs of pulled revisions.'),
959
custom_help('directory',
951
Option('directory',
960
952
help='Branch to pull into, '
961
'rather than the one containing the working directory.'),
953
'rather than the one containing the working directory.',
954
short_name='d',
955
type=unicode,
956
),
962
957
Option('local',
963
958
help="Perform a local pull in a bound "
964
959
"branch. Local pulls are not applied to "
979
974
try:
980
975
tree_to = WorkingTree.open_containing(directory)[0]
981
976
branch_to = tree_to.branch
982
self.add_cleanup(tree_to.lock_write().unlock)
983
977
except errors.NoWorkingTree:
984
978
tree_to = None
985
979
branch_to = Branch.open_containing(directory)[0]
986
self.add_cleanup(branch_to.lock_write().unlock)
987
980
988
981
if local and not branch_to.get_bound_location():
989
982
raise errors.LocalRequiresBoundBranch()
990
983
1020
1013
else:
1021
1014
branch_from = Branch.open(location,
1022
1015
possible_transports=possible_transports)
1023
self.add_cleanup(branch_from.lock_read().unlock)
1024
1016
1025
1017
if branch_to.get_parent() is None or remember:
1026
1018
branch_to.set_parent(branch_from.base)
1027
1019
1020
if branch_from is not branch_to:
1021
branch_from.lock_read()
1022
self.add_cleanup(branch_from.unlock)
1028
1023
if revision is not None:
1029
1024
revision_id = revision.as_revision_id(branch_from)
1030
1025
1026
branch_to.lock_write()
1027
self.add_cleanup(branch_to.unlock)
1031
1028
if tree_to is not None:
1032
1029
view_info = _get_view_info_for_change_reporter(tree_to)
1033
1030
change_reporter = delta._ChangeReporter(
1048
1045
1049
1046
1050
1047
class cmd_push(Command):
1051
__doc__ = """Update a mirror of this branch.
1048
"""Update a mirror of this branch.
1052
1049
1053
1050
The target branch will not have its working tree populated because this
1054
1051
is both expensive, and is not supported on remote file systems.
1078
1075
Option('create-prefix',
1079
1076
help='Create the path leading up to the branch '
1080
1077
'if it does not already exist.'),
1081
custom_help('directory',
1078
Option('directory',
1082
1079
help='Branch to push from, '
1083
'rather than the one containing the working directory.'),
1080
'rather than the one containing the working directory.',
1081
short_name='d',
1082
type=unicode,
1083
),
1084
1084
Option('use-existing-dir',
1085
1085
help='By default push will fail if the target'
1086
1086
' directory exists, but does not already'
1112
1112
# Get the source branch
1113
1113
(tree, br_from,
1114
1114
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1115
if strict is None:
1116
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1117
if strict is None: strict = True # default value
1115
1118
# Get the tip's revision_id
1116
1119
revision = _get_one_revision('push', revision)
1117
1120
if revision is not None:
1118
1121
revision_id = revision.in_history(br_from).rev_id
1119
1122
else:
1120
1123
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.')
1124
if strict and tree is not None and revision_id is None:
1125
if (tree.has_changes()):
1126
raise errors.UncommittedChanges(
1127
tree, more='Use --no-strict to force the push.')
1128
if tree.last_revision() != tree.branch.last_revision():
1129
# The tree has lost sync with its branch, there is little
1130
# chance that the user is aware of it but he can still force
1131
# the push with --no-strict
1132
raise errors.OutOfDateTree(
1133
tree, more='Use --no-strict to force the push.')
1134
1126
1135
# Get the stacked_on branch, if any
1127
1136
if stacked_on is not None:
1128
1137
stacked_on = urlutils.normalize_url(stacked_on)
1160
1169
1161
1170
1162
1171
class cmd_branch(Command):
1163
__doc__ = """Create a new branch that is a copy of an existing branch.
1172
"""Create a new branch that is a copy of an existing branch.
1164
1173
1165
1174
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1166
1175
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1206
1215
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1207
1216
from_location)
1208
1217
revision = _get_one_revision('branch', revision)
1209
self.add_cleanup(br_from.lock_read().unlock)
1218
br_from.lock_read()
1219
self.add_cleanup(br_from.unlock)
1210
1220
if revision is not None:
1211
1221
revision_id = revision.as_revision_id(br_from)
1212
1222
else:
1272
1282
1273
1283
1274
1284
class cmd_checkout(Command):
1275
__doc__ = """Create a new checkout of an existing branch.
1285
"""Create a new checkout of an existing branch.
1276
1286
1277
1287
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1278
1288
the branch found in '.'. This is useful if you have removed the working tree
1336
1346
except errors.NoWorkingTree:
1337
1347
source.bzrdir.create_workingtree(revision_id)
1338
1348
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
1349
source.create_checkout(to_location, revision_id, lightweight,
1345
1350
accelerator_tree, hardlink)
1346
1351
1347
1352
1348
1353
class cmd_renames(Command):
1349
__doc__ = """Show list of renamed files.
1354
"""Show list of renamed files.
1350
1355
"""
1351
1356
# TODO: Option to show renames between two historical versions.
1352
1357
1357
1362
@display_command
1358
1363
def run(self, dir=u'.'):
1359
1364
tree = WorkingTree.open_containing(dir)[0]
1360
self.add_cleanup(tree.lock_read().unlock)
1365
tree.lock_read()
1366
self.add_cleanup(tree.unlock)
1361
1367
new_inv = tree.inventory
1362
1368
old_tree = tree.basis_tree()
1363
self.add_cleanup(old_tree.lock_read().unlock)
1369
old_tree.lock_read()
1370
self.add_cleanup(old_tree.unlock)
1364
1371
old_inv = old_tree.inventory
1365
1372
renames = []
1366
1373
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1376
1383
1377
1384
1378
1385
class cmd_update(Command):
1379
__doc__ = """Update a tree to have the latest code committed to its branch.
1386
"""Update a tree to have the latest code committed to its branch.
1380
1387
1381
1388
This will perform a merge into the working tree, and may generate
1382
1389
conflicts. If you have any local changes, you will still
1404
1411
master = branch.get_master_branch(
1405
1412
possible_transports=possible_transports)
1406
1413
if master is not None:
1414
tree.lock_write()
1407
1415
branch_location = master.base
1408
tree.lock_write()
1409
1416
else:
1417
tree.lock_tree_write()
1410
1418
branch_location = tree.branch.base
1411
tree.lock_tree_write()
1412
1419
self.add_cleanup(tree.unlock)
1413
1420
# 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)
1421
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1422
self.outf.encoding)
1417
1423
existing_pending_merges = tree.get_parent_ids()[1:]
1418
1424
if master is None:
1419
1425
old_tip = None
1427
1433
else:
1428
1434
revision_id = branch.last_revision()
1429
1435
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))
1436
revno = branch.revision_id_to_revno(revision_id)
1437
note("Tree is up to date at revision %d of branch %s" %
1438
(revno, branch_location))
1433
1439
return 0
1434
1440
view_info = _get_view_info_for_change_reporter(tree)
1435
1441
change_reporter = delta._ChangeReporter(
1447
1453
"bzr update --revision only works"
1448
1454
" for a revision in the branch history"
1449
1455
% (e.revision))
1450
revno = tree.branch.revision_id_to_dotted_revno(
1456
revno = tree.branch.revision_id_to_revno(
1451
1457
_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:
1458
note('Updated to revision %d of branch %s' %
1459
(revno, branch_location))
1460
if tree.get_parent_ids()[1:] != existing_pending_merges:
1456
1461
note('Your local commits will now show as pending merges with '
1457
1462
"'bzr status', and can be committed with 'bzr commit'.")
1458
1463
if conflicts != 0:
1462
1467
1463
1468
1464
1469
class cmd_info(Command):
1465
__doc__ = """Show information about a working tree, branch or repository.
1470
"""Show information about a working tree, branch or repository.
1466
1471
1467
1472
This command will show all known locations and formats associated to the
1468
1473
tree, branch or repository.
1506
1511
1507
1512
1508
1513
class cmd_remove(Command):
1509
__doc__ = """Remove files or directories.
1514
"""Remove files or directories.
1510
1515
1511
1516
This makes bzr stop tracking changes to the specified files. bzr will delete
1512
1517
them if they can easily be recovered using revert. If no options or
1534
1539
if file_list is not None:
1535
1540
file_list = [f for f in file_list]
1536
1541
1537
self.add_cleanup(tree.lock_write().unlock)
1542
tree.lock_write()
1543
self.add_cleanup(tree.unlock)
1538
1544
# Heuristics should probably all move into tree.remove_smart or
1539
1545
# some such?
1540
1546
if new:
1559
1565
1560
1566
1561
1567
class cmd_file_id(Command):
1562
__doc__ = """Print file_id of a particular file or directory.
1568
"""Print file_id of a particular file or directory.
1563
1569
1564
1570
The file_id is assigned when the file is first added and remains the
1565
1571
same through all revisions where the file exists, even when it is
1581
1587
1582
1588
1583
1589
class cmd_file_path(Command):
1584
__doc__ = """Print path of file_ids to a file or directory.
1590
"""Print path of file_ids to a file or directory.
1585
1591
1586
1592
This prints one line for each directory down to the target,
1587
1593
starting at the branch root.
1603
1609
1604
1610
1605
1611
class cmd_reconcile(Command):
1606
__doc__ = """Reconcile bzr metadata in a branch.
1612
"""Reconcile bzr metadata in a branch.
1607
1613
1608
1614
This can correct data mismatches that may have been caused by
1609
1615
previous ghost operations or bzr upgrades. You should only
1631
1637
1632
1638
1633
1639
class cmd_revision_history(Command):
1634
__doc__ = """Display the list of revision ids on a branch."""
1640
"""Display the list of revision ids on a branch."""
1635
1641
1636
1642
_see_also = ['log']
1637
1643
takes_args = ['location?']
1647
1653
1648
1654
1649
1655
class cmd_ancestry(Command):
1650
__doc__ = """List all revisions merged into this branch."""
1656
"""List all revisions merged into this branch."""
1651
1657
1652
1658
_see_also = ['log', 'revision-history']
1653
1659
takes_args = ['location?']
1672
1678
1673
1679
1674
1680
class cmd_init(Command):
1675
__doc__ = """Make a directory into a versioned branch.
1681
"""Make a directory into a versioned branch.
1676
1682
1677
1683
Use this to create an empty branch, or before importing an
1678
1684
existing project.
1781
1787
1782
1788
1783
1789
class cmd_init_repository(Command):
1784
__doc__ = """Create a shared repository for branches to share storage space.
1790
"""Create a shared repository for branches to share storage space.
1785
1791
1786
1792
New branches created under the repository directory will store their
1787
1793
revisions in the repository, not in the branch directory. For branches
1841
1847
1842
1848
1843
1849
class cmd_diff(Command):
1844
__doc__ = """Show differences in the working tree, between revisions or branches.
1850
"""Show differences in the working tree, between revisions or branches.
1845
1851
1846
1852
If no arguments are given, all changes for the current tree are listed.
1847
1853
If files are given, only the changes in those files are listed.
1933
1939
help='Use this command to compare files.',
1934
1940
type=unicode,
1935
1941
),
1936
RegistryOption('format',
1937
help='Diff format to use.',
1938
lazy_registry=('bzrlib.diff', 'format_registry'),
1939
value_switches=False, title='Diff format'),
1940
1942
]
1941
1943
aliases = ['di', 'dif']
1942
1944
encoding_type = 'exact'
1943
1945
1944
1946
@display_command
1945
1947
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)
1948
prefix=None, old=None, new=None, using=None):
1949
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1949
1950
1950
1951
if (prefix is None) or (prefix == '0'):
1951
1952
# diff -p0 format
1965
1966
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1966
1967
' one or two revision specifiers')
1967
1968
1968
if using is not None and format is not None:
1969
raise errors.BzrCommandError('--using and --format are mutually '
1970
'exclusive.')
1971
1972
1969
(old_tree, new_tree,
1973
1970
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)
1971
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1972
file_list, revision, old, new, apply_view=True)
1976
1973
return show_diff_trees(old_tree, new_tree, sys.stdout,
1977
1974
specific_files=specific_files,
1978
1975
external_diff_options=diff_options,
1979
1976
old_label=old_label, new_label=new_label,
1980
extra_trees=extra_trees, using=using,
1981
format_cls=format)
1977
extra_trees=extra_trees, using=using)
1982
1978
1983
1979
1984
1980
class cmd_deleted(Command):
1985
__doc__ = """List files deleted in the working tree.
1981
"""List files deleted in the working tree.
1986
1982
"""
1987
1983
# TODO: Show files deleted since a previous revision, or
1988
1984
# between two revisions.
1991
1987
# level of effort but possibly much less IO. (Or possibly not,
1992
1988
# if the directories are very large...)
1993
1989
_see_also = ['status', 'ls']
1994
takes_options = ['directory', 'show-ids']
1990
takes_options = ['show-ids']
1995
1991
1996
1992
@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)
1993
def run(self, show_ids=False):
1994
tree = WorkingTree.open_containing(u'.')[0]
1995
tree.lock_read()
1996
self.add_cleanup(tree.unlock)
2000
1997
old = tree.basis_tree()
2001
self.add_cleanup(old.lock_read().unlock)
1998
old.lock_read()
1999
self.add_cleanup(old.unlock)
2002
2000
for path, ie in old.inventory.iter_entries():
2003
2001
if not tree.has_id(ie.file_id):
2004
2002
self.outf.write(path)
2009
2007
2010
2008
2011
2009
class cmd_modified(Command):
2012
__doc__ = """List files modified in working tree.
2010
"""List files modified in working tree.
2013
2011
"""
2014
2012
2015
2013
hidden = True
2016
2014
_see_also = ['status', 'ls']
2017
takes_options = ['directory', 'null']
2015
takes_options = [
2016
Option('null',
2017
help='Write an ascii NUL (\\0) separator '
2018
'between files rather than a newline.')
2019
]
2018
2020
2019
2021
@display_command
2020
def run(self, null=False, directory=u'.'):
2021
tree = WorkingTree.open_containing(directory)[0]
2022
def run(self, null=False):
2023
tree = WorkingTree.open_containing(u'.')[0]
2022
2024
td = tree.changes_from(tree.basis_tree())
2023
2025
for path, id, kind, text_modified, meta_modified in td.modified:
2024
2026
if null:
2028
2030
2029
2031
2030
2032
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
2033
"""List files added in working tree.
2032
2034
"""
2033
2035
2034
2036
hidden = True
2035
2037
_see_also = ['status', 'ls']
2036
takes_options = ['directory', 'null']
2038
takes_options = [
2039
Option('null',
2040
help='Write an ascii NUL (\\0) separator '
2041
'between files rather than a newline.')
2042
]
2037
2043
2038
2044
@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)
2045
def run(self, null=False):
2046
wt = WorkingTree.open_containing(u'.')[0]
2047
wt.lock_read()
2048
self.add_cleanup(wt.unlock)
2042
2049
basis = wt.basis_tree()
2043
self.add_cleanup(basis.lock_read().unlock)
2050
basis.lock_read()
2051
self.add_cleanup(basis.unlock)
2044
2052
basis_inv = basis.inventory
2045
2053
inv = wt.inventory
2046
2054
for file_id in inv:
2049
2057
if inv.is_root(file_id) and len(basis_inv) == 0:
2050
2058
continue
2051
2059
path = inv.id2path(file_id)
2052
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2060
if not os.access(osutils.abspath(path), os.F_OK):
2053
2061
continue
2054
2062
if null:
2055
2063
self.outf.write(path + '\0')
2058
2066
2059
2067
2060
2068
class cmd_root(Command):
2061
__doc__ = """Show the tree root directory.
2069
"""Show the tree root directory.
2062
2070
2063
2071
The root is the nearest enclosing directory with a .bzr control
2064
2072
directory."""
2088
2096
2089
2097
2090
2098
class cmd_log(Command):
2091
__doc__ = """Show historical log for a branch or subset of a branch.
2099
"""Show historical log for a branch or subset of a branch.
2092
2100
2093
2101
log is bzr's default tool for exploring the history of a branch.
2094
2102
The branch to use is taken from the first parameter. If no parameters
2255
2263
help='Show just the specified revision.'
2256
2264
' See also "help revisionspec".'),
2257
2265
'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
2266
Option('levels',
2264
2267
short_name='n',
2265
2268
help='Number of levels to display - 0 for all, 1 for flat.',
2280
2283
help='Show changes made in each revision as a patch.'),
2281
2284
Option('include-merges',
2282
2285
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
2286
]
2288
2287
encoding_type = 'replace'
2289
2288
2299
2298
message=None,
2300
2299
limit=None,
2301
2300
show_diff=False,
2302
include_merges=False,
2303
authors=None,
2304
exclude_common_ancestry=False,
2305
):
2301
include_merges=False):
2306
2302
from bzrlib.log import (
2307
2303
Logger,
2308
2304
make_log_request_dict,
2309
2305
_get_info_for_log_files,
2310
2306
)
2311
2307
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
2308
if include_merges:
2317
2309
if levels is None:
2318
2310
levels = 0
2334
2326
if file_list:
2335
2327
# find the file ids to log and check for directory filtering
2336
2328
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2337
revision, file_list, self.add_cleanup)
2329
revision, file_list)
2330
self.add_cleanup(b.unlock)
2338
2331
for relpath, file_id, kind in file_info_list:
2339
2332
if file_id is None:
2340
2333
raise errors.BzrCommandError(
2358
2351
location = '.'
2359
2352
dir, relpath = bzrdir.BzrDir.open_containing(location)
2360
2353
b = dir.open_branch()
2361
self.add_cleanup(b.lock_read().unlock)
2354
b.lock_read()
2355
self.add_cleanup(b.unlock)
2362
2356
rev1, rev2 = _get_revision_range(revision, b, self.name())
2363
2357
2364
2358
# Decide on the type of delta & diff filtering to use
2384
2378
show_timezone=timezone,
2385
2379
delta_format=get_verbosity_level(),
2386
2380
levels=levels,
2387
show_advice=levels is None,
2388
author_list_handler=authors)
2381
show_advice=levels is None)
2389
2382
2390
2383
# Choose the algorithm for doing the logging. It's annoying
2391
2384
# having multiple code paths like this but necessary until
2410
2403
direction=direction, specific_fileids=file_ids,
2411
2404
start_revision=rev1, end_revision=rev2, limit=limit,
2412
2405
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
)
2406
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2416
2407
Logger(b, rqst).show(lf)
2417
2408
2418
2409
2437
2428
raise errors.BzrCommandError(
2438
2429
"bzr %s doesn't accept two revisions in different"
2439
2430
" 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)
2431
rev1 = start_spec.in_history(branch)
2445
2432
# Avoid loading all of history when we know a missing
2446
2433
# end of range means the last revision ...
2447
2434
if end_spec.spec is None:
2476
2463
2477
2464
2478
2465
class cmd_touching_revisions(Command):
2479
__doc__ = """Return revision-ids which affected a particular file.
2466
"""Return revision-ids which affected a particular file.
2480
2467
2481
2468
A more user-friendly interface is "bzr log FILE".
2482
2469
"""
2489
2476
tree, relpath = WorkingTree.open_containing(filename)
2490
2477
file_id = tree.path2id(relpath)
2491
2478
b = tree.branch
2492
self.add_cleanup(b.lock_read().unlock)
2479
b.lock_read()
2480
self.add_cleanup(b.unlock)
2493
2481
touching_revs = log.find_touching_revisions(b, file_id)
2494
2482
for revno, revision_id, what in touching_revs:
2495
2483
self.outf.write("%6d %s\n" % (revno, what))
2496
2484
2497
2485
2498
2486
class cmd_ls(Command):
2499
__doc__ = """List files in a tree.
2487
"""List files in a tree.
2500
2488
"""
2501
2489
2502
2490
_see_also = ['status', 'cat']
2508
2496
help='Recurse into subdirectories.'),
2509
2497
Option('from-root',
2510
2498
help='Print paths relative to the root of the branch.'),
2511
Option('unknown', short_name='u',
2512
help='Print unknown files.'),
2499
Option('unknown', help='Print unknown files.'),
2513
2500
Option('versioned', help='Print versioned files.',
2514
2501
short_name='V'),
2515
Option('ignored', short_name='i',
2516
help='Print ignored files.'),
2517
Option('kind', short_name='k',
2502
Option('ignored', help='Print ignored files.'),
2503
Option('null',
2504
help='Write an ascii NUL (\\0) separator '
2505
'between files rather than a newline.'),
2506
Option('kind',
2518
2507
help='List entries of a particular kind: file, directory, symlink.',
2519
2508
type=unicode),
2520
'null',
2521
2509
'show-ids',
2522
'directory',
2523
2510
]
2524
2511
@display_command
2525
2512
def run(self, revision=None, verbose=False,
2526
2513
recursive=False, from_root=False,
2527
2514
unknown=False, versioned=False, ignored=False,
2528
null=False, kind=None, show_ids=False, path=None, directory=None):
2515
null=False, kind=None, show_ids=False, path=None):
2529
2516
2530
2517
if kind and kind not in ('file', 'directory', 'symlink'):
2531
2518
raise errors.BzrCommandError('invalid kind specified')
2543
2530
raise errors.BzrCommandError('cannot specify both --from-root'
2544
2531
' and PATH')
2545
2532
fs_path = path
2546
tree, branch, relpath = \
2547
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2533
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2534
fs_path)
2548
2535
2549
2536
# Calculate the prefix to use
2550
2537
prefix = None
2565
2552
view_str = views.view_display_str(view_files)
2566
2553
note("Ignoring files outside view. View is %s" % view_str)
2567
2554
2568
self.add_cleanup(tree.lock_read().unlock)
2555
tree.lock_read()
2556
self.add_cleanup(tree.unlock)
2569
2557
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2570
2558
from_dir=relpath, recursive=recursive):
2571
2559
# Apply additional masking
2613
2601
2614
2602
2615
2603
class cmd_unknowns(Command):
2616
__doc__ = """List unknown files.
2604
"""List unknown files.
2617
2605
"""
2618
2606
2619
2607
hidden = True
2620
2608
_see_also = ['ls']
2621
takes_options = ['directory']
2622
2609
2623
2610
@display_command
2624
def run(self, directory=u'.'):
2625
for f in WorkingTree.open_containing(directory)[0].unknowns():
2611
def run(self):
2612
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2626
2613
self.outf.write(osutils.quotefn(f) + '\n')
2627
2614
2628
2615
2629
2616
class cmd_ignore(Command):
2630
__doc__ = """Ignore specified files or patterns.
2617
"""Ignore specified files or patterns.
2631
2618
2632
2619
See ``bzr help patterns`` for details on the syntax of patterns.
2633
2620
2642
2629
using this command or directly by using an editor, be sure to commit
2643
2630
it.
2644
2631
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
2632
Patterns prefixed with '!' are exceptions to ignore patterns and take
2652
2633
precedence over regular ignores. Such exceptions are used to specify
2653
2634
files that should be versioned which would otherwise be ignored.
2693
2674
2694
2675
_see_also = ['status', 'ignored', 'patterns']
2695
2676
takes_args = ['name_pattern*']
2696
takes_options = ['directory',
2697
Option('default-rules',
2698
help='Display the default ignore rules that bzr uses.')
2677
takes_options = [
2678
Option('old-default-rules',
2679
help='Write out the ignore rules bzr < 0.9 always used.')
2699
2680
]
2700
2681
2701
def run(self, name_pattern_list=None, default_rules=None,
2702
directory=u'.'):
2682
def run(self, name_pattern_list=None, old_default_rules=None):
2703
2683
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)
2684
if old_default_rules is not None:
2685
# dump the rules and exit
2686
for pattern in ignores.OLD_DEFAULTS:
2687
print pattern
2708
2688
return
2709
2689
if not name_pattern_list:
2710
2690
raise errors.BzrCommandError("ignore requires at least one "
2711
"NAME_PATTERN or --default-rules.")
2691
"NAME_PATTERN or --old-default-rules")
2712
2692
name_pattern_list = [globbing.normalize_pattern(p)
2713
2693
for p in name_pattern_list]
2714
2694
for name_pattern in name_pattern_list:
2716
2696
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2717
2697
raise errors.BzrCommandError(
2718
2698
"NAME_PATTERN should not be an absolute path")
2719
tree, relpath = WorkingTree.open_containing(directory)
2699
tree, relpath = WorkingTree.open_containing(u'.')
2720
2700
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2721
2701
ignored = globbing.Globster(name_pattern_list)
2722
2702
matches = []
2726
2706
if id is not None:
2727
2707
filename = entry[0]
2728
2708
if ignored.match(filename):
2729
matches.append(filename)
2709
matches.append(filename.encode('utf-8'))
2730
2710
tree.unlock()
2731
2711
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),))
2712
print "Warning: the following files are version controlled and" \
2713
" match your ignore pattern:\n%s" \
2714
"\nThese files will continue to be version controlled" \
2715
" unless you 'bzr remove' them." % ("\n".join(matches),)
2736
2716
2737
2717
2738
2718
class cmd_ignored(Command):
2739
__doc__ = """List ignored files and the patterns that matched them.
2719
"""List ignored files and the patterns that matched them.
2740
2720
2741
2721
List all the ignored files and the ignore pattern that caused the file to
2742
2722
be ignored.
2748
2728
2749
2729
encoding_type = 'replace'
2750
2730
_see_also = ['ignore', 'ls']
2751
takes_options = ['directory']
2752
2731
2753
2732
@display_command
2754
def run(self, directory=u'.'):
2755
tree = WorkingTree.open_containing(directory)[0]
2756
self.add_cleanup(tree.lock_read().unlock)
2733
def run(self):
2734
tree = WorkingTree.open_containing(u'.')[0]
2735
tree.lock_read()
2736
self.add_cleanup(tree.unlock)
2757
2737
for path, file_class, kind, file_id, entry in tree.list_files():
2758
2738
if file_class != 'I':
2759
2739
continue
2763
2743
2764
2744
2765
2745
class cmd_lookup_revision(Command):
2766
__doc__ = """Lookup the revision-id from a revision-number
2746
"""Lookup the revision-id from a revision-number
2767
2747
2768
2748
:Examples:
2769
2749
bzr lookup-revision 33
2770
2750
"""
2771
2751
hidden = True
2772
2752
takes_args = ['revno']
2773
takes_options = ['directory']
2774
2753
2775
2754
@display_command
2776
def run(self, revno, directory=u'.'):
2755
def run(self, revno):
2777
2756
try:
2778
2757
revno = int(revno)
2779
2758
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)
2759
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2760
2761
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2784
2762
2785
2763
2786
2764
class cmd_export(Command):
2787
__doc__ = """Export current or past revision to a destination directory or archive.
2765
"""Export current or past revision to a destination directory or archive.
2788
2766
2789
2767
If no revision is specified this exports the last committed revision.
2790
2768
2812
2790
================= =========================
2813
2791
"""
2814
2792
takes_args = ['dest', 'branch_or_subdir?']
2815
takes_options = ['directory',
2793
takes_options = [
2816
2794
Option('format',
2817
2795
help="Type of file to export to.",
2818
2796
type=unicode),
2822
2800
Option('root',
2823
2801
type=str,
2824
2802
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
2803
]
2829
2804
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2830
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2805
root=None, filters=False):
2831
2806
from bzrlib.export import export
2832
2807
2833
2808
if branch_or_subdir is None:
2834
tree = WorkingTree.open_containing(directory)[0]
2809
tree = WorkingTree.open_containing(u'.')[0]
2835
2810
b = tree.branch
2836
2811
subdir = None
2837
2812
else:
2840
2815
2841
2816
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2842
2817
try:
2843
export(rev_tree, dest, format, root, subdir, filtered=filters,
2844
per_file_timestamps=per_file_timestamps)
2818
export(rev_tree, dest, format, root, subdir, filtered=filters)
2845
2819
except errors.NoSuchExportFormat, e:
2846
2820
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2847
2821
2848
2822
2849
2823
class cmd_cat(Command):
2850
__doc__ = """Write the contents of a file as of a given revision to standard output.
2824
"""Write the contents of a file as of a given revision to standard output.
2851
2825
2852
2826
If no revision is nominated, the last revision is used.
2853
2827
2856
2830
"""
2857
2831
2858
2832
_see_also = ['ls']
2859
takes_options = ['directory',
2833
takes_options = [
2860
2834
Option('name-from-revision', help='The path name in the old tree.'),
2861
2835
Option('filters', help='Apply content filters to display the '
2862
2836
'convenience form.'),
2867
2841
2868
2842
@display_command
2869
2843
def run(self, filename, revision=None, name_from_revision=False,
2870
filters=False, directory=None):
2844
filters=False):
2871
2845
if revision is not None and len(revision) != 1:
2872
2846
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2873
2847
" one revision specifier")
2874
2848
tree, branch, relpath = \
2875
_open_directory_or_containing_tree_or_branch(filename, directory)
2876
self.add_cleanup(branch.lock_read().unlock)
2849
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2850
branch.lock_read()
2851
self.add_cleanup(branch.unlock)
2877
2852
return self._run(tree, branch, relpath, filename, revision,
2878
2853
name_from_revision, filters)
2879
2854
2882
2857
if tree is None:
2883
2858
tree = b.basis_tree()
2884
2859
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2885
self.add_cleanup(rev_tree.lock_read().unlock)
2860
rev_tree.lock_read()
2861
self.add_cleanup(rev_tree.unlock)
2886
2862
2887
2863
old_file_id = rev_tree.path2id(relpath)
2888
2864
2931
2907
2932
2908
2933
2909
class cmd_local_time_offset(Command):
2934
__doc__ = """Show the offset in seconds from GMT to local time."""
2910
"""Show the offset in seconds from GMT to local time."""
2935
2911
hidden = True
2936
2912
@display_command
2937
2913
def run(self):
2938
self.outf.write("%s\n" % osutils.local_time_offset())
2914
print osutils.local_time_offset()
2939
2915
2940
2916
2941
2917
2942
2918
class cmd_commit(Command):
2943
__doc__ = """Commit changes into a new revision.
2919
"""Commit changes into a new revision.
2944
2920
2945
2921
An explanatory message needs to be given for each commit. This is
2946
2922
often done by using the --message option (getting the message from the
3054
3030
"the master branch until a normal commit "
3055
3031
"is performed."
3056
3032
),
3057
Option('show-diff', short_name='p',
3033
Option('show-diff',
3058
3034
help='When no message is supplied, show the diff along'
3059
3035
' with the status summary in the message editor.'),
3060
3036
]
3140
3116
'(use --file "%(f)s" to take commit message from that file)'
3141
3117
% { 'f': message })
3142
3118
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
3119
3150
3120
def get_message(commit_obj):
3151
3121
"""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,
3122
my_message = message
3123
if my_message is not None and '\r' in my_message:
3124
my_message = my_message.replace('\r\n', '\n')
3125
my_message = my_message.replace('\r', '\n')
3126
if my_message is None and not file:
3127
t = make_commit_message_template_encoded(tree,
3161
3128
selected_list, diff=show_diff,
3162
3129
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
3130
start_message = generate_commit_message_template(commit_obj)
3169
my_message = edit_commit_message_encoded(text,
3131
my_message = edit_commit_message_encoded(t,
3170
3132
start_message=start_message)
3171
3133
if my_message is None:
3172
3134
raise errors.BzrCommandError("please specify a commit"
3173
3135
" message with either --message or --file")
3136
elif my_message and file:
3137
raise errors.BzrCommandError(
3138
"please specify either --message or --file")
3139
if file:
3140
my_message = codecs.open(file, 'rt',
3141
osutils.get_user_encoding()).read()
3174
3142
if my_message == "":
3175
3143
raise errors.BzrCommandError("empty commit message specified")
3176
3144
return my_message
3188
3156
timezone=offset,
3189
3157
exclude=safe_relpath_files(tree, exclude))
3190
3158
except PointlessCommit:
3159
# FIXME: This should really happen before the file is read in;
3160
# perhaps prepare the commit; get the message; then actually commit
3191
3161
raise errors.BzrCommandError("No changes to commit."
3192
3162
" Use --unchanged to commit anyhow.")
3193
3163
except ConflictsInTree:
3198
3168
raise errors.BzrCommandError("Commit refused because there are"
3199
3169
" unknown files in the working tree.")
3200
3170
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
3171
raise errors.BzrCommandError(str(e) + "\n"
3172
'To commit to master branch, run update and then commit.\n'
3173
'You can also pass --local to commit to continue working '
3174
'disconnected.')
3206
3175
3207
3176
3208
3177
class cmd_check(Command):
3209
__doc__ = """Validate working tree structure, branch consistency and repository history.
3178
"""Validate working tree structure, branch consistency and repository history.
3210
3179
3211
3180
This command checks various invariants about branch and repository storage
3212
3181
to detect data corruption or bzr bugs.
3276
3245
3277
3246
3278
3247
class cmd_upgrade(Command):
3279
__doc__ = """Upgrade branch storage to current format.
3248
"""Upgrade branch storage to current format.
3280
3249
3281
3250
The check command or bzr developers may sometimes advise you to run
3282
3251
this command. When the default format has changed you may also be warned
3300
3269
3301
3270
3302
3271
class cmd_whoami(Command):
3303
__doc__ = """Show or set bzr user id.
3272
"""Show or set bzr user id.
3304
3273
3305
3274
:Examples:
3306
3275
Show the email of the current user::
3350
3319
3351
3320
3352
3321
class cmd_nick(Command):
3353
__doc__ = """Print or set the branch nickname.
3322
"""Print or set the branch nickname.
3354
3323
3355
3324
If unset, the tree root directory name is used as the nickname.
3356
3325
To print the current nickname, execute with no argument.
3361
3330
3362
3331
_see_also = ['info']
3363
3332
takes_args = ['nickname?']
3364
takes_options = ['directory']
3365
def run(self, nickname=None, directory=u'.'):
3366
branch = Branch.open_containing(directory)[0]
3333
def run(self, nickname=None):
3334
branch = Branch.open_containing(u'.')[0]
3367
3335
if nickname is None:
3368
3336
self.printme(branch)
3369
3337
else:
3371
3339
3372
3340
@display_command
3373
3341
def printme(self, branch):
3374
self.outf.write('%s\n' % branch.nick)
3342
print branch.nick
3375
3343
3376
3344
3377
3345
class cmd_alias(Command):
3378
__doc__ = """Set/unset and display aliases.
3346
"""Set/unset and display aliases.
3379
3347
3380
3348
:Examples:
3381
3349
Show the current aliases::
3445
3413
3446
3414
3447
3415
class cmd_selftest(Command):
3448
__doc__ = """Run internal test suite.
3416
"""Run internal test suite.
3449
3417
3450
3418
If arguments are given, they are regular expressions that say which tests
3451
3419
should run. Tests matching any expression are run, and other tests are
3592
3560
raise errors.BzrCommandError("subunit not available. subunit "
3593
3561
"needs to be installed to use --subunit.")
3594
3562
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
3563
if parallel:
3601
3564
self.additional_selftest_args.setdefault(
3602
3565
'suite_decorators', []).append(parallel)
3633
3596
3634
3597
3635
3598
class cmd_version(Command):
3636
__doc__ = """Show version of bzr."""
3599
"""Show version of bzr."""
3637
3600
3638
3601
encoding_type = 'replace'
3639
3602
takes_options = [
3650
3613
3651
3614
3652
3615
class cmd_rocks(Command):
3653
__doc__ = """Statement of optimism."""
3616
"""Statement of optimism."""
3654
3617
3655
3618
hidden = True
3656
3619
3657
3620
@display_command
3658
3621
def run(self):
3659
self.outf.write("It sure does!\n")
3622
print "It sure does!"
3660
3623
3661
3624
3662
3625
class cmd_find_merge_base(Command):
3663
__doc__ = """Find and print a base revision for merging two branches."""
3626
"""Find and print a base revision for merging two branches."""
3664
3627
# TODO: Options to specify revisions on either side, as if
3665
3628
# merging only part of the history.
3666
3629
takes_args = ['branch', 'other']
3672
3635
3673
3636
branch1 = Branch.open_containing(branch)[0]
3674
3637
branch2 = Branch.open_containing(other)[0]
3675
self.add_cleanup(branch1.lock_read().unlock)
3676
self.add_cleanup(branch2.lock_read().unlock)
3638
branch1.lock_read()
3639
self.add_cleanup(branch1.unlock)
3640
branch2.lock_read()
3641
self.add_cleanup(branch2.unlock)
3677
3642
last1 = ensure_null(branch1.last_revision())
3678
3643
last2 = ensure_null(branch2.last_revision())
3679
3644
3680
3645
graph = branch1.repository.get_graph(branch2.repository)
3681
3646
base_rev_id = graph.find_unique_lca(last1, last2)
3682
3647
3683
self.outf.write('merge base is revision %s\n' % base_rev_id)
3648
print 'merge base is revision %s' % base_rev_id
3684
3649
3685
3650
3686
3651
class cmd_merge(Command):
3687
__doc__ = """Perform a three-way merge.
3652
"""Perform a three-way merge.
3688
3653
3689
3654
The source of the merge can be specified either in the form of a branch,
3690
3655
or in the form of a path to a file containing a merge directive generated
3773
3738
' completely merged into the source, pull from the'
3774
3739
' source rather than merging. When this happens,'
3775
3740
' you do not need to commit the result.'),
3776
custom_help('directory',
3741
Option('directory',
3777
3742
help='Branch to merge into, '
3778
'rather than the one containing the working directory.'),
3743
'rather than the one containing the working directory.',
3744
short_name='d',
3745
type=unicode,
3746
),
3779
3747
Option('preview', help='Instead of merging, show a diff of the'
3780
3748
' merge.'),
3781
3749
Option('interactive', help='Select changes interactively.',
3814
3782
unversioned_filter=tree.is_ignored, view_info=view_info)
3815
3783
pb = ui.ui_factory.nested_progress_bar()
3816
3784
self.add_cleanup(pb.finished)
3817
self.add_cleanup(tree.lock_write().unlock)
3785
tree.lock_write()
3786
self.add_cleanup(tree.unlock)
3818
3787
if location is not None:
3819
3788
try:
3820
3789
mergeable = bundle.read_mergeable_from_url(location,
4041
4010
4042
4011
4043
4012
class cmd_remerge(Command):
4044
__doc__ = """Redo a merge.
4013
"""Redo a merge.
4045
4014
4046
4015
Use this if you want to try a different merge technique while resolving
4047
4016
conflicts. Some merge techniques are better than others, and remerge
4072
4041
4073
4042
def run(self, file_list=None, merge_type=None, show_base=False,
4074
4043
reprocess=False):
4075
from bzrlib.conflicts import restore
4076
4044
if merge_type is None:
4077
4045
merge_type = _mod_merge.Merge3Merger
4078
4046
tree, file_list = tree_files(file_list)
4079
self.add_cleanup(tree.lock_write().unlock)
4047
tree.lock_write()
4048
self.add_cleanup(tree.unlock)
4080
4049
parents = tree.get_parent_ids()
4081
4050
if len(parents) != 2:
4082
4051
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4135
4104
4136
4105
4137
4106
class cmd_revert(Command):
4138
__doc__ = """Revert files to a previous revision.
4107
"""Revert files to a previous revision.
4139
4108
4140
4109
Giving a list of files will revert only those files. Otherwise, all files
4141
4110
will be reverted. If the revision is not specified with '--revision', the
4192
4161
def run(self, revision=None, no_backup=False, file_list=None,
4193
4162
forget_merges=None):
4194
4163
tree, file_list = tree_files(file_list)
4195
self.add_cleanup(tree.lock_tree_write().unlock)
4164
tree.lock_write()
4165
self.add_cleanup(tree.unlock)
4196
4166
if forget_merges:
4197
4167
tree.set_parent_ids(tree.get_parent_ids()[:1])
4198
4168
else:
4206
4176
4207
4177
4208
4178
class cmd_assert_fail(Command):
4209
__doc__ = """Test reporting of assertion failures"""
4179
"""Test reporting of assertion failures"""
4210
4180
# intended just for use in testing
4211
4181
4212
4182
hidden = True
4216
4186
4217
4187
4218
4188
class cmd_help(Command):
4219
__doc__ = """Show help on a command or other topic.
4189
"""Show help on a command or other topic.
4220
4190
"""
4221
4191
4222
4192
_see_also = ['topics']
4235
4205
4236
4206
4237
4207
class cmd_shell_complete(Command):
4238
__doc__ = """Show appropriate completions for context.
4208
"""Show appropriate completions for context.
4239
4209
4240
4210
For a list of all available commands, say 'bzr shell-complete'.
4241
4211
"""
4250
4220
4251
4221
4252
4222
class cmd_missing(Command):
4253
__doc__ = """Show unmerged/unpulled revisions between two branches.
4223
"""Show unmerged/unpulled revisions between two branches.
4254
4224
4255
4225
OTHER_BRANCH may be local or remote.
4256
4226
4334
4304
restrict = 'remote'
4335
4305
4336
4306
local_branch = Branch.open_containing(u".")[0]
4337
self.add_cleanup(local_branch.lock_read().unlock)
4338
4339
4307
parent = local_branch.get_parent()
4340
4308
if other_branch is None:
4341
4309
other_branch = parent
4350
4318
remote_branch = Branch.open(other_branch)
4351
4319
if remote_branch.base == local_branch.base:
4352
4320
remote_branch = local_branch
4353
else:
4354
self.add_cleanup(remote_branch.lock_read().unlock)
4355
4321
4322
local_branch.lock_read()
4323
self.add_cleanup(local_branch.unlock)
4356
4324
local_revid_range = _revision_range_to_revid_range(
4357
4325
_get_revision_range(my_revision, local_branch,
4358
4326
self.name()))
4359
4327
4328
remote_branch.lock_read()
4329
self.add_cleanup(remote_branch.unlock)
4360
4330
remote_revid_range = _revision_range_to_revid_range(
4361
4331
_get_revision_range(revision,
4362
4332
remote_branch, self.name()))
4412
4382
message("Branches are up to date.\n")
4413
4383
self.cleanup_now()
4414
4384
if not status_code and parent is None and other_branch is not None:
4415
self.add_cleanup(local_branch.lock_write().unlock)
4385
local_branch.lock_write()
4386
self.add_cleanup(local_branch.unlock)
4416
4387
# handle race conditions - a parent might be set while we run.
4417
4388
if local_branch.get_parent() is None:
4418
4389
local_branch.set_parent(remote_branch.base)
4420
4391
4421
4392
4422
4393
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
"""
4394
"""Compress the data within a repository."""
4440
4395
4441
4396
_see_also = ['repositories']
4442
4397
takes_args = ['branch_or_repo?']
4443
takes_options = [
4444
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4445
]
4446
4398
4447
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4399
def run(self, branch_or_repo='.'):
4448
4400
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4449
4401
try:
4450
4402
branch = dir.open_branch()
4451
4403
repository = branch.repository
4452
4404
except errors.NotBranchError:
4453
4405
repository = dir.open_repository()
4454
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4406
repository.pack()
4455
4407
4456
4408
4457
4409
class cmd_plugins(Command):
4458
__doc__ = """List the installed plugins.
4410
"""List the installed plugins.
4459
4411
4460
4412
This command displays the list of installed plugins including
4461
4413
version of plugin and a short description of each.
4492
4444
doc = '(no description)'
4493
4445
result.append((name_ver, doc, plugin.path()))
4494
4446
for name_ver, doc, path in sorted(result):
4495
self.outf.write("%s\n" % name_ver)
4496
self.outf.write(" %s\n" % doc)
4447
print name_ver
4448
print ' ', doc
4497
4449
if verbose:
4498
self.outf.write(" %s\n" % path)
4499
self.outf.write("\n")
4450
print ' ', path
4451
print
4500
4452
4501
4453
4502
4454
class cmd_testament(Command):
4503
__doc__ = """Show testament (signing-form) of a revision."""
4455
"""Show testament (signing-form) of a revision."""
4504
4456
takes_options = [
4505
4457
'revision',
4506
4458
Option('long', help='Produce long-format testament.'),
4518
4470
b = Branch.open_containing(branch)[0]
4519
4471
else:
4520
4472
b = Branch.open(branch)
4521
self.add_cleanup(b.lock_read().unlock)
4473
b.lock_read()
4474
self.add_cleanup(b.unlock)
4522
4475
if revision is None:
4523
4476
rev_id = b.last_revision()
4524
4477
else:
4531
4484
4532
4485
4533
4486
class cmd_annotate(Command):
4534
__doc__ = """Show the origin of each line in a file.
4487
"""Show the origin of each line in a file.
4535
4488
4536
4489
This prints out the given file with an annotation on the left side
4537
4490
indicating which revision, author and date introduced the change.
4548
4501
Option('long', help='Show commit date in annotations.'),
4549
4502
'revision',
4550
4503
'show-ids',
4551
'directory',
4552
4504
]
4553
4505
encoding_type = 'exact'
4554
4506
4555
4507
@display_command
4556
4508
def run(self, filename, all=False, long=False, revision=None,
4557
show_ids=False, directory=None):
4509
show_ids=False):
4558
4510
from bzrlib.annotate import annotate_file, annotate_file_tree
4559
4511
wt, branch, relpath = \
4560
_open_directory_or_containing_tree_or_branch(filename, directory)
4512
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4561
4513
if wt is not None:
4562
self.add_cleanup(wt.lock_read().unlock)
4514
wt.lock_read()
4515
self.add_cleanup(wt.unlock)
4563
4516
else:
4564
self.add_cleanup(branch.lock_read().unlock)
4517
branch.lock_read()
4518
self.add_cleanup(branch.unlock)
4565
4519
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4566
self.add_cleanup(tree.lock_read().unlock)
4520
tree.lock_read()
4521
self.add_cleanup(tree.unlock)
4567
4522
if wt is not None:
4568
4523
file_id = wt.path2id(relpath)
4569
4524
else:
4582
4537
4583
4538
4584
4539
class cmd_re_sign(Command):
4585
__doc__ = """Create a digital signature for an existing revision."""
4540
"""Create a digital signature for an existing revision."""
4586
4541
# TODO be able to replace existing ones.
4587
4542
4588
4543
hidden = True # is this right ?
4589
4544
takes_args = ['revision_id*']
4590
takes_options = ['directory', 'revision']
4545
takes_options = ['revision']
4591
4546
4592
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4547
def run(self, revision_id_list=None, revision=None):
4593
4548
if revision_id_list is not None and revision is not None:
4594
4549
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4595
4550
if revision_id_list is None and revision is None:
4596
4551
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)
4552
b = WorkingTree.open_containing(u'.')[0].branch
4553
b.lock_write()
4554
self.add_cleanup(b.unlock)
4599
4555
return self._run(b, revision_id_list, revision)
4600
4556
4601
4557
def _run(self, b, revision_id_list, revision):
4647
4603
4648
4604
4649
4605
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.
4606
"""Convert the current branch into a checkout of the supplied branch.
4652
4607
4653
4608
Once converted into a checkout, commits must succeed on the master branch
4654
4609
before they will be applied to the local branch.
4660
4615
4661
4616
_see_also = ['checkouts', 'unbind']
4662
4617
takes_args = ['location?']
4663
takes_options = ['directory']
4618
takes_options = []
4664
4619
4665
def run(self, location=None, directory=u'.'):
4666
b, relpath = Branch.open_containing(directory)
4620
def run(self, location=None):
4621
b, relpath = Branch.open_containing(u'.')
4667
4622
if location is None:
4668
4623
try:
4669
4624
location = b.get_old_bound_location()
4688
4643
4689
4644
4690
4645
class cmd_unbind(Command):
4691
__doc__ = """Convert the current checkout into a regular branch.
4646
"""Convert the current checkout into a regular branch.
4692
4647
4693
4648
After unbinding, the local branch is considered independent and subsequent
4694
4649
commits will be local only.
4696
4651
4697
4652
_see_also = ['checkouts', 'bind']
4698
4653
takes_args = []
4699
takes_options = ['directory']
4654
takes_options = []
4700
4655
4701
def run(self, directory=u'.'):
4702
b, relpath = Branch.open_containing(directory)
4656
def run(self):
4657
b, relpath = Branch.open_containing(u'.')
4703
4658
if not b.unbind():
4704
4659
raise errors.BzrCommandError('Local branch is not bound')
4705
4660
4706
4661
4707
4662
class cmd_uncommit(Command):
4708
__doc__ = """Remove the last committed revision.
4663
"""Remove the last committed revision.
4709
4664
4710
4665
--verbose will print out what is being removed.
4711
4666
--dry-run will go through all the motions, but not actually
4751
4706
b = control.open_branch()
4752
4707
4753
4708
if tree is not None:
4754
self.add_cleanup(tree.lock_write().unlock)
4709
tree.lock_write()
4710
self.add_cleanup(tree.unlock)
4755
4711
else:
4756
self.add_cleanup(b.lock_write().unlock)
4712
b.lock_write()
4713
self.add_cleanup(b.unlock)
4757
4714
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4758
4715
4759
4716
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4777
4734
rev_id = b.get_rev_id(revno)
4778
4735
4779
4736
if rev_id is None or _mod_revision.is_null(rev_id):
4780
self.outf.write('No revisions to uncommit.\n')
4737
ui.ui_factory.note('No revisions to uncommit.')
4781
4738
return 1
4782
4739
4740
log_collector = ui.ui_factory.make_output_stream()
4783
4741
lf = log_formatter('short',
4784
to_file=self.outf,
4742
to_file=log_collector,
4785
4743
show_timezone='original')
4786
4744
4787
4745
show_log(b,
4792
4750
end_revision=last_revno)
4793
4751
4794
4752
if dry_run:
4795
self.outf.write('Dry-run, pretending to remove'
4796
' the above revisions.\n')
4753
ui.ui_factory.note('Dry-run, pretending to remove the above revisions.')
4797
4754
else:
4798
self.outf.write('The above revision(s) will be removed.\n')
4755
ui.ui_factory.note('The above revision(s) will be removed.')
4799
4756
4800
4757
if not force:
4801
if not ui.ui_factory.get_boolean('Are you sure'):
4802
self.outf.write('Canceled')
4758
if not ui.ui_factory.get_boolean('Are you sure [y/N]? '):
4759
ui.ui_factory.note('Canceled')
4803
4760
return 0
4804
4761
4805
4762
mutter('Uncommitting from {%s} to {%s}',
4806
4763
last_rev_id, rev_id)
4807
4764
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4808
4765
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)
4766
ui.ui_factory.note('You can restore the old tip by running:\n'
4767
' bzr pull . -r revid:%s' % last_rev_id)
4811
4768
4812
4769
4813
4770
class cmd_break_lock(Command):
4814
__doc__ = """Break a dead lock on a repository, branch or working directory.
4771
"""Break a dead lock on a repository, branch or working directory.
4815
4772
4816
4773
CAUTION: Locks should only be broken when you are sure that the process
4817
4774
holding the lock has been stopped.
4836
4793
4837
4794
4838
4795
class cmd_wait_until_signalled(Command):
4839
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4796
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4840
4797
4841
4798
This just prints a line to signal when it is ready, then blocks on stdin.
4842
4799
"""
4850
4807
4851
4808
4852
4809
class cmd_serve(Command):
4853
__doc__ = """Run the bzr server."""
4810
"""Run the bzr server."""
4854
4811
4855
4812
aliases = ['server']
4856
4813
4867
4824
'result in a dynamically allocated port. The default port '
4868
4825
'depends on the protocol.',
4869
4826
type=str),
4870
custom_help('directory',
4871
help='Serve contents of this directory.'),
4827
Option('directory',
4828
help='Serve contents of this directory.',
4829
type=unicode),
4872
4830
Option('allow-writes',
4873
4831
help='By default the server is a readonly server. Supplying '
4874
4832
'--allow-writes enables write access to the contents of '
4915
4873
4916
4874
4917
4875
class cmd_join(Command):
4918
__doc__ = """Combine a tree into its containing tree.
4876
"""Combine a tree into its containing tree.
4919
4877
4920
4878
This command requires the target tree to be in a rich-root format.
4921
4879
4961
4919
4962
4920
4963
4921
class cmd_split(Command):
4964
__doc__ = """Split a subdirectory of a tree into a separate tree.
4922
"""Split a subdirectory of a tree into a separate tree.
4965
4923
4966
4924
This command will produce a target tree in a format that supports
4967
4925
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4987
4945
4988
4946
4989
4947
class cmd_merge_directive(Command):
4990
__doc__ = """Generate a merge directive for auto-merge tools.
4948
"""Generate a merge directive for auto-merge tools.
4991
4949
4992
4950
A directive requests a merge to be performed, and also provides all the
4993
4951
information necessary to do so. This means it must either include a
5086
5044
5087
5045
5088
5046
class cmd_send(Command):
5089
__doc__ = """Mail or create a merge-directive for submitting changes.
5047
"""Mail or create a merge-directive for submitting changes.
5090
5048
5091
5049
A merge directive provides many things needed for requesting merges:
5092
5050
5174
5132
short_name='f',
5175
5133
type=unicode),
5176
5134
Option('output', short_name='o',
5177
help='Write merge directive to this file or directory; '
5135
help='Write merge directive to this file; '
5178
5136
'use - for stdout.',
5179
5137
type=unicode),
5180
5138
Option('strict',
5203
5161
5204
5162
5205
5163
class cmd_bundle_revisions(cmd_send):
5206
__doc__ = """Create a merge-directive for submitting changes.
5164
"""Create a merge-directive for submitting changes.
5207
5165
5208
5166
A merge directive provides many things needed for requesting merges:
5209
5167
5276
5234
5277
5235
5278
5236
class cmd_tag(Command):
5279
__doc__ = """Create, remove or modify a tag naming a revision.
5237
"""Create, remove or modify a tag naming a revision.
5280
5238
5281
5239
Tags give human-meaningful names to revisions. Commands that take a -r
5282
5240
(--revision) option can be given -rtag:X, where X is any previously
5290
5248
5291
5249
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5292
5250
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
5251
"""
5299
5252
5300
5253
_see_also = ['commit', 'tags']
5301
takes_args = ['tag_name?']
5254
takes_args = ['tag_name']
5302
5255
takes_options = [
5303
5256
Option('delete',
5304
5257
help='Delete this tag rather than placing it.',
5305
5258
),
5306
custom_help('directory',
5307
help='Branch in which to place the tag.'),
5259
Option('directory',
5260
help='Branch in which to place the tag.',
5261
short_name='d',
5262
type=unicode,
5263
),
5308
5264
Option('force',
5309
5265
help='Replace existing tags.',
5310
5266
),
5311
5267
'revision',
5312
5268
]
5313
5269
5314
def run(self, tag_name=None,
5270
def run(self, tag_name,
5315
5271
delete=None,
5316
5272
directory='.',
5317
5273
force=None,
5318
5274
revision=None,
5319
5275
):
5320
5276
branch, relpath = Branch.open_containing(directory)
5321
self.add_cleanup(branch.lock_write().unlock)
5277
branch.lock_write()
5278
self.add_cleanup(branch.unlock)
5322
5279
if delete:
5323
if tag_name is None:
5324
raise errors.BzrCommandError("No tag specified to delete.")
5325
5280
branch.tags.delete_tag(tag_name)
5326
5281
self.outf.write('Deleted tag %s.\n' % tag_name)
5327
5282
else:
5333
5288
revision_id = revision[0].as_revision_id(branch)
5334
5289
else:
5335
5290
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
5291
if (not force) and branch.tags.has_tag(tag_name):
5342
5292
raise errors.TagAlreadyExists(tag_name)
5343
5293
branch.tags.set_tag(tag_name, revision_id)
5345
5295
5346
5296
5347
5297
class cmd_tags(Command):
5348
__doc__ = """List tags.
5298
"""List tags.
5349
5299
5350
5300
This command shows a table of tag names and the revisions they reference.
5351
5301
"""
5352
5302
5353
5303
_see_also = ['tag']
5354
5304
takes_options = [
5355
custom_help('directory',
5356
help='Branch whose tags should be displayed.'),
5305
Option('directory',
5306
help='Branch whose tags should be displayed.',
5307
short_name='d',
5308
type=unicode,
5309
),
5357
5310
RegistryOption.from_kwargs('sort',
5358
5311
'Sort tags by different criteria.', title='Sorting',
5359
5312
alpha='Sort tags lexicographically (default).',
5376
5329
if not tags:
5377
5330
return
5378
5331
5379
self.add_cleanup(branch.lock_read().unlock)
5332
branch.lock_read()
5333
self.add_cleanup(branch.unlock)
5380
5334
if revision:
5381
5335
graph = branch.repository.get_graph()
5382
5336
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5415
5369
5416
5370
5417
5371
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5372
"""Reconfigure the type of a bzr directory.
5419
5373
5420
5374
A target configuration must be specified.
5421
5375
5506
5460
5507
5461
5508
5462
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5463
"""Set the branch of a checkout and update.
5510
5464
5511
5465
For lightweight checkouts, this changes the branch being referenced.
5512
5466
For heavyweight checkouts, this checks that there are no local commits
5602
5556
5603
5557
5604
5558
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5559
"""Manage filtered views.
5606
5560
5607
5561
Views provide a mask over the tree so that users can focus on
5608
5562
a subset of a tree when doing their work. After creating a view,
5756
5710
5757
5711
5758
5712
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5713
"""Show hooks."""
5760
5714
5761
5715
hidden = True
5762
5716
5775
5729
self.outf.write(" <no hooks installed>\n")
5776
5730
5777
5731
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
5732
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5733
"""Temporarily set aside some changes from the current tree.
5805
5734
5806
5735
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5736
ie. out of the way, until a later time when you can bring them back from
5860
5789
5861
5790
def run_for_list(self):
5862
5791
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5792
tree.lock_read()
5793
self.add_cleanup(tree.unlock)
5864
5794
manager = tree.get_shelf_manager()
5865
5795
shelves = manager.active_shelves()
5866
5796
if len(shelves) == 0:
5875
5805
5876
5806
5877
5807
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5808
"""Restore shelved changes.
5879
5809
5880
5810
By default, the most recently shelved changes are restored. However if you
5881
5811
specify a shelf by id those changes will be restored instead. This works
5907
5837
5908
5838
5909
5839
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5840
"""Remove unwanted files from working tree.
5911
5841
5912
5842
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5843
files are never deleted.
5921
5851
5922
5852
To check what clean-tree will do, use --dry-run.
5923
5853
"""
5924
takes_options = ['directory',
5925
Option('ignored', help='Delete all ignored files.'),
5854
takes_options = [Option('ignored', help='Delete all ignored files.'),
5926
5855
Option('detritus', help='Delete conflict files, merge'
5927
5856
' backups, and failed selftest dirs.'),
5928
5857
Option('unknown',
5931
5860
' deleting them.'),
5932
5861
Option('force', help='Do not prompt before deleting.')]
5933
5862
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5934
force=False, directory=u'.'):
5863
force=False):
5935
5864
from bzrlib.clean_tree import clean_tree
5936
5865
if not (unknown or ignored or detritus):
5937
5866
unknown = True
5938
5867
if dry_run:
5939
5868
force = True
5940
clean_tree(directory, unknown=unknown, ignored=ignored,
5941
detritus=detritus, dry_run=dry_run, no_prompt=force)
5869
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5870
dry_run=dry_run, no_prompt=force)
5942
5871
5943
5872
5944
5873
class cmd_reference(Command):
5945
__doc__ = """list, view and set branch locations for nested trees.
5874
"""list, view and set branch locations for nested trees.
5946
5875
5947
5876
If no arguments are provided, lists the branch locations for nested trees.
5948
5877
If one argument is provided, display the branch location for that tree.
5988
5917
self.outf.write('%s %s\n' % (path, location))
5989
5918
5990
5919
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)
5920
# these get imported and then picked up by the scan for cmd_*
5921
# TODO: Some more consistent way to split command definitions across files;
5922
# we do need to load at least some information about them to know of
5923
# aliases. ideally we would avoid loading the implementation until the
5924
# details were needed.
5925
from bzrlib.cmd_version_info import cmd_version_info
5926
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5927
from bzrlib.bundle.commands import (
5928
cmd_bundle_info,
5929
)
5930
from bzrlib.foreign import cmd_dpush
5931
from bzrlib.sign_my_commits import cmd_sign_my_commits
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0