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 5068.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 5068.1.1
- Committer: Vincent Ladeuil
- Date: 2010-03-02 10:21:39 UTC
- mfrom: (4797.2.24 2.1)
- mto: This revision was merged to the branch mainline in revision 5069.
- Revision ID: v.ladeuil+lp@free.fr-20100302102139-b5cba7h6xu13mekg
Merge 2.1 into trunk including fixes for #331095, #507557, #185103, #524184 and #369501
- files removed:
- bzrlib/tests/blackbox/test_rmbranch.py
- 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,
239
235
# opens the branch?)
240
236
241
237
class cmd_status(Command):
242
__doc__ = """Display status summary.
238
"""Display status summary.
243
239
244
240
This reports on versioned and unknown files, reporting them
245
241
grouped by state. Possible states are:
332
328
333
329
334
330
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
331
"""Write out metadata for a revision.
336
332
337
333
The revision to print can either be specified by a specific
338
334
revision identifier, or you can use --revision.
390
386
391
387
392
388
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
389
"""Dump the contents of a btree index file to stdout.
394
390
395
391
PATH is a btree index file, it can be any URL. This includes things like
396
392
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
456
for node in bt.iter_all_entries():
461
457
# Node is made up of:
462
458
# (index, key, value, [references])
463
try:
464
refs = node[3]
465
except IndexError:
466
refs_as_tuples = None
467
else:
468
refs_as_tuples = static_tuple.as_tuples(refs)
459
refs_as_tuples = static_tuple.as_tuples(node[3])
469
460
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
461
self.outf.write('%s\n' % (as_tuple,))
471
462
472
463
473
464
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
465
"""Remove the working tree from a given branch/checkout.
475
466
476
467
Since a lightweight checkout is little more than a working tree
477
468
this will refuse to run against one.
504
495
if (working.has_changes()):
505
496
raise errors.UncommittedChanges(working)
506
497
507
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:
508
501
raise errors.BzrCommandError("You cannot remove the working tree"
509
502
" from a lightweight checkout")
510
503
512
505
513
506
514
507
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
508
"""Show current revision number.
516
509
517
510
This is equal to the number of revisions on this branch.
518
511
"""
528
521
if tree:
529
522
try:
530
523
wt = WorkingTree.open_containing(location)[0]
531
self.add_cleanup(wt.lock_read().unlock)
524
wt.lock_read()
532
525
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
526
raise errors.NoWorkingTree(location)
527
self.add_cleanup(wt.unlock)
534
528
revid = wt.last_revision()
535
529
try:
536
530
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
539
533
revno = ".".join(str(n) for n in revno_t)
540
534
else:
541
535
b = Branch.open_containing(location)[0]
542
self.add_cleanup(b.lock_read().unlock)
536
b.lock_read()
537
self.add_cleanup(b.unlock)
543
538
revno = b.revno()
544
539
self.cleanup_now()
545
540
self.outf.write(str(revno) + '\n')
546
541
547
542
548
543
class cmd_revision_info(Command):
549
__doc__ = """Show revision number and revision id for a given revision identifier.
544
"""Show revision number and revision id for a given revision identifier.
550
545
"""
551
546
hidden = True
552
547
takes_args = ['revision_info*']
568
563
try:
569
564
wt = WorkingTree.open_containing(directory)[0]
570
565
b = wt.branch
571
self.add_cleanup(wt.lock_read().unlock)
566
wt.lock_read()
567
self.add_cleanup(wt.unlock)
572
568
except (errors.NoWorkingTree, errors.NotLocalUrl):
573
569
wt = None
574
570
b = Branch.open_containing(directory)[0]
575
self.add_cleanup(b.lock_read().unlock)
571
b.lock_read()
572
self.add_cleanup(b.unlock)
576
573
revision_ids = []
577
574
if revision is not None:
578
575
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
606
603
607
604
608
605
class cmd_add(Command):
609
__doc__ = """Add specified files or directories.
606
"""Add specified files or directories.
610
607
611
608
In non-recursive mode, all the named items are added, regardless
612
609
of whether they were previously ignored. A warning is given if
677
674
should_print=(not is_quiet()))
678
675
679
676
if base_tree:
680
self.add_cleanup(base_tree.lock_read().unlock)
677
base_tree.lock_read()
678
self.add_cleanup(base_tree.unlock)
681
679
tree, file_list = tree_files_for_add(file_list)
682
680
added, ignored = tree.smart_add(file_list, not
683
681
no_recurse, action=action, save=not dry_run)
691
689
692
690
693
691
class cmd_mkdir(Command):
694
__doc__ = """Create a new versioned directory.
692
"""Create a new versioned directory.
695
693
696
694
This is equivalent to creating the directory and then adding it.
697
695
"""
701
699
702
700
def run(self, dir_list):
703
701
for d in dir_list:
702
os.mkdir(d)
704
703
wt, dd = WorkingTree.open_containing(d)
705
base = os.path.dirname(dd)
706
id = wt.path2id(base)
707
if id != None:
708
os.mkdir(d)
709
wt.add([dd])
710
self.outf.write('added %s\n' % d)
711
else:
712
raise errors.NotVersionedError(path=base)
704
wt.add([dd])
705
self.outf.write('added %s\n' % d)
713
706
714
707
715
708
class cmd_relpath(Command):
716
__doc__ = """Show path of a file relative to root"""
709
"""Show path of a file relative to root"""
717
710
718
711
takes_args = ['filename']
719
712
hidden = True
728
721
729
722
730
723
class cmd_inventory(Command):
731
__doc__ = """Show inventory of the current working copy or a revision.
724
"""Show inventory of the current working copy or a revision.
732
725
733
726
It is possible to limit the output to a particular entry
734
727
type using the --kind option. For example: --kind file.
755
748
756
749
revision = _get_one_revision('inventory', revision)
757
750
work_tree, file_list = tree_files(file_list)
758
self.add_cleanup(work_tree.lock_read().unlock)
751
work_tree.lock_read()
752
self.add_cleanup(work_tree.unlock)
759
753
if revision is not None:
760
754
tree = revision.as_tree(work_tree.branch)
761
755
762
756
extra_trees = [work_tree]
763
self.add_cleanup(tree.lock_read().unlock)
757
tree.lock_read()
758
self.add_cleanup(tree.unlock)
764
759
else:
765
760
tree = work_tree
766
761
extra_trees = []
787
782
788
783
789
784
class cmd_mv(Command):
790
__doc__ = """Move or rename a file.
785
"""Move or rename a file.
791
786
792
787
:Usage:
793
788
bzr mv OLDNAME NEWNAME
826
821
if len(names_list) < 2:
827
822
raise errors.BzrCommandError("missing file argument")
828
823
tree, rel_names = tree_files(names_list, canonicalize=False)
829
self.add_cleanup(tree.lock_tree_write().unlock)
824
tree.lock_tree_write()
825
self.add_cleanup(tree.unlock)
830
826
self._run(tree, names_list, rel_names, after)
831
827
832
828
def run_auto(self, names_list, after, dry_run):
837
833
raise errors.BzrCommandError('--after cannot be specified with'
838
834
' --auto.')
839
835
work_tree, file_list = tree_files(names_list, default_branch='.')
840
self.add_cleanup(work_tree.lock_tree_write().unlock)
836
work_tree.lock_tree_write()
837
self.add_cleanup(work_tree.unlock)
841
838
rename_map.RenameMap.guess_renames(work_tree, dry_run)
842
839
843
840
def _run(self, tree, names_list, rel_names, after):
922
919
923
920
924
921
class cmd_pull(Command):
925
__doc__ = """Turn this branch into a mirror of another branch.
922
"""Turn this branch into a mirror of another branch.
926
923
927
924
By default, this command only works on branches that have not diverged.
928
925
Branches are considered diverged if the destination branch's most recent
977
974
try:
978
975
tree_to = WorkingTree.open_containing(directory)[0]
979
976
branch_to = tree_to.branch
980
self.add_cleanup(tree_to.lock_write().unlock)
981
977
except errors.NoWorkingTree:
982
978
tree_to = None
983
979
branch_to = Branch.open_containing(directory)[0]
984
self.add_cleanup(branch_to.lock_write().unlock)
985
980
986
981
if local and not branch_to.get_bound_location():
987
982
raise errors.LocalRequiresBoundBranch()
988
983
1018
1013
else:
1019
1014
branch_from = Branch.open(location,
1020
1015
possible_transports=possible_transports)
1021
self.add_cleanup(branch_from.lock_read().unlock)
1022
1016
1023
1017
if branch_to.get_parent() is None or remember:
1024
1018
branch_to.set_parent(branch_from.base)
1025
1019
1020
if branch_from is not branch_to:
1021
branch_from.lock_read()
1022
self.add_cleanup(branch_from.unlock)
1026
1023
if revision is not None:
1027
1024
revision_id = revision.as_revision_id(branch_from)
1028
1025
1026
branch_to.lock_write()
1027
self.add_cleanup(branch_to.unlock)
1029
1028
if tree_to is not None:
1030
1029
view_info = _get_view_info_for_change_reporter(tree_to)
1031
1030
change_reporter = delta._ChangeReporter(
1046
1045
1047
1046
1048
1047
class cmd_push(Command):
1049
__doc__ = """Update a mirror of this branch.
1048
"""Update a mirror of this branch.
1050
1049
1051
1050
The target branch will not have its working tree populated because this
1052
1051
is both expensive, and is not supported on remote file systems.
1113
1112
# Get the source branch
1114
1113
(tree, br_from,
1115
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
1116
1118
# Get the tip's revision_id
1117
1119
revision = _get_one_revision('push', revision)
1118
1120
if revision is not None:
1119
1121
revision_id = revision.in_history(br_from).rev_id
1120
1122
else:
1121
1123
revision_id = None
1122
if tree is not None and revision_id is None:
1123
tree.check_changed_or_out_of_date(
1124
strict, 'push_strict',
1125
more_error='Use --no-strict to force the push.',
1126
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
1127
1135
# Get the stacked_on branch, if any
1128
1136
if stacked_on is not None:
1129
1137
stacked_on = urlutils.normalize_url(stacked_on)
1161
1169
1162
1170
1163
1171
class cmd_branch(Command):
1164
__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.
1165
1173
1166
1174
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1167
1175
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1207
1215
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1208
1216
from_location)
1209
1217
revision = _get_one_revision('branch', revision)
1210
self.add_cleanup(br_from.lock_read().unlock)
1218
br_from.lock_read()
1219
self.add_cleanup(br_from.unlock)
1211
1220
if revision is not None:
1212
1221
revision_id = revision.as_revision_id(br_from)
1213
1222
else:
1273
1282
1274
1283
1275
1284
class cmd_checkout(Command):
1276
__doc__ = """Create a new checkout of an existing branch.
1285
"""Create a new checkout of an existing branch.
1277
1286
1278
1287
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1279
1288
the branch found in '.'. This is useful if you have removed the working tree
1342
1351
1343
1352
1344
1353
class cmd_renames(Command):
1345
__doc__ = """Show list of renamed files.
1354
"""Show list of renamed files.
1346
1355
"""
1347
1356
# TODO: Option to show renames between two historical versions.
1348
1357
1353
1362
@display_command
1354
1363
def run(self, dir=u'.'):
1355
1364
tree = WorkingTree.open_containing(dir)[0]
1356
self.add_cleanup(tree.lock_read().unlock)
1365
tree.lock_read()
1366
self.add_cleanup(tree.unlock)
1357
1367
new_inv = tree.inventory
1358
1368
old_tree = tree.basis_tree()
1359
self.add_cleanup(old_tree.lock_read().unlock)
1369
old_tree.lock_read()
1370
self.add_cleanup(old_tree.unlock)
1360
1371
old_inv = old_tree.inventory
1361
1372
renames = []
1362
1373
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1372
1383
1373
1384
1374
1385
class cmd_update(Command):
1375
__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.
1376
1387
1377
1388
This will perform a merge into the working tree, and may generate
1378
1389
conflicts. If you have any local changes, you will still
1400
1411
master = branch.get_master_branch(
1401
1412
possible_transports=possible_transports)
1402
1413
if master is not None:
1414
tree.lock_write()
1403
1415
branch_location = master.base
1404
tree.lock_write()
1405
1416
else:
1417
tree.lock_tree_write()
1406
1418
branch_location = tree.branch.base
1407
tree.lock_tree_write()
1408
1419
self.add_cleanup(tree.unlock)
1409
1420
# get rid of the final '/' and be ready for display
1410
branch_location = urlutils.unescape_for_display(
1411
branch_location.rstrip('/'),
1412
self.outf.encoding)
1421
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1422
self.outf.encoding)
1413
1423
existing_pending_merges = tree.get_parent_ids()[1:]
1414
1424
if master is None:
1415
1425
old_tip = None
1423
1433
else:
1424
1434
revision_id = branch.last_revision()
1425
1435
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1426
revno = branch.revision_id_to_dotted_revno(revision_id)
1427
note("Tree is up to date at revision %s of branch %s" %
1428
('.'.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))
1429
1439
return 0
1430
1440
view_info = _get_view_info_for_change_reporter(tree)
1431
1441
change_reporter = delta._ChangeReporter(
1443
1453
"bzr update --revision only works"
1444
1454
" for a revision in the branch history"
1445
1455
% (e.revision))
1446
revno = tree.branch.revision_id_to_dotted_revno(
1456
revno = tree.branch.revision_id_to_revno(
1447
1457
_mod_revision.ensure_null(tree.last_revision()))
1448
note('Updated to revision %s of branch %s' %
1449
('.'.join(map(str, revno)), branch_location))
1450
parent_ids = tree.get_parent_ids()
1451
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:
1452
1461
note('Your local commits will now show as pending merges with '
1453
1462
"'bzr status', and can be committed with 'bzr commit'.")
1454
1463
if conflicts != 0:
1458
1467
1459
1468
1460
1469
class cmd_info(Command):
1461
__doc__ = """Show information about a working tree, branch or repository.
1470
"""Show information about a working tree, branch or repository.
1462
1471
1463
1472
This command will show all known locations and formats associated to the
1464
1473
tree, branch or repository.
1502
1511
1503
1512
1504
1513
class cmd_remove(Command):
1505
__doc__ = """Remove files or directories.
1514
"""Remove files or directories.
1506
1515
1507
1516
This makes bzr stop tracking changes to the specified files. bzr will delete
1508
1517
them if they can easily be recovered using revert. If no options or
1530
1539
if file_list is not None:
1531
1540
file_list = [f for f in file_list]
1532
1541
1533
self.add_cleanup(tree.lock_write().unlock)
1542
tree.lock_write()
1543
self.add_cleanup(tree.unlock)
1534
1544
# Heuristics should probably all move into tree.remove_smart or
1535
1545
# some such?
1536
1546
if new:
1555
1565
1556
1566
1557
1567
class cmd_file_id(Command):
1558
__doc__ = """Print file_id of a particular file or directory.
1568
"""Print file_id of a particular file or directory.
1559
1569
1560
1570
The file_id is assigned when the file is first added and remains the
1561
1571
same through all revisions where the file exists, even when it is
1577
1587
1578
1588
1579
1589
class cmd_file_path(Command):
1580
__doc__ = """Print path of file_ids to a file or directory.
1590
"""Print path of file_ids to a file or directory.
1581
1591
1582
1592
This prints one line for each directory down to the target,
1583
1593
starting at the branch root.
1599
1609
1600
1610
1601
1611
class cmd_reconcile(Command):
1602
__doc__ = """Reconcile bzr metadata in a branch.
1612
"""Reconcile bzr metadata in a branch.
1603
1613
1604
1614
This can correct data mismatches that may have been caused by
1605
1615
previous ghost operations or bzr upgrades. You should only
1627
1637
1628
1638
1629
1639
class cmd_revision_history(Command):
1630
__doc__ = """Display the list of revision ids on a branch."""
1640
"""Display the list of revision ids on a branch."""
1631
1641
1632
1642
_see_also = ['log']
1633
1643
takes_args = ['location?']
1643
1653
1644
1654
1645
1655
class cmd_ancestry(Command):
1646
__doc__ = """List all revisions merged into this branch."""
1656
"""List all revisions merged into this branch."""
1647
1657
1648
1658
_see_also = ['log', 'revision-history']
1649
1659
takes_args = ['location?']
1668
1678
1669
1679
1670
1680
class cmd_init(Command):
1671
__doc__ = """Make a directory into a versioned branch.
1681
"""Make a directory into a versioned branch.
1672
1682
1673
1683
Use this to create an empty branch, or before importing an
1674
1684
existing project.
1777
1787
1778
1788
1779
1789
class cmd_init_repository(Command):
1780
__doc__ = """Create a shared repository for branches to share storage space.
1790
"""Create a shared repository for branches to share storage space.
1781
1791
1782
1792
New branches created under the repository directory will store their
1783
1793
revisions in the repository, not in the branch directory. For branches
1837
1847
1838
1848
1839
1849
class cmd_diff(Command):
1840
__doc__ = """Show differences in the working tree, between revisions or branches.
1850
"""Show differences in the working tree, between revisions or branches.
1841
1851
1842
1852
If no arguments are given, all changes for the current tree are listed.
1843
1853
If files are given, only the changes in those files are listed.
1929
1939
help='Use this command to compare files.',
1930
1940
type=unicode,
1931
1941
),
1932
RegistryOption('format',
1933
help='Diff format to use.',
1934
lazy_registry=('bzrlib.diff', 'format_registry'),
1935
value_switches=False, title='Diff format'),
1936
1942
]
1937
1943
aliases = ['di', 'dif']
1938
1944
encoding_type = 'exact'
1939
1945
1940
1946
@display_command
1941
1947
def run(self, revision=None, file_list=None, diff_options=None,
1942
prefix=None, old=None, new=None, using=None, format=None):
1943
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1944
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
1945
1950
1946
1951
if (prefix is None) or (prefix == '0'):
1947
1952
# diff -p0 format
1961
1966
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1967
' one or two revision specifiers')
1963
1968
1964
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
1966
'exclusive.')
1967
1968
1969
(old_tree, new_tree,
1969
1970
old_branch, new_branch,
1970
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
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)
1972
1973
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1974
specific_files=specific_files,
1974
1975
external_diff_options=diff_options,
1975
1976
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1977
format_cls=format)
1977
extra_trees=extra_trees, using=using)
1978
1978
1979
1979
1980
1980
class cmd_deleted(Command):
1981
__doc__ = """List files deleted in the working tree.
1981
"""List files deleted in the working tree.
1982
1982
"""
1983
1983
# TODO: Show files deleted since a previous revision, or
1984
1984
# between two revisions.
1992
1992
@display_command
1993
1993
def run(self, show_ids=False):
1994
1994
tree = WorkingTree.open_containing(u'.')[0]
1995
self.add_cleanup(tree.lock_read().unlock)
1995
tree.lock_read()
1996
self.add_cleanup(tree.unlock)
1996
1997
old = tree.basis_tree()
1997
self.add_cleanup(old.lock_read().unlock)
1998
old.lock_read()
1999
self.add_cleanup(old.unlock)
1998
2000
for path, ie in old.inventory.iter_entries():
1999
2001
if not tree.has_id(ie.file_id):
2000
2002
self.outf.write(path)
2005
2007
2006
2008
2007
2009
class cmd_modified(Command):
2008
__doc__ = """List files modified in working tree.
2010
"""List files modified in working tree.
2009
2011
"""
2010
2012
2011
2013
hidden = True
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
2042
2044
@display_command
2043
2045
def run(self, null=False):
2044
2046
wt = WorkingTree.open_containing(u'.')[0]
2045
self.add_cleanup(wt.lock_read().unlock)
2047
wt.lock_read()
2048
self.add_cleanup(wt.unlock)
2046
2049
basis = wt.basis_tree()
2047
self.add_cleanup(basis.lock_read().unlock)
2050
basis.lock_read()
2051
self.add_cleanup(basis.unlock)
2048
2052
basis_inv = basis.inventory
2049
2053
inv = wt.inventory
2050
2054
for file_id in inv:
2062
2066
2063
2067
2064
2068
class cmd_root(Command):
2065
__doc__ = """Show the tree root directory.
2069
"""Show the tree root directory.
2066
2070
2067
2071
The root is the nearest enclosing directory with a .bzr control
2068
2072
directory."""
2092
2096
2093
2097
2094
2098
class cmd_log(Command):
2095
__doc__ = """Show historical log for a branch or subset of a branch.
2099
"""Show historical log for a branch or subset of a branch.
2096
2100
2097
2101
log is bzr's default tool for exploring the history of a branch.
2098
2102
The branch to use is taken from the first parameter. If no parameters
2279
2283
help='Show changes made in each revision as a patch.'),
2280
2284
Option('include-merges',
2281
2285
help='Show merged revisions like --levels 0 does.'),
2282
Option('exclude-common-ancestry',
2283
help='Display only the revisions that are not part'
2284
' of both ancestries (require -rX..Y)'
2285
)
2286
2286
]
2287
2287
encoding_type = 'replace'
2288
2288
2298
2298
message=None,
2299
2299
limit=None,
2300
2300
show_diff=False,
2301
include_merges=False,
2302
exclude_common_ancestry=False,
2303
):
2301
include_merges=False):
2304
2302
from bzrlib.log import (
2305
2303
Logger,
2306
2304
make_log_request_dict,
2307
2305
_get_info_for_log_files,
2308
2306
)
2309
2307
direction = (forward and 'forward') or 'reverse'
2310
if (exclude_common_ancestry
2311
and (revision is None or len(revision) != 2)):
2312
raise errors.BzrCommandError(
2313
'--exclude-common-ancestry requires -r with two revisions')
2314
2308
if include_merges:
2315
2309
if levels is None:
2316
2310
levels = 0
2332
2326
if file_list:
2333
2327
# find the file ids to log and check for directory filtering
2334
2328
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2335
revision, file_list, self.add_cleanup)
2329
revision, file_list)
2330
self.add_cleanup(b.unlock)
2336
2331
for relpath, file_id, kind in file_info_list:
2337
2332
if file_id is None:
2338
2333
raise errors.BzrCommandError(
2356
2351
location = '.'
2357
2352
dir, relpath = bzrdir.BzrDir.open_containing(location)
2358
2353
b = dir.open_branch()
2359
self.add_cleanup(b.lock_read().unlock)
2354
b.lock_read()
2355
self.add_cleanup(b.unlock)
2360
2356
rev1, rev2 = _get_revision_range(revision, b, self.name())
2361
2357
2362
2358
# Decide on the type of delta & diff filtering to use
2407
2403
direction=direction, specific_fileids=file_ids,
2408
2404
start_revision=rev1, end_revision=rev2, limit=limit,
2409
2405
message_search=message, delta_type=delta_type,
2410
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2411
exclude_common_ancestry=exclude_common_ancestry,
2412
)
2406
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2413
2407
Logger(b, rqst).show(lf)
2414
2408
2415
2409
2434
2428
raise errors.BzrCommandError(
2435
2429
"bzr %s doesn't accept two revisions in different"
2436
2430
" branches." % command_name)
2437
if start_spec.spec is None:
2438
# Avoid loading all the history.
2439
rev1 = RevisionInfo(branch, None, None)
2440
else:
2441
rev1 = start_spec.in_history(branch)
2431
rev1 = start_spec.in_history(branch)
2442
2432
# Avoid loading all of history when we know a missing
2443
2433
# end of range means the last revision ...
2444
2434
if end_spec.spec is None:
2473
2463
2474
2464
2475
2465
class cmd_touching_revisions(Command):
2476
__doc__ = """Return revision-ids which affected a particular file.
2466
"""Return revision-ids which affected a particular file.
2477
2467
2478
2468
A more user-friendly interface is "bzr log FILE".
2479
2469
"""
2486
2476
tree, relpath = WorkingTree.open_containing(filename)
2487
2477
file_id = tree.path2id(relpath)
2488
2478
b = tree.branch
2489
self.add_cleanup(b.lock_read().unlock)
2479
b.lock_read()
2480
self.add_cleanup(b.unlock)
2490
2481
touching_revs = log.find_touching_revisions(b, file_id)
2491
2482
for revno, revision_id, what in touching_revs:
2492
2483
self.outf.write("%6d %s\n" % (revno, what))
2493
2484
2494
2485
2495
2486
class cmd_ls(Command):
2496
__doc__ = """List files in a tree.
2487
"""List files in a tree.
2497
2488
"""
2498
2489
2499
2490
_see_also = ['status', 'cat']
2561
2552
view_str = views.view_display_str(view_files)
2562
2553
note("Ignoring files outside view. View is %s" % view_str)
2563
2554
2564
self.add_cleanup(tree.lock_read().unlock)
2555
tree.lock_read()
2556
self.add_cleanup(tree.unlock)
2565
2557
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2566
2558
from_dir=relpath, recursive=recursive):
2567
2559
# Apply additional masking
2609
2601
2610
2602
2611
2603
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
2604
"""List unknown files.
2613
2605
"""
2614
2606
2615
2607
hidden = True
2622
2614
2623
2615
2624
2616
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2617
"""Ignore specified files or patterns.
2626
2618
2627
2619
See ``bzr help patterns`` for details on the syntax of patterns.
2628
2620
2637
2629
using this command or directly by using an editor, be sure to commit
2638
2630
it.
2639
2631
2640
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2641
the global ignore file can be found in the application data directory as
2642
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2643
Global ignores are not touched by this command. The global ignore file
2644
can be edited directly using an editor.
2645
2646
2632
Patterns prefixed with '!' are exceptions to ignore patterns and take
2647
2633
precedence over regular ignores. Such exceptions are used to specify
2648
2634
files that should be versioned which would otherwise be ignored.
2689
2675
_see_also = ['status', 'ignored', 'patterns']
2690
2676
takes_args = ['name_pattern*']
2691
2677
takes_options = [
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2678
Option('old-default-rules',
2679
help='Write out the ignore rules bzr < 0.9 always used.')
2694
2680
]
2695
2681
2696
def run(self, name_pattern_list=None, default_rules=None):
2682
def run(self, name_pattern_list=None, old_default_rules=None):
2697
2683
from bzrlib import ignores
2698
if default_rules is not None:
2699
# dump the default rules and exit
2700
for pattern in ignores.USER_DEFAULTS:
2684
if old_default_rules is not None:
2685
# dump the rules and exit
2686
for pattern in ignores.OLD_DEFAULTS:
2701
2687
self.outf.write("%s\n" % pattern)
2702
2688
return
2703
2689
if not name_pattern_list:
2704
2690
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2691
"NAME_PATTERN or --old-default-rules")
2706
2692
name_pattern_list = [globbing.normalize_pattern(p)
2707
2693
for p in name_pattern_list]
2708
2694
for name_pattern in name_pattern_list:
2730
2716
2731
2717
2732
2718
class cmd_ignored(Command):
2733
__doc__ = """List ignored files and the patterns that matched them.
2719
"""List ignored files and the patterns that matched them.
2734
2720
2735
2721
List all the ignored files and the ignore pattern that caused the file to
2736
2722
be ignored.
2746
2732
@display_command
2747
2733
def run(self):
2748
2734
tree = WorkingTree.open_containing(u'.')[0]
2749
self.add_cleanup(tree.lock_read().unlock)
2735
tree.lock_read()
2736
self.add_cleanup(tree.unlock)
2750
2737
for path, file_class, kind, file_id, entry in tree.list_files():
2751
2738
if file_class != 'I':
2752
2739
continue
2756
2743
2757
2744
2758
2745
class cmd_lookup_revision(Command):
2759
__doc__ = """Lookup the revision-id from a revision-number
2746
"""Lookup the revision-id from a revision-number
2760
2747
2761
2748
:Examples:
2762
2749
bzr lookup-revision 33
2776
2763
2777
2764
2778
2765
class cmd_export(Command):
2779
__doc__ = """Export current or past revision to a destination directory or archive.
2766
"""Export current or past revision to a destination directory or archive.
2780
2767
2781
2768
If no revision is specified this exports the last committed revision.
2782
2769
2814
2801
Option('root',
2815
2802
type=str,
2816
2803
help="Name of the root directory inside the exported file."),
2817
Option('per-file-timestamps',
2818
help='Set modification time of files to that of the last '
2819
'revision in which it was changed.'),
2820
2804
]
2821
2805
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2806
root=None, filters=False):
2823
2807
from bzrlib.export import export
2824
2808
2825
2809
if branch_or_subdir is None:
2832
2816
2833
2817
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2834
2818
try:
2835
export(rev_tree, dest, format, root, subdir, filtered=filters,
2836
per_file_timestamps=per_file_timestamps)
2819
export(rev_tree, dest, format, root, subdir, filtered=filters)
2837
2820
except errors.NoSuchExportFormat, e:
2838
2821
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2839
2822
2840
2823
2841
2824
class cmd_cat(Command):
2842
__doc__ = """Write the contents of a file as of a given revision to standard output.
2825
"""Write the contents of a file as of a given revision to standard output.
2843
2826
2844
2827
If no revision is nominated, the last revision is used.
2845
2828
2865
2848
" one revision specifier")
2866
2849
tree, branch, relpath = \
2867
2850
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2868
self.add_cleanup(branch.lock_read().unlock)
2851
branch.lock_read()
2852
self.add_cleanup(branch.unlock)
2869
2853
return self._run(tree, branch, relpath, filename, revision,
2870
2854
name_from_revision, filters)
2871
2855
2874
2858
if tree is None:
2875
2859
tree = b.basis_tree()
2876
2860
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2877
self.add_cleanup(rev_tree.lock_read().unlock)
2861
rev_tree.lock_read()
2862
self.add_cleanup(rev_tree.unlock)
2878
2863
2879
2864
old_file_id = rev_tree.path2id(relpath)
2880
2865
2923
2908
2924
2909
2925
2910
class cmd_local_time_offset(Command):
2926
__doc__ = """Show the offset in seconds from GMT to local time."""
2911
"""Show the offset in seconds from GMT to local time."""
2927
2912
hidden = True
2928
2913
@display_command
2929
2914
def run(self):
2932
2917
2933
2918
2934
2919
class cmd_commit(Command):
2935
__doc__ = """Commit changes into a new revision.
2920
"""Commit changes into a new revision.
2936
2921
2937
2922
An explanatory message needs to be given for each commit. This is
2938
2923
often done by using the --message option (getting the message from the
3046
3031
"the master branch until a normal commit "
3047
3032
"is performed."
3048
3033
),
3049
Option('show-diff', short_name='p',
3034
Option('show-diff',
3050
3035
help='When no message is supplied, show the diff along'
3051
3036
' with the status summary in the message editor.'),
3052
3037
]
3132
3117
'(use --file "%(f)s" to take commit message from that file)'
3133
3118
% { 'f': message })
3134
3119
ui.ui_factory.show_warning(warning_msg)
3135
if '\r' in message:
3136
message = message.replace('\r\n', '\n')
3137
message = message.replace('\r', '\n')
3138
if file:
3139
raise errors.BzrCommandError(
3140
"please specify either --message or --file")
3141
3120
3142
3121
def get_message(commit_obj):
3143
3122
"""Callback to get commit message"""
3144
if file:
3145
my_message = codecs.open(
3146
file, 'rt', osutils.get_user_encoding()).read()
3147
elif message is not None:
3148
my_message = message
3149
else:
3150
# No message supplied: make one up.
3151
# text is the status of the tree
3152
text = make_commit_message_template_encoded(tree,
3123
my_message = message
3124
if my_message is not None and '\r' in my_message:
3125
my_message = my_message.replace('\r\n', '\n')
3126
my_message = my_message.replace('\r', '\n')
3127
if my_message is None and not file:
3128
t = make_commit_message_template_encoded(tree,
3153
3129
selected_list, diff=show_diff,
3154
3130
output_encoding=osutils.get_user_encoding())
3155
# start_message is the template generated from hooks
3156
# XXX: Warning - looks like hooks return unicode,
3157
# make_commit_message_template_encoded returns user encoding.
3158
# We probably want to be using edit_commit_message instead to
3159
# avoid this.
3160
3131
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
3132
my_message = edit_commit_message_encoded(t,
3162
3133
start_message=start_message)
3163
3134
if my_message is None:
3164
3135
raise errors.BzrCommandError("please specify a commit"
3165
3136
" message with either --message or --file")
3137
elif my_message and file:
3138
raise errors.BzrCommandError(
3139
"please specify either --message or --file")
3140
if file:
3141
my_message = codecs.open(file, 'rt',
3142
osutils.get_user_encoding()).read()
3166
3143
if my_message == "":
3167
3144
raise errors.BzrCommandError("empty commit message specified")
3168
3145
return my_message
3180
3157
timezone=offset,
3181
3158
exclude=safe_relpath_files(tree, exclude))
3182
3159
except PointlessCommit:
3160
# FIXME: This should really happen before the file is read in;
3161
# perhaps prepare the commit; get the message; then actually commit
3183
3162
raise errors.BzrCommandError("No changes to commit."
3184
3163
" Use --unchanged to commit anyhow.")
3185
3164
except ConflictsInTree:
3190
3169
raise errors.BzrCommandError("Commit refused because there are"
3191
3170
" unknown files in the working tree.")
3192
3171
except errors.BoundBranchOutOfDate, e:
3193
e.extra_help = ("\n"
3194
'To commit to master branch, run update and then commit.\n'
3195
'You can also pass --local to commit to continue working '
3196
'disconnected.')
3197
raise
3172
raise errors.BzrCommandError(str(e) + "\n"
3173
'To commit to master branch, run update and then commit.\n'
3174
'You can also pass --local to commit to continue working '
3175
'disconnected.')
3198
3176
3199
3177
3200
3178
class cmd_check(Command):
3201
__doc__ = """Validate working tree structure, branch consistency and repository history.
3179
"""Validate working tree structure, branch consistency and repository history.
3202
3180
3203
3181
This command checks various invariants about branch and repository storage
3204
3182
to detect data corruption or bzr bugs.
3268
3246
3269
3247
3270
3248
class cmd_upgrade(Command):
3271
__doc__ = """Upgrade branch storage to current format.
3249
"""Upgrade branch storage to current format.
3272
3250
3273
3251
The check command or bzr developers may sometimes advise you to run
3274
3252
this command. When the default format has changed you may also be warned
3292
3270
3293
3271
3294
3272
class cmd_whoami(Command):
3295
__doc__ = """Show or set bzr user id.
3273
"""Show or set bzr user id.
3296
3274
3297
3275
:Examples:
3298
3276
Show the email of the current user::
3342
3320
3343
3321
3344
3322
class cmd_nick(Command):
3345
__doc__ = """Print or set the branch nickname.
3323
"""Print or set the branch nickname.
3346
3324
3347
3325
If unset, the tree root directory name is used as the nickname.
3348
3326
To print the current nickname, execute with no argument.
3366
3344
3367
3345
3368
3346
class cmd_alias(Command):
3369
__doc__ = """Set/unset and display aliases.
3347
"""Set/unset and display aliases.
3370
3348
3371
3349
:Examples:
3372
3350
Show the current aliases::
3436
3414
3437
3415
3438
3416
class cmd_selftest(Command):
3439
__doc__ = """Run internal test suite.
3417
"""Run internal test suite.
3440
3418
3441
3419
If arguments are given, they are regular expressions that say which tests
3442
3420
should run. Tests matching any expression are run, and other tests are
3583
3561
raise errors.BzrCommandError("subunit not available. subunit "
3584
3562
"needs to be installed to use --subunit.")
3585
3563
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3586
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
# stdout, which would corrupt the subunit stream.
3588
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3589
import msvcrt
3590
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3591
3564
if parallel:
3592
3565
self.additional_selftest_args.setdefault(
3593
3566
'suite_decorators', []).append(parallel)
3624
3597
3625
3598
3626
3599
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
3600
"""Show version of bzr."""
3628
3601
3629
3602
encoding_type = 'replace'
3630
3603
takes_options = [
3641
3614
3642
3615
3643
3616
class cmd_rocks(Command):
3644
__doc__ = """Statement of optimism."""
3617
"""Statement of optimism."""
3645
3618
3646
3619
hidden = True
3647
3620
3651
3624
3652
3625
3653
3626
class cmd_find_merge_base(Command):
3654
__doc__ = """Find and print a base revision for merging two branches."""
3627
"""Find and print a base revision for merging two branches."""
3655
3628
# TODO: Options to specify revisions on either side, as if
3656
3629
# merging only part of the history.
3657
3630
takes_args = ['branch', 'other']
3663
3636
3664
3637
branch1 = Branch.open_containing(branch)[0]
3665
3638
branch2 = Branch.open_containing(other)[0]
3666
self.add_cleanup(branch1.lock_read().unlock)
3667
self.add_cleanup(branch2.lock_read().unlock)
3639
branch1.lock_read()
3640
self.add_cleanup(branch1.unlock)
3641
branch2.lock_read()
3642
self.add_cleanup(branch2.unlock)
3668
3643
last1 = ensure_null(branch1.last_revision())
3669
3644
last2 = ensure_null(branch2.last_revision())
3670
3645
3675
3650
3676
3651
3677
3652
class cmd_merge(Command):
3678
__doc__ = """Perform a three-way merge.
3653
"""Perform a three-way merge.
3679
3654
3680
3655
The source of the merge can be specified either in the form of a branch,
3681
3656
or in the form of a path to a file containing a merge directive generated
3808
3783
unversioned_filter=tree.is_ignored, view_info=view_info)
3809
3784
pb = ui.ui_factory.nested_progress_bar()
3810
3785
self.add_cleanup(pb.finished)
3811
self.add_cleanup(tree.lock_write().unlock)
3786
tree.lock_write()
3787
self.add_cleanup(tree.unlock)
3812
3788
if location is not None:
3813
3789
try:
3814
3790
mergeable = bundle.read_mergeable_from_url(location,
4035
4011
4036
4012
4037
4013
class cmd_remerge(Command):
4038
__doc__ = """Redo a merge.
4014
"""Redo a merge.
4039
4015
4040
4016
Use this if you want to try a different merge technique while resolving
4041
4017
conflicts. Some merge techniques are better than others, and remerge
4066
4042
4067
4043
def run(self, file_list=None, merge_type=None, show_base=False,
4068
4044
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
4045
if merge_type is None:
4071
4046
merge_type = _mod_merge.Merge3Merger
4072
4047
tree, file_list = tree_files(file_list)
4073
self.add_cleanup(tree.lock_write().unlock)
4048
tree.lock_write()
4049
self.add_cleanup(tree.unlock)
4074
4050
parents = tree.get_parent_ids()
4075
4051
if len(parents) != 2:
4076
4052
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4129
4105
4130
4106
4131
4107
class cmd_revert(Command):
4132
__doc__ = """Revert files to a previous revision.
4108
"""Revert files to a previous revision.
4133
4109
4134
4110
Giving a list of files will revert only those files. Otherwise, all files
4135
4111
will be reverted. If the revision is not specified with '--revision', the
4186
4162
def run(self, revision=None, no_backup=False, file_list=None,
4187
4163
forget_merges=None):
4188
4164
tree, file_list = tree_files(file_list)
4189
self.add_cleanup(tree.lock_tree_write().unlock)
4165
tree.lock_write()
4166
self.add_cleanup(tree.unlock)
4190
4167
if forget_merges:
4191
4168
tree.set_parent_ids(tree.get_parent_ids()[:1])
4192
4169
else:
4200
4177
4201
4178
4202
4179
class cmd_assert_fail(Command):
4203
__doc__ = """Test reporting of assertion failures"""
4180
"""Test reporting of assertion failures"""
4204
4181
# intended just for use in testing
4205
4182
4206
4183
hidden = True
4210
4187
4211
4188
4212
4189
class cmd_help(Command):
4213
__doc__ = """Show help on a command or other topic.
4190
"""Show help on a command or other topic.
4214
4191
"""
4215
4192
4216
4193
_see_also = ['topics']
4229
4206
4230
4207
4231
4208
class cmd_shell_complete(Command):
4232
__doc__ = """Show appropriate completions for context.
4209
"""Show appropriate completions for context.
4233
4210
4234
4211
For a list of all available commands, say 'bzr shell-complete'.
4235
4212
"""
4244
4221
4245
4222
4246
4223
class cmd_missing(Command):
4247
__doc__ = """Show unmerged/unpulled revisions between two branches.
4224
"""Show unmerged/unpulled revisions between two branches.
4248
4225
4249
4226
OTHER_BRANCH may be local or remote.
4250
4227
4328
4305
restrict = 'remote'
4329
4306
4330
4307
local_branch = Branch.open_containing(u".")[0]
4331
self.add_cleanup(local_branch.lock_read().unlock)
4332
4333
4308
parent = local_branch.get_parent()
4334
4309
if other_branch is None:
4335
4310
other_branch = parent
4344
4319
remote_branch = Branch.open(other_branch)
4345
4320
if remote_branch.base == local_branch.base:
4346
4321
remote_branch = local_branch
4347
else:
4348
self.add_cleanup(remote_branch.lock_read().unlock)
4349
4322
4323
local_branch.lock_read()
4324
self.add_cleanup(local_branch.unlock)
4350
4325
local_revid_range = _revision_range_to_revid_range(
4351
4326
_get_revision_range(my_revision, local_branch,
4352
4327
self.name()))
4353
4328
4329
remote_branch.lock_read()
4330
self.add_cleanup(remote_branch.unlock)
4354
4331
remote_revid_range = _revision_range_to_revid_range(
4355
4332
_get_revision_range(revision,
4356
4333
remote_branch, self.name()))
4406
4383
message("Branches are up to date.\n")
4407
4384
self.cleanup_now()
4408
4385
if not status_code and parent is None and other_branch is not None:
4409
self.add_cleanup(local_branch.lock_write().unlock)
4386
local_branch.lock_write()
4387
self.add_cleanup(local_branch.unlock)
4410
4388
# handle race conditions - a parent might be set while we run.
4411
4389
if local_branch.get_parent() is None:
4412
4390
local_branch.set_parent(remote_branch.base)
4414
4392
4415
4393
4416
4394
class cmd_pack(Command):
4417
__doc__ = """Compress the data within a repository.
4418
4419
This operation compresses the data within a bazaar repository. As
4420
bazaar supports automatic packing of repository, this operation is
4421
normally not required to be done manually.
4422
4423
During the pack operation, bazaar takes a backup of existing repository
4424
data, i.e. pack files. This backup is eventually removed by bazaar
4425
automatically when it is safe to do so. To save disk space by removing
4426
the backed up pack files, the --clean-obsolete-packs option may be
4427
used.
4428
4429
Warning: If you use --clean-obsolete-packs and your machine crashes
4430
during or immediately after repacking, you may be left with a state
4431
where the deletion has been written to disk but the new packs have not
4432
been. In this case the repository may be unusable.
4433
"""
4395
"""Compress the data within a repository."""
4434
4396
4435
4397
_see_also = ['repositories']
4436
4398
takes_args = ['branch_or_repo?']
4437
takes_options = [
4438
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4439
]
4440
4399
4441
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4400
def run(self, branch_or_repo='.'):
4442
4401
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4443
4402
try:
4444
4403
branch = dir.open_branch()
4445
4404
repository = branch.repository
4446
4405
except errors.NotBranchError:
4447
4406
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4407
repository.pack()
4449
4408
4450
4409
4451
4410
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
4411
"""List the installed plugins.
4453
4412
4454
4413
This command displays the list of installed plugins including
4455
4414
version of plugin and a short description of each.
4494
4453
4495
4454
4496
4455
class cmd_testament(Command):
4497
__doc__ = """Show testament (signing-form) of a revision."""
4456
"""Show testament (signing-form) of a revision."""
4498
4457
takes_options = [
4499
4458
'revision',
4500
4459
Option('long', help='Produce long-format testament.'),
4512
4471
b = Branch.open_containing(branch)[0]
4513
4472
else:
4514
4473
b = Branch.open(branch)
4515
self.add_cleanup(b.lock_read().unlock)
4474
b.lock_read()
4475
self.add_cleanup(b.unlock)
4516
4476
if revision is None:
4517
4477
rev_id = b.last_revision()
4518
4478
else:
4525
4485
4526
4486
4527
4487
class cmd_annotate(Command):
4528
__doc__ = """Show the origin of each line in a file.
4488
"""Show the origin of each line in a file.
4529
4489
4530
4490
This prints out the given file with an annotation on the left side
4531
4491
indicating which revision, author and date introduced the change.
4552
4512
wt, branch, relpath = \
4553
4513
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
4514
if wt is not None:
4555
self.add_cleanup(wt.lock_read().unlock)
4515
wt.lock_read()
4516
self.add_cleanup(wt.unlock)
4556
4517
else:
4557
self.add_cleanup(branch.lock_read().unlock)
4518
branch.lock_read()
4519
self.add_cleanup(branch.unlock)
4558
4520
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
self.add_cleanup(tree.lock_read().unlock)
4521
tree.lock_read()
4522
self.add_cleanup(tree.unlock)
4560
4523
if wt is not None:
4561
4524
file_id = wt.path2id(relpath)
4562
4525
else:
4575
4538
4576
4539
4577
4540
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
4541
"""Create a digital signature for an existing revision."""
4579
4542
# TODO be able to replace existing ones.
4580
4543
4581
4544
hidden = True # is this right ?
4588
4551
if revision_id_list is None and revision is None:
4589
4552
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
4553
b = WorkingTree.open_containing(u'.')[0].branch
4591
self.add_cleanup(b.lock_write().unlock)
4554
b.lock_write()
4555
self.add_cleanup(b.unlock)
4592
4556
return self._run(b, revision_id_list, revision)
4593
4557
4594
4558
def _run(self, b, revision_id_list, revision):
4640
4604
4641
4605
4642
4606
class cmd_bind(Command):
4643
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4644
If no branch is supplied, rebind to the last bound location.
4607
"""Convert the current branch into a checkout of the supplied branch.
4645
4608
4646
4609
Once converted into a checkout, commits must succeed on the master branch
4647
4610
before they will be applied to the local branch.
4681
4644
4682
4645
4683
4646
class cmd_unbind(Command):
4684
__doc__ = """Convert the current checkout into a regular branch.
4647
"""Convert the current checkout into a regular branch.
4685
4648
4686
4649
After unbinding, the local branch is considered independent and subsequent
4687
4650
commits will be local only.
4698
4661
4699
4662
4700
4663
class cmd_uncommit(Command):
4701
__doc__ = """Remove the last committed revision.
4664
"""Remove the last committed revision.
4702
4665
4703
4666
--verbose will print out what is being removed.
4704
4667
--dry-run will go through all the motions, but not actually
4744
4707
b = control.open_branch()
4745
4708
4746
4709
if tree is not None:
4747
self.add_cleanup(tree.lock_write().unlock)
4710
tree.lock_write()
4711
self.add_cleanup(tree.unlock)
4748
4712
else:
4749
self.add_cleanup(b.lock_write().unlock)
4713
b.lock_write()
4714
self.add_cleanup(b.unlock)
4750
4715
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4751
4716
4752
4717
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4804
4769
4805
4770
4806
4771
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
4772
"""Break a dead lock on a repository, branch or working directory.
4808
4773
4809
4774
CAUTION: Locks should only be broken when you are sure that the process
4810
4775
holding the lock has been stopped.
4829
4794
4830
4795
4831
4796
class cmd_wait_until_signalled(Command):
4832
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4797
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4833
4798
4834
4799
This just prints a line to signal when it is ready, then blocks on stdin.
4835
4800
"""
4843
4808
4844
4809
4845
4810
class cmd_serve(Command):
4846
__doc__ = """Run the bzr server."""
4811
"""Run the bzr server."""
4847
4812
4848
4813
aliases = ['server']
4849
4814
4909
4874
4910
4875
4911
4876
class cmd_join(Command):
4912
__doc__ = """Combine a tree into its containing tree.
4877
"""Combine a tree into its containing tree.
4913
4878
4914
4879
This command requires the target tree to be in a rich-root format.
4915
4880
4955
4920
4956
4921
4957
4922
class cmd_split(Command):
4958
__doc__ = """Split a subdirectory of a tree into a separate tree.
4923
"""Split a subdirectory of a tree into a separate tree.
4959
4924
4960
4925
This command will produce a target tree in a format that supports
4961
4926
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
4981
4946
4982
4947
4983
4948
class cmd_merge_directive(Command):
4984
__doc__ = """Generate a merge directive for auto-merge tools.
4949
"""Generate a merge directive for auto-merge tools.
4985
4950
4986
4951
A directive requests a merge to be performed, and also provides all the
4987
4952
information necessary to do so. This means it must either include a
5080
5045
5081
5046
5082
5047
class cmd_send(Command):
5083
__doc__ = """Mail or create a merge-directive for submitting changes.
5048
"""Mail or create a merge-directive for submitting changes.
5084
5049
5085
5050
A merge directive provides many things needed for requesting merges:
5086
5051
5168
5133
short_name='f',
5169
5134
type=unicode),
5170
5135
Option('output', short_name='o',
5171
help='Write merge directive to this file or directory; '
5136
help='Write merge directive to this file; '
5172
5137
'use - for stdout.',
5173
5138
type=unicode),
5174
5139
Option('strict',
5197
5162
5198
5163
5199
5164
class cmd_bundle_revisions(cmd_send):
5200
__doc__ = """Create a merge-directive for submitting changes.
5165
"""Create a merge-directive for submitting changes.
5201
5166
5202
5167
A merge directive provides many things needed for requesting merges:
5203
5168
5270
5235
5271
5236
5272
5237
class cmd_tag(Command):
5273
__doc__ = """Create, remove or modify a tag naming a revision.
5238
"""Create, remove or modify a tag naming a revision.
5274
5239
5275
5240
Tags give human-meaningful names to revisions. Commands that take a -r
5276
5241
(--revision) option can be given -rtag:X, where X is any previously
5284
5249
5285
5250
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5286
5251
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5287
5288
If no tag name is specified it will be determined through the
5289
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5290
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5291
details.
5292
5252
"""
5293
5253
5294
5254
_see_also = ['commit', 'tags']
5295
takes_args = ['tag_name?']
5255
takes_args = ['tag_name']
5296
5256
takes_options = [
5297
5257
Option('delete',
5298
5258
help='Delete this tag rather than placing it.',
5308
5268
'revision',
5309
5269
]
5310
5270
5311
def run(self, tag_name=None,
5271
def run(self, tag_name,
5312
5272
delete=None,
5313
5273
directory='.',
5314
5274
force=None,
5315
5275
revision=None,
5316
5276
):
5317
5277
branch, relpath = Branch.open_containing(directory)
5318
self.add_cleanup(branch.lock_write().unlock)
5278
branch.lock_write()
5279
self.add_cleanup(branch.unlock)
5319
5280
if delete:
5320
if tag_name is None:
5321
raise errors.BzrCommandError("No tag specified to delete.")
5322
5281
branch.tags.delete_tag(tag_name)
5323
5282
self.outf.write('Deleted tag %s.\n' % tag_name)
5324
5283
else:
5330
5289
revision_id = revision[0].as_revision_id(branch)
5331
5290
else:
5332
5291
revision_id = branch.last_revision()
5333
if tag_name is None:
5334
tag_name = branch.automatic_tag_name(revision_id)
5335
if tag_name is None:
5336
raise errors.BzrCommandError(
5337
"Please specify a tag name.")
5338
5292
if (not force) and branch.tags.has_tag(tag_name):
5339
5293
raise errors.TagAlreadyExists(tag_name)
5340
5294
branch.tags.set_tag(tag_name, revision_id)
5342
5296
5343
5297
5344
5298
class cmd_tags(Command):
5345
__doc__ = """List tags.
5299
"""List tags.
5346
5300
5347
5301
This command shows a table of tag names and the revisions they reference.
5348
5302
"""
5376
5330
if not tags:
5377
5331
return
5378
5332
5379
self.add_cleanup(branch.lock_read().unlock)
5333
branch.lock_read()
5334
self.add_cleanup(branch.unlock)
5380
5335
if revision:
5381
5336
graph = branch.repository.get_graph()
5382
5337
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5415
5370
5416
5371
5417
5372
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5373
"""Reconfigure the type of a bzr directory.
5419
5374
5420
5375
A target configuration must be specified.
5421
5376
5506
5461
5507
5462
5508
5463
class cmd_switch(Command):
5509
__doc__ = """Set the branch of a checkout and update.
5464
"""Set the branch of a checkout and update.
5510
5465
5511
5466
For lightweight checkouts, this changes the branch being referenced.
5512
5467
For heavyweight checkouts, this checks that there are no local commits
5602
5557
5603
5558
5604
5559
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5560
"""Manage filtered views.
5606
5561
5607
5562
Views provide a mask over the tree so that users can focus on
5608
5563
a subset of a tree when doing their work. After creating a view,
5756
5711
5757
5712
5758
5713
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5714
"""Show hooks."""
5760
5715
5761
5716
hidden = True
5762
5717
5775
5730
self.outf.write(" <no hooks installed>\n")
5776
5731
5777
5732
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
5733
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5734
"""Temporarily set aside some changes from the current tree.
5805
5735
5806
5736
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5737
ie. out of the way, until a later time when you can bring them back from
5860
5790
5861
5791
def run_for_list(self):
5862
5792
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5793
tree.lock_read()
5794
self.add_cleanup(tree.unlock)
5864
5795
manager = tree.get_shelf_manager()
5865
5796
shelves = manager.active_shelves()
5866
5797
if len(shelves) == 0:
5875
5806
5876
5807
5877
5808
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5809
"""Restore shelved changes.
5879
5810
5880
5811
By default, the most recently shelved changes are restored. However if you
5881
5812
specify a shelf by id those changes will be restored instead. This works
5907
5838
5908
5839
5909
5840
class cmd_clean_tree(Command):
5910
__doc__ = """Remove unwanted files from working tree.
5841
"""Remove unwanted files from working tree.
5911
5842
5912
5843
By default, only unknown files, not ignored files, are deleted. Versioned
5913
5844
files are never deleted.
5941
5872
5942
5873
5943
5874
class cmd_reference(Command):
5944
__doc__ = """list, view and set branch locations for nested trees.
5875
"""list, view and set branch locations for nested trees.
5945
5876
5946
5877
If no arguments are provided, lists the branch locations for nested trees.
5947
5878
If one argument is provided, display the branch location for that tree.
5987
5918
self.outf.write('%s %s\n' % (path, location))
5988
5919
5989
5920
5990
def _register_lazy_builtins():
5991
# register lazy builtins from other modules; called at startup and should
5992
# be only called once.
5993
for (name, aliases, module_name) in [
5994
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5995
('cmd_dpush', [], 'bzrlib.foreign'),
5996
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5997
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5998
('cmd_conflicts', [], 'bzrlib.conflicts'),
5999
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6000
]:
6001
builtin_command_registry.register_lazy(name, aliases, module_name)
5921
# these get imported and then picked up by the scan for cmd_*
5922
# TODO: Some more consistent way to split command definitions across files;
5923
# we do need to load at least some information about them to know of
5924
# aliases. ideally we would avoid loading the implementation until the
5925
# details were needed.
5926
from bzrlib.cmd_version_info import cmd_version_info
5927
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5928
from bzrlib.bundle.commands import (
5929
cmd_bundle_info,
5930
)
5931
from bzrlib.foreign import cmd_dpush
5932
from bzrlib.sign_my_commits import cmd_sign_my_commits
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0