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 5151.3.1
- compare with another revision
- download diff
- download tarball
- view history from revision 5151.3.1
- Committer: Martin
- Date: 2010-04-14 00:11:32 UTC
- mto: This revision was merged to the branch mainline in revision 5164.
- Revision ID: gzlist@googlemail.com-20100414001132-6m1ru11mbfu87x6m
Fix os.utime test failures, three on FAT filesystems and one with readonly files
- files added:
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- files removed:
- bzrlib/library_state.py
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- files modified:
- INSTALL
added
removed
bzrlib/builtins.py
180
180
view_str = views.view_display_str(view_files)
181
181
note("Ignoring files outside view. View is %s" % view_str)
182
182
return tree, file_list
183
tree = WorkingTree.open_containing(file_list[0])[0]
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
185
apply_view=apply_view)
186
186
232
232
return view_info
233
233
234
234
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
235
# TODO: Make sure no commands unconditionally use the working directory as a
244
236
# branch. If a filename argument is used, the first of them should be used to
245
237
# specify the branch. (Perhaps this can be factored out into some kind of
247
239
# opens the branch?)
248
240
249
241
class cmd_status(Command):
250
__doc__ = """Display status summary.
242
"""Display status summary.
251
243
252
244
This reports on versioned and unknown files, reporting them
253
245
grouped by state. Possible states are:
340
332
341
333
342
334
class cmd_cat_revision(Command):
343
__doc__ = """Write out metadata for a revision.
335
"""Write out metadata for a revision.
344
336
345
337
The revision to print can either be specified by a specific
346
338
revision identifier, or you can use --revision.
348
340
349
341
hidden = True
350
342
takes_args = ['revision_id?']
351
takes_options = ['directory', 'revision']
343
takes_options = ['revision']
352
344
# cat-revision is more for frontends so should be exact
353
345
encoding = 'strict'
354
346
361
353
self.outf.write(revtext.decode('utf-8'))
362
354
363
355
@display_command
364
def run(self, revision_id=None, revision=None, directory=u'.'):
356
def run(self, revision_id=None, revision=None):
365
357
if revision_id is not None and revision is not None:
366
358
raise errors.BzrCommandError('You can only supply one of'
367
359
' revision_id or --revision')
368
360
if revision_id is None and revision is None:
369
361
raise errors.BzrCommandError('You must supply either'
370
362
' --revision or a revision_id')
371
b = WorkingTree.open_containing(directory)[0].branch
363
b = WorkingTree.open_containing(u'.')[0].branch
372
364
373
365
revisions = b.repository.revisions
374
366
if revisions is None:
398
390
399
391
400
392
class cmd_dump_btree(Command):
401
__doc__ = """Dump the contents of a btree index file to stdout.
393
"""Dump the contents of a btree index file to stdout.
402
394
403
395
PATH is a btree index file, it can be any URL. This includes things like
404
396
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
479
471
480
472
481
473
class cmd_remove_tree(Command):
482
__doc__ = """Remove the working tree from a given branch/checkout.
474
"""Remove the working tree from a given branch/checkout.
483
475
484
476
Since a lightweight checkout is little more than a working tree
485
477
this will refuse to run against one.
491
483
takes_options = [
492
484
Option('force',
493
485
help='Remove the working tree even if it has '
494
'uncommitted or shelved changes.'),
486
'uncommitted changes.'),
495
487
]
496
488
497
489
def run(self, location_list, force=False):
511
503
if not force:
512
504
if (working.has_changes()):
513
505
raise errors.UncommittedChanges(working)
514
if working.get_shelf_manager().last_shelf() is not None:
515
raise errors.ShelvedChanges(working)
516
506
517
if working.user_url != working.branch.user_url:
507
working_path = working.bzrdir.root_transport.base
508
branch_path = working.branch.bzrdir.root_transport.base
509
if working_path != branch_path:
518
510
raise errors.BzrCommandError("You cannot remove the working tree"
519
511
" from a lightweight checkout")
520
512
522
514
523
515
524
516
class cmd_revno(Command):
525
__doc__ = """Show current revision number.
517
"""Show current revision number.
526
518
527
519
This is equal to the number of revisions on this branch.
528
520
"""
538
530
if tree:
539
531
try:
540
532
wt = WorkingTree.open_containing(location)[0]
541
self.add_cleanup(wt.lock_read().unlock)
533
wt.lock_read()
542
534
except (errors.NoWorkingTree, errors.NotLocalUrl):
543
535
raise errors.NoWorkingTree(location)
536
self.add_cleanup(wt.unlock)
544
537
revid = wt.last_revision()
545
538
try:
546
539
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
549
542
revno = ".".join(str(n) for n in revno_t)
550
543
else:
551
544
b = Branch.open_containing(location)[0]
552
self.add_cleanup(b.lock_read().unlock)
545
b.lock_read()
546
self.add_cleanup(b.unlock)
553
547
revno = b.revno()
554
548
self.cleanup_now()
555
549
self.outf.write(str(revno) + '\n')
556
550
557
551
558
552
class cmd_revision_info(Command):
559
__doc__ = """Show revision number and revision id for a given revision identifier.
553
"""Show revision number and revision id for a given revision identifier.
560
554
"""
561
555
hidden = True
562
556
takes_args = ['revision_info*']
563
557
takes_options = [
564
558
'revision',
565
custom_help('directory',
559
Option('directory',
566
560
help='Branch to examine, '
567
'rather than the one containing the working directory.'),
561
'rather than the one containing the working directory.',
562
short_name='d',
563
type=unicode,
564
),
568
565
Option('tree', help='Show revno of working tree'),
569
566
]
570
567
575
572
try:
576
573
wt = WorkingTree.open_containing(directory)[0]
577
574
b = wt.branch
578
self.add_cleanup(wt.lock_read().unlock)
575
wt.lock_read()
576
self.add_cleanup(wt.unlock)
579
577
except (errors.NoWorkingTree, errors.NotLocalUrl):
580
578
wt = None
581
579
b = Branch.open_containing(directory)[0]
582
self.add_cleanup(b.lock_read().unlock)
580
b.lock_read()
581
self.add_cleanup(b.unlock)
583
582
revision_ids = []
584
583
if revision is not None:
585
584
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
613
612
614
613
615
614
class cmd_add(Command):
616
__doc__ = """Add specified files or directories.
615
"""Add specified files or directories.
617
616
618
617
In non-recursive mode, all the named items are added, regardless
619
618
of whether they were previously ignored. A warning is given if
684
683
should_print=(not is_quiet()))
685
684
686
685
if base_tree:
687
self.add_cleanup(base_tree.lock_read().unlock)
686
base_tree.lock_read()
687
self.add_cleanup(base_tree.unlock)
688
688
tree, file_list = tree_files_for_add(file_list)
689
689
added, ignored = tree.smart_add(file_list, not
690
690
no_recurse, action=action, save=not dry_run)
698
698
699
699
700
700
class cmd_mkdir(Command):
701
__doc__ = """Create a new versioned directory.
701
"""Create a new versioned directory.
702
702
703
703
This is equivalent to creating the directory and then adding it.
704
704
"""
720
720
721
721
722
722
class cmd_relpath(Command):
723
__doc__ = """Show path of a file relative to root"""
723
"""Show path of a file relative to root"""
724
724
725
725
takes_args = ['filename']
726
726
hidden = True
735
735
736
736
737
737
class cmd_inventory(Command):
738
__doc__ = """Show inventory of the current working copy or a revision.
738
"""Show inventory of the current working copy or a revision.
739
739
740
740
It is possible to limit the output to a particular entry
741
741
type using the --kind option. For example: --kind file.
762
762
763
763
revision = _get_one_revision('inventory', revision)
764
764
work_tree, file_list = tree_files(file_list)
765
self.add_cleanup(work_tree.lock_read().unlock)
765
work_tree.lock_read()
766
self.add_cleanup(work_tree.unlock)
766
767
if revision is not None:
767
768
tree = revision.as_tree(work_tree.branch)
768
769
769
770
extra_trees = [work_tree]
770
self.add_cleanup(tree.lock_read().unlock)
771
tree.lock_read()
772
self.add_cleanup(tree.unlock)
771
773
else:
772
774
tree = work_tree
773
775
extra_trees = []
794
796
795
797
796
798
class cmd_mv(Command):
797
__doc__ = """Move or rename a file.
799
"""Move or rename a file.
798
800
799
801
:Usage:
800
802
bzr mv OLDNAME NEWNAME
833
835
if len(names_list) < 2:
834
836
raise errors.BzrCommandError("missing file argument")
835
837
tree, rel_names = tree_files(names_list, canonicalize=False)
836
self.add_cleanup(tree.lock_tree_write().unlock)
838
tree.lock_tree_write()
839
self.add_cleanup(tree.unlock)
837
840
self._run(tree, names_list, rel_names, after)
838
841
839
842
def run_auto(self, names_list, after, dry_run):
844
847
raise errors.BzrCommandError('--after cannot be specified with'
845
848
' --auto.')
846
849
work_tree, file_list = tree_files(names_list, default_branch='.')
847
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
work_tree.lock_tree_write()
851
self.add_cleanup(work_tree.unlock)
848
852
rename_map.RenameMap.guess_renames(work_tree, dry_run)
849
853
850
854
def _run(self, tree, names_list, rel_names, after):
929
933
930
934
931
935
class cmd_pull(Command):
932
__doc__ = """Turn this branch into a mirror of another branch.
936
"""Turn this branch into a mirror of another branch.
933
937
934
938
By default, this command only works on branches that have not diverged.
935
939
Branches are considered diverged if the destination branch's most recent
958
962
takes_options = ['remember', 'overwrite', 'revision',
959
963
custom_help('verbose',
960
964
help='Show logs of pulled revisions.'),
961
custom_help('directory',
965
Option('directory',
962
966
help='Branch to pull into, '
963
'rather than the one containing the working directory.'),
967
'rather than the one containing the working directory.',
968
short_name='d',
969
type=unicode,
970
),
964
971
Option('local',
965
972
help="Perform a local pull in a bound "
966
973
"branch. Local pulls are not applied to "
981
988
try:
982
989
tree_to = WorkingTree.open_containing(directory)[0]
983
990
branch_to = tree_to.branch
984
self.add_cleanup(tree_to.lock_write().unlock)
991
tree_to.lock_write()
992
self.add_cleanup(tree_to.unlock)
985
993
except errors.NoWorkingTree:
986
994
tree_to = None
987
995
branch_to = Branch.open_containing(directory)[0]
988
self.add_cleanup(branch_to.lock_write().unlock)
996
branch_to.lock_write()
997
self.add_cleanup(branch_to.unlock)
989
998
990
999
if local and not branch_to.get_bound_location():
991
1000
raise errors.LocalRequiresBoundBranch()
1022
1031
else:
1023
1032
branch_from = Branch.open(location,
1024
1033
possible_transports=possible_transports)
1025
self.add_cleanup(branch_from.lock_read().unlock)
1034
branch_from.lock_read()
1035
self.add_cleanup(branch_from.unlock)
1026
1036
1027
1037
if branch_to.get_parent() is None or remember:
1028
1038
branch_to.set_parent(branch_from.base)
1050
1060
1051
1061
1052
1062
class cmd_push(Command):
1053
__doc__ = """Update a mirror of this branch.
1063
"""Update a mirror of this branch.
1054
1064
1055
1065
The target branch will not have its working tree populated because this
1056
1066
is both expensive, and is not supported on remote file systems.
1080
1090
Option('create-prefix',
1081
1091
help='Create the path leading up to the branch '
1082
1092
'if it does not already exist.'),
1083
custom_help('directory',
1093
Option('directory',
1084
1094
help='Branch to push from, '
1085
'rather than the one containing the working directory.'),
1095
'rather than the one containing the working directory.',
1096
short_name='d',
1097
type=unicode,
1098
),
1086
1099
Option('use-existing-dir',
1087
1100
help='By default push will fail if the target'
1088
1101
' directory exists, but does not already'
1121
1134
else:
1122
1135
revision_id = None
1123
1136
if tree is not None and revision_id is None:
1124
tree.check_changed_or_out_of_date(
1125
strict, 'push_strict',
1126
more_error='Use --no-strict to force the push.',
1127
more_warning='Uncommitted changes will not be pushed.')
1137
tree.warn_if_changed_or_out_of_date(
1138
strict, 'push_strict', 'Use --no-strict to force the push.')
1128
1139
# Get the stacked_on branch, if any
1129
1140
if stacked_on is not None:
1130
1141
stacked_on = urlutils.normalize_url(stacked_on)
1162
1173
1163
1174
1164
1175
class cmd_branch(Command):
1165
__doc__ = """Create a new branch that is a copy of an existing branch.
1176
"""Create a new branch that is a copy of an existing branch.
1166
1177
1167
1178
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1168
1179
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1208
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1209
1220
from_location)
1210
1221
revision = _get_one_revision('branch', revision)
1211
self.add_cleanup(br_from.lock_read().unlock)
1222
br_from.lock_read()
1223
self.add_cleanup(br_from.unlock)
1212
1224
if revision is not None:
1213
1225
revision_id = revision.as_revision_id(br_from)
1214
1226
else:
1274
1286
1275
1287
1276
1288
class cmd_checkout(Command):
1277
__doc__ = """Create a new checkout of an existing branch.
1289
"""Create a new checkout of an existing branch.
1278
1290
1279
1291
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1280
1292
the branch found in '.'. This is useful if you have removed the working tree
1343
1355
1344
1356
1345
1357
class cmd_renames(Command):
1346
__doc__ = """Show list of renamed files.
1358
"""Show list of renamed files.
1347
1359
"""
1348
1360
# TODO: Option to show renames between two historical versions.
1349
1361
1354
1366
@display_command
1355
1367
def run(self, dir=u'.'):
1356
1368
tree = WorkingTree.open_containing(dir)[0]
1357
self.add_cleanup(tree.lock_read().unlock)
1369
tree.lock_read()
1370
self.add_cleanup(tree.unlock)
1358
1371
new_inv = tree.inventory
1359
1372
old_tree = tree.basis_tree()
1360
self.add_cleanup(old_tree.lock_read().unlock)
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1361
1375
old_inv = old_tree.inventory
1362
1376
renames = []
1363
1377
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1373
1387
1374
1388
1375
1389
class cmd_update(Command):
1376
__doc__ = """Update a tree to have the latest code committed to its branch.
1390
"""Update a tree to have the latest code committed to its branch.
1377
1391
1378
1392
This will perform a merge into the working tree, and may generate
1379
1393
conflicts. If you have any local changes, you will still
1401
1415
master = branch.get_master_branch(
1402
1416
possible_transports=possible_transports)
1403
1417
if master is not None:
1418
tree.lock_write()
1404
1419
branch_location = master.base
1405
tree.lock_write()
1406
1420
else:
1421
tree.lock_tree_write()
1407
1422
branch_location = tree.branch.base
1408
tree.lock_tree_write()
1409
1423
self.add_cleanup(tree.unlock)
1410
1424
# get rid of the final '/' and be ready for display
1411
1425
branch_location = urlutils.unescape_for_display(
1448
1462
_mod_revision.ensure_null(tree.last_revision()))
1449
1463
note('Updated to revision %s of branch %s' %
1450
1464
('.'.join(map(str, revno)), branch_location))
1451
parent_ids = tree.get_parent_ids()
1452
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1465
if tree.get_parent_ids()[1:] != existing_pending_merges:
1453
1466
note('Your local commits will now show as pending merges with '
1454
1467
"'bzr status', and can be committed with 'bzr commit'.")
1455
1468
if conflicts != 0:
1459
1472
1460
1473
1461
1474
class cmd_info(Command):
1462
__doc__ = """Show information about a working tree, branch or repository.
1475
"""Show information about a working tree, branch or repository.
1463
1476
1464
1477
This command will show all known locations and formats associated to the
1465
1478
tree, branch or repository.
1503
1516
1504
1517
1505
1518
class cmd_remove(Command):
1506
__doc__ = """Remove files or directories.
1519
"""Remove files or directories.
1507
1520
1508
1521
This makes bzr stop tracking changes to the specified files. bzr will delete
1509
1522
them if they can easily be recovered using revert. If no options or
1531
1544
if file_list is not None:
1532
1545
file_list = [f for f in file_list]
1533
1546
1534
self.add_cleanup(tree.lock_write().unlock)
1547
tree.lock_write()
1548
self.add_cleanup(tree.unlock)
1535
1549
# Heuristics should probably all move into tree.remove_smart or
1536
1550
# some such?
1537
1551
if new:
1556
1570
1557
1571
1558
1572
class cmd_file_id(Command):
1559
__doc__ = """Print file_id of a particular file or directory.
1573
"""Print file_id of a particular file or directory.
1560
1574
1561
1575
The file_id is assigned when the file is first added and remains the
1562
1576
same through all revisions where the file exists, even when it is
1578
1592
1579
1593
1580
1594
class cmd_file_path(Command):
1581
__doc__ = """Print path of file_ids to a file or directory.
1595
"""Print path of file_ids to a file or directory.
1582
1596
1583
1597
This prints one line for each directory down to the target,
1584
1598
starting at the branch root.
1600
1614
1601
1615
1602
1616
class cmd_reconcile(Command):
1603
__doc__ = """Reconcile bzr metadata in a branch.
1617
"""Reconcile bzr metadata in a branch.
1604
1618
1605
1619
This can correct data mismatches that may have been caused by
1606
1620
previous ghost operations or bzr upgrades. You should only
1628
1642
1629
1643
1630
1644
class cmd_revision_history(Command):
1631
__doc__ = """Display the list of revision ids on a branch."""
1645
"""Display the list of revision ids on a branch."""
1632
1646
1633
1647
_see_also = ['log']
1634
1648
takes_args = ['location?']
1644
1658
1645
1659
1646
1660
class cmd_ancestry(Command):
1647
__doc__ = """List all revisions merged into this branch."""
1661
"""List all revisions merged into this branch."""
1648
1662
1649
1663
_see_also = ['log', 'revision-history']
1650
1664
takes_args = ['location?']
1669
1683
1670
1684
1671
1685
class cmd_init(Command):
1672
__doc__ = """Make a directory into a versioned branch.
1686
"""Make a directory into a versioned branch.
1673
1687
1674
1688
Use this to create an empty branch, or before importing an
1675
1689
existing project.
1778
1792
1779
1793
1780
1794
class cmd_init_repository(Command):
1781
__doc__ = """Create a shared repository for branches to share storage space.
1795
"""Create a shared repository for branches to share storage space.
1782
1796
1783
1797
New branches created under the repository directory will store their
1784
1798
revisions in the repository, not in the branch directory. For branches
1838
1852
1839
1853
1840
1854
class cmd_diff(Command):
1841
__doc__ = """Show differences in the working tree, between revisions or branches.
1855
"""Show differences in the working tree, between revisions or branches.
1842
1856
1843
1857
If no arguments are given, all changes for the current tree are listed.
1844
1858
If files are given, only the changes in those files are listed.
1941
1955
@display_command
1942
1956
def run(self, revision=None, file_list=None, diff_options=None,
1943
1957
prefix=None, old=None, new=None, using=None, format=None):
1944
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1958
from bzrlib.diff import (get_trees_and_branches_to_diff,
1945
1959
show_diff_trees)
1946
1960
1947
1961
if (prefix is None) or (prefix == '0'):
1968
1982
1969
1983
(old_tree, new_tree,
1970
1984
old_branch, new_branch,
1971
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1972
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1973
# GNU diff on Windows uses ANSI encoding for filenames
1974
path_encoding = osutils.get_diff_header_encoding()
1985
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1986
file_list, revision, old, new, apply_view=True)
1975
1987
return show_diff_trees(old_tree, new_tree, sys.stdout,
1976
1988
specific_files=specific_files,
1977
1989
external_diff_options=diff_options,
1978
1990
old_label=old_label, new_label=new_label,
1979
extra_trees=extra_trees,
1980
path_encoding=path_encoding,
1981
using=using,
1991
extra_trees=extra_trees, using=using,
1982
1992
format_cls=format)
1983
1993
1984
1994
1985
1995
class cmd_deleted(Command):
1986
__doc__ = """List files deleted in the working tree.
1996
"""List files deleted in the working tree.
1987
1997
"""
1988
1998
# TODO: Show files deleted since a previous revision, or
1989
1999
# between two revisions.
1992
2002
# level of effort but possibly much less IO. (Or possibly not,
1993
2003
# if the directories are very large...)
1994
2004
_see_also = ['status', 'ls']
1995
takes_options = ['directory', 'show-ids']
2005
takes_options = ['show-ids']
1996
2006
1997
2007
@display_command
1998
def run(self, show_ids=False, directory=u'.'):
1999
tree = WorkingTree.open_containing(directory)[0]
2000
self.add_cleanup(tree.lock_read().unlock)
2008
def run(self, show_ids=False):
2009
tree = WorkingTree.open_containing(u'.')[0]
2010
tree.lock_read()
2011
self.add_cleanup(tree.unlock)
2001
2012
old = tree.basis_tree()
2002
self.add_cleanup(old.lock_read().unlock)
2013
old.lock_read()
2014
self.add_cleanup(old.unlock)
2003
2015
for path, ie in old.inventory.iter_entries():
2004
2016
if not tree.has_id(ie.file_id):
2005
2017
self.outf.write(path)
2010
2022
2011
2023
2012
2024
class cmd_modified(Command):
2013
__doc__ = """List files modified in working tree.
2025
"""List files modified in working tree.
2014
2026
"""
2015
2027
2016
2028
hidden = True
2017
2029
_see_also = ['status', 'ls']
2018
takes_options = ['directory', 'null']
2030
takes_options = [
2031
Option('null',
2032
help='Write an ascii NUL (\\0) separator '
2033
'between files rather than a newline.')
2034
]
2019
2035
2020
2036
@display_command
2021
def run(self, null=False, directory=u'.'):
2022
tree = WorkingTree.open_containing(directory)[0]
2037
def run(self, null=False):
2038
tree = WorkingTree.open_containing(u'.')[0]
2023
2039
td = tree.changes_from(tree.basis_tree())
2024
2040
for path, id, kind, text_modified, meta_modified in td.modified:
2025
2041
if null:
2029
2045
2030
2046
2031
2047
class cmd_added(Command):
2032
__doc__ = """List files added in working tree.
2048
"""List files added in working tree.
2033
2049
"""
2034
2050
2035
2051
hidden = True
2036
2052
_see_also = ['status', 'ls']
2037
takes_options = ['directory', 'null']
2053
takes_options = [
2054
Option('null',
2055
help='Write an ascii NUL (\\0) separator '
2056
'between files rather than a newline.')
2057
]
2038
2058
2039
2059
@display_command
2040
def run(self, null=False, directory=u'.'):
2041
wt = WorkingTree.open_containing(directory)[0]
2042
self.add_cleanup(wt.lock_read().unlock)
2060
def run(self, null=False):
2061
wt = WorkingTree.open_containing(u'.')[0]
2062
wt.lock_read()
2063
self.add_cleanup(wt.unlock)
2043
2064
basis = wt.basis_tree()
2044
self.add_cleanup(basis.lock_read().unlock)
2065
basis.lock_read()
2066
self.add_cleanup(basis.unlock)
2045
2067
basis_inv = basis.inventory
2046
2068
inv = wt.inventory
2047
2069
for file_id in inv:
2050
2072
if inv.is_root(file_id) and len(basis_inv) == 0:
2051
2073
continue
2052
2074
path = inv.id2path(file_id)
2053
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2075
if not os.access(osutils.abspath(path), os.F_OK):
2054
2076
continue
2055
2077
if null:
2056
2078
self.outf.write(path + '\0')
2059
2081
2060
2082
2061
2083
class cmd_root(Command):
2062
__doc__ = """Show the tree root directory.
2084
"""Show the tree root directory.
2063
2085
2064
2086
The root is the nearest enclosing directory with a .bzr control
2065
2087
directory."""
2089
2111
2090
2112
2091
2113
class cmd_log(Command):
2092
__doc__ = """Show historical log for a branch or subset of a branch.
2114
"""Show historical log for a branch or subset of a branch.
2093
2115
2094
2116
log is bzr's default tool for exploring the history of a branch.
2095
2117
The branch to use is taken from the first parameter. If no parameters
2256
2278
help='Show just the specified revision.'
2257
2279
' See also "help revisionspec".'),
2258
2280
'log-format',
2259
RegistryOption('authors',
2260
'What names to list as authors - first, all or committer.',
2261
title='Authors',
2262
lazy_registry=('bzrlib.log', 'author_list_registry'),
2263
),
2264
2281
Option('levels',
2265
2282
short_name='n',
2266
2283
help='Number of levels to display - 0 for all, 1 for flat.',
2281
2298
help='Show changes made in each revision as a patch.'),
2282
2299
Option('include-merges',
2283
2300
help='Show merged revisions like --levels 0 does.'),
2284
Option('exclude-common-ancestry',
2285
help='Display only the revisions that are not part'
2286
' of both ancestries (require -rX..Y)'
2287
)
2288
2301
]
2289
2302
encoding_type = 'replace'
2290
2303
2300
2313
message=None,
2301
2314
limit=None,
2302
2315
show_diff=False,
2303
include_merges=False,
2304
authors=None,
2305
exclude_common_ancestry=False,
2306
):
2316
include_merges=False):
2307
2317
from bzrlib.log import (
2308
2318
Logger,
2309
2319
make_log_request_dict,
2310
2320
_get_info_for_log_files,
2311
2321
)
2312
2322
direction = (forward and 'forward') or 'reverse'
2313
if (exclude_common_ancestry
2314
and (revision is None or len(revision) != 2)):
2315
raise errors.BzrCommandError(
2316
'--exclude-common-ancestry requires -r with two revisions')
2317
2323
if include_merges:
2318
2324
if levels is None:
2319
2325
levels = 0
2335
2341
if file_list:
2336
2342
# find the file ids to log and check for directory filtering
2337
2343
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2338
revision, file_list, self.add_cleanup)
2344
revision, file_list)
2345
self.add_cleanup(b.unlock)
2339
2346
for relpath, file_id, kind in file_info_list:
2340
2347
if file_id is None:
2341
2348
raise errors.BzrCommandError(
2359
2366
location = '.'
2360
2367
dir, relpath = bzrdir.BzrDir.open_containing(location)
2361
2368
b = dir.open_branch()
2362
self.add_cleanup(b.lock_read().unlock)
2369
b.lock_read()
2370
self.add_cleanup(b.unlock)
2363
2371
rev1, rev2 = _get_revision_range(revision, b, self.name())
2364
2372
2365
2373
# Decide on the type of delta & diff filtering to use
2385
2393
show_timezone=timezone,
2386
2394
delta_format=get_verbosity_level(),
2387
2395
levels=levels,
2388
show_advice=levels is None,
2389
author_list_handler=authors)
2396
show_advice=levels is None)
2390
2397
2391
2398
# Choose the algorithm for doing the logging. It's annoying
2392
2399
# having multiple code paths like this but necessary until
2411
2418
direction=direction, specific_fileids=file_ids,
2412
2419
start_revision=rev1, end_revision=rev2, limit=limit,
2413
2420
message_search=message, delta_type=delta_type,
2414
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2415
exclude_common_ancestry=exclude_common_ancestry,
2416
)
2421
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2417
2422
Logger(b, rqst).show(lf)
2418
2423
2419
2424
2477
2482
2478
2483
2479
2484
class cmd_touching_revisions(Command):
2480
__doc__ = """Return revision-ids which affected a particular file.
2485
"""Return revision-ids which affected a particular file.
2481
2486
2482
2487
A more user-friendly interface is "bzr log FILE".
2483
2488
"""
2490
2495
tree, relpath = WorkingTree.open_containing(filename)
2491
2496
file_id = tree.path2id(relpath)
2492
2497
b = tree.branch
2493
self.add_cleanup(b.lock_read().unlock)
2498
b.lock_read()
2499
self.add_cleanup(b.unlock)
2494
2500
touching_revs = log.find_touching_revisions(b, file_id)
2495
2501
for revno, revision_id, what in touching_revs:
2496
2502
self.outf.write("%6d %s\n" % (revno, what))
2497
2503
2498
2504
2499
2505
class cmd_ls(Command):
2500
__doc__ = """List files in a tree.
2506
"""List files in a tree.
2501
2507
"""
2502
2508
2503
2509
_see_also = ['status', 'cat']
2509
2515
help='Recurse into subdirectories.'),
2510
2516
Option('from-root',
2511
2517
help='Print paths relative to the root of the branch.'),
2512
Option('unknown', short_name='u',
2513
help='Print unknown files.'),
2518
Option('unknown', help='Print unknown files.'),
2514
2519
Option('versioned', help='Print versioned files.',
2515
2520
short_name='V'),
2516
Option('ignored', short_name='i',
2517
help='Print ignored files.'),
2518
Option('kind', short_name='k',
2521
Option('ignored', help='Print ignored files.'),
2522
Option('null',
2523
help='Write an ascii NUL (\\0) separator '
2524
'between files rather than a newline.'),
2525
Option('kind',
2519
2526
help='List entries of a particular kind: file, directory, symlink.',
2520
2527
type=unicode),
2521
'null',
2522
2528
'show-ids',
2523
'directory',
2524
2529
]
2525
2530
@display_command
2526
2531
def run(self, revision=None, verbose=False,
2527
2532
recursive=False, from_root=False,
2528
2533
unknown=False, versioned=False, ignored=False,
2529
null=False, kind=None, show_ids=False, path=None, directory=None):
2534
null=False, kind=None, show_ids=False, path=None):
2530
2535
2531
2536
if kind and kind not in ('file', 'directory', 'symlink'):
2532
2537
raise errors.BzrCommandError('invalid kind specified')
2544
2549
raise errors.BzrCommandError('cannot specify both --from-root'
2545
2550
' and PATH')
2546
2551
fs_path = path
2547
tree, branch, relpath = \
2548
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2552
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2553
fs_path)
2549
2554
2550
2555
# Calculate the prefix to use
2551
2556
prefix = None
2566
2571
view_str = views.view_display_str(view_files)
2567
2572
note("Ignoring files outside view. View is %s" % view_str)
2568
2573
2569
self.add_cleanup(tree.lock_read().unlock)
2574
tree.lock_read()
2575
self.add_cleanup(tree.unlock)
2570
2576
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2571
2577
from_dir=relpath, recursive=recursive):
2572
2578
# Apply additional masking
2614
2620
2615
2621
2616
2622
class cmd_unknowns(Command):
2617
__doc__ = """List unknown files.
2623
"""List unknown files.
2618
2624
"""
2619
2625
2620
2626
hidden = True
2621
2627
_see_also = ['ls']
2622
takes_options = ['directory']
2623
2628
2624
2629
@display_command
2625
def run(self, directory=u'.'):
2626
for f in WorkingTree.open_containing(directory)[0].unknowns():
2630
def run(self):
2631
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2627
2632
self.outf.write(osutils.quotefn(f) + '\n')
2628
2633
2629
2634
2630
2635
class cmd_ignore(Command):
2631
__doc__ = """Ignore specified files or patterns.
2636
"""Ignore specified files or patterns.
2632
2637
2633
2638
See ``bzr help patterns`` for details on the syntax of patterns.
2634
2639
2643
2648
using this command or directly by using an editor, be sure to commit
2644
2649
it.
2645
2650
2646
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2647
the global ignore file can be found in the application data directory as
2648
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2649
Global ignores are not touched by this command. The global ignore file
2650
can be edited directly using an editor.
2651
2652
2651
Patterns prefixed with '!' are exceptions to ignore patterns and take
2653
2652
precedence over regular ignores. Such exceptions are used to specify
2654
2653
files that should be versioned which would otherwise be ignored.
2694
2693
2695
2694
_see_also = ['status', 'ignored', 'patterns']
2696
2695
takes_args = ['name_pattern*']
2697
takes_options = ['directory',
2698
Option('default-rules',
2699
help='Display the default ignore rules that bzr uses.')
2696
takes_options = [
2697
Option('old-default-rules',
2698
help='Write out the ignore rules bzr < 0.9 always used.')
2700
2699
]
2701
2700
2702
def run(self, name_pattern_list=None, default_rules=None,
2703
directory=u'.'):
2701
def run(self, name_pattern_list=None, old_default_rules=None):
2704
2702
from bzrlib import ignores
2705
if default_rules is not None:
2706
# dump the default rules and exit
2707
for pattern in ignores.USER_DEFAULTS:
2703
if old_default_rules is not None:
2704
# dump the rules and exit
2705
for pattern in ignores.OLD_DEFAULTS:
2708
2706
self.outf.write("%s\n" % pattern)
2709
2707
return
2710
2708
if not name_pattern_list:
2711
2709
raise errors.BzrCommandError("ignore requires at least one "
2712
"NAME_PATTERN or --default-rules.")
2710
"NAME_PATTERN or --old-default-rules")
2713
2711
name_pattern_list = [globbing.normalize_pattern(p)
2714
2712
for p in name_pattern_list]
2715
bad_patterns = ''
2716
for p in name_pattern_list:
2717
if not globbing.Globster.is_pattern_valid(p):
2718
bad_patterns += ('\n %s' % p)
2719
if bad_patterns:
2720
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2721
ui.ui_factory.show_error(msg)
2722
raise errors.InvalidPattern('')
2723
2713
for name_pattern in name_pattern_list:
2724
2714
if (name_pattern[0] == '/' or
2725
2715
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2726
2716
raise errors.BzrCommandError(
2727
2717
"NAME_PATTERN should not be an absolute path")
2728
tree, relpath = WorkingTree.open_containing(directory)
2718
tree, relpath = WorkingTree.open_containing(u'.')
2729
2719
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2730
2720
ignored = globbing.Globster(name_pattern_list)
2731
2721
matches = []
2732
self.add_cleanup(tree.lock_read().unlock)
2722
tree.lock_read()
2733
2723
for entry in tree.list_files():
2734
2724
id = entry[3]
2735
2725
if id is not None:
2736
2726
filename = entry[0]
2737
2727
if ignored.match(filename):
2738
2728
matches.append(filename)
2729
tree.unlock()
2739
2730
if len(matches) > 0:
2740
2731
self.outf.write("Warning: the following files are version controlled and"
2741
2732
" match your ignore pattern:\n%s"
2744
2735
2745
2736
2746
2737
class cmd_ignored(Command):
2747
__doc__ = """List ignored files and the patterns that matched them.
2738
"""List ignored files and the patterns that matched them.
2748
2739
2749
2740
List all the ignored files and the ignore pattern that caused the file to
2750
2741
be ignored.
2756
2747
2757
2748
encoding_type = 'replace'
2758
2749
_see_also = ['ignore', 'ls']
2759
takes_options = ['directory']
2760
2750
2761
2751
@display_command
2762
def run(self, directory=u'.'):
2763
tree = WorkingTree.open_containing(directory)[0]
2764
self.add_cleanup(tree.lock_read().unlock)
2752
def run(self):
2753
tree = WorkingTree.open_containing(u'.')[0]
2754
tree.lock_read()
2755
self.add_cleanup(tree.unlock)
2765
2756
for path, file_class, kind, file_id, entry in tree.list_files():
2766
2757
if file_class != 'I':
2767
2758
continue
2771
2762
2772
2763
2773
2764
class cmd_lookup_revision(Command):
2774
__doc__ = """Lookup the revision-id from a revision-number
2765
"""Lookup the revision-id from a revision-number
2775
2766
2776
2767
:Examples:
2777
2768
bzr lookup-revision 33
2778
2769
"""
2779
2770
hidden = True
2780
2771
takes_args = ['revno']
2781
takes_options = ['directory']
2782
2772
2783
2773
@display_command
2784
def run(self, revno, directory=u'.'):
2774
def run(self, revno):
2785
2775
try:
2786
2776
revno = int(revno)
2787
2777
except ValueError:
2788
2778
raise errors.BzrCommandError("not a valid revision-number: %r"
2789
2779
% revno)
2790
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2780
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2791
2781
self.outf.write("%s\n" % revid)
2792
2782
2793
2783
2794
2784
class cmd_export(Command):
2795
__doc__ = """Export current or past revision to a destination directory or archive.
2785
"""Export current or past revision to a destination directory or archive.
2796
2786
2797
2787
If no revision is specified this exports the last committed revision.
2798
2788
2820
2810
================= =========================
2821
2811
"""
2822
2812
takes_args = ['dest', 'branch_or_subdir?']
2823
takes_options = ['directory',
2813
takes_options = [
2824
2814
Option('format',
2825
2815
help="Type of file to export to.",
2826
2816
type=unicode),
2835
2825
'revision in which it was changed.'),
2836
2826
]
2837
2827
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2838
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2828
root=None, filters=False, per_file_timestamps=False):
2839
2829
from bzrlib.export import export
2840
2830
2841
2831
if branch_or_subdir is None:
2842
tree = WorkingTree.open_containing(directory)[0]
2832
tree = WorkingTree.open_containing(u'.')[0]
2843
2833
b = tree.branch
2844
2834
subdir = None
2845
2835
else:
2855
2845
2856
2846
2857
2847
class cmd_cat(Command):
2858
__doc__ = """Write the contents of a file as of a given revision to standard output.
2848
"""Write the contents of a file as of a given revision to standard output.
2859
2849
2860
2850
If no revision is nominated, the last revision is used.
2861
2851
2864
2854
"""
2865
2855
2866
2856
_see_also = ['ls']
2867
takes_options = ['directory',
2857
takes_options = [
2868
2858
Option('name-from-revision', help='The path name in the old tree.'),
2869
2859
Option('filters', help='Apply content filters to display the '
2870
2860
'convenience form.'),
2875
2865
2876
2866
@display_command
2877
2867
def run(self, filename, revision=None, name_from_revision=False,
2878
filters=False, directory=None):
2868
filters=False):
2879
2869
if revision is not None and len(revision) != 1:
2880
2870
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2881
2871
" one revision specifier")
2882
2872
tree, branch, relpath = \
2883
_open_directory_or_containing_tree_or_branch(filename, directory)
2884
self.add_cleanup(branch.lock_read().unlock)
2873
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2874
branch.lock_read()
2875
self.add_cleanup(branch.unlock)
2885
2876
return self._run(tree, branch, relpath, filename, revision,
2886
2877
name_from_revision, filters)
2887
2878
2890
2881
if tree is None:
2891
2882
tree = b.basis_tree()
2892
2883
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2893
self.add_cleanup(rev_tree.lock_read().unlock)
2884
rev_tree.lock_read()
2885
self.add_cleanup(rev_tree.unlock)
2894
2886
2895
2887
old_file_id = rev_tree.path2id(relpath)
2896
2888
2939
2931
2940
2932
2941
2933
class cmd_local_time_offset(Command):
2942
__doc__ = """Show the offset in seconds from GMT to local time."""
2934
"""Show the offset in seconds from GMT to local time."""
2943
2935
hidden = True
2944
2936
@display_command
2945
2937
def run(self):
2948
2940
2949
2941
2950
2942
class cmd_commit(Command):
2951
__doc__ = """Commit changes into a new revision.
2943
"""Commit changes into a new revision.
2952
2944
2953
2945
An explanatory message needs to be given for each commit. This is
2954
2946
often done by using the --message option (getting the message from the
3062
3054
"the master branch until a normal commit "
3063
3055
"is performed."
3064
3056
),
3065
Option('show-diff', short_name='p',
3057
Option('show-diff',
3066
3058
help='When no message is supplied, show the diff along'
3067
3059
' with the status summary in the message editor.'),
3068
3060
]
3158
3150
def get_message(commit_obj):
3159
3151
"""Callback to get commit message"""
3160
3152
if file:
3161
f = codecs.open(file, 'rt', osutils.get_user_encoding())
3162
try:
3163
my_message = f.read()
3164
finally:
3165
f.close()
3153
my_message = codecs.open(
3154
file, 'rt', osutils.get_user_encoding()).read()
3166
3155
elif message is not None:
3167
3156
my_message = message
3168
3157
else:
3217
3206
3218
3207
3219
3208
class cmd_check(Command):
3220
__doc__ = """Validate working tree structure, branch consistency and repository history.
3209
"""Validate working tree structure, branch consistency and repository history.
3221
3210
3222
3211
This command checks various invariants about branch and repository storage
3223
3212
to detect data corruption or bzr bugs.
3287
3276
3288
3277
3289
3278
class cmd_upgrade(Command):
3290
__doc__ = """Upgrade branch storage to current format.
3279
"""Upgrade branch storage to current format.
3291
3280
3292
3281
The check command or bzr developers may sometimes advise you to run
3293
3282
this command. When the default format has changed you may also be warned
3311
3300
3312
3301
3313
3302
class cmd_whoami(Command):
3314
__doc__ = """Show or set bzr user id.
3303
"""Show or set bzr user id.
3315
3304
3316
3305
:Examples:
3317
3306
Show the email of the current user::
3322
3311
3323
3312
bzr whoami "Frank Chu <fchu@example.com>"
3324
3313
"""
3325
takes_options = [ 'directory',
3326
Option('email',
3314
takes_options = [ Option('email',
3327
3315
help='Display email address only.'),
3328
3316
Option('branch',
3329
3317
help='Set identity for the current branch instead of '
3333
3321
encoding_type = 'replace'
3334
3322
3335
3323
@display_command
3336
def run(self, email=False, branch=False, name=None, directory=None):
3324
def run(self, email=False, branch=False, name=None):
3337
3325
if name is None:
3338
if directory is None:
3339
# use branch if we're inside one; otherwise global config
3340
try:
3341
c = Branch.open_containing(u'.')[0].get_config()
3342
except errors.NotBranchError:
3343
c = config.GlobalConfig()
3344
else:
3345
c = Branch.open(directory).get_config()
3326
# use branch if we're inside one; otherwise global config
3327
try:
3328
c = Branch.open_containing('.')[0].get_config()
3329
except errors.NotBranchError:
3330
c = config.GlobalConfig()
3346
3331
if email:
3347
3332
self.outf.write(c.user_email() + '\n')
3348
3333
else:
3358
3343
3359
3344
# use global config unless --branch given
3360
3345
if branch:
3361
if directory is None:
3362
c = Branch.open_containing(u'.')[0].get_config()
3363
else:
3364
c = Branch.open(directory).get_config()
3346
c = Branch.open_containing('.')[0].get_config()
3365
3347
else:
3366
3348
c = config.GlobalConfig()
3367
3349
c.set_user_option('email', name)
3368
3350
3369
3351
3370
3352
class cmd_nick(Command):
3371
__doc__ = """Print or set the branch nickname.
3353
"""Print or set the branch nickname.
3372
3354
3373
3355
If unset, the tree root directory name is used as the nickname.
3374
3356
To print the current nickname, execute with no argument.
3379
3361
3380
3362
_see_also = ['info']
3381
3363
takes_args = ['nickname?']
3382
takes_options = ['directory']
3383
def run(self, nickname=None, directory=u'.'):
3384
branch = Branch.open_containing(directory)[0]
3364
def run(self, nickname=None):
3365
branch = Branch.open_containing(u'.')[0]
3385
3366
if nickname is None:
3386
3367
self.printme(branch)
3387
3368
else:
3393
3374
3394
3375
3395
3376
class cmd_alias(Command):
3396
__doc__ = """Set/unset and display aliases.
3377
"""Set/unset and display aliases.
3397
3378
3398
3379
:Examples:
3399
3380
Show the current aliases::
3463
3444
3464
3445
3465
3446
class cmd_selftest(Command):
3466
__doc__ = """Run internal test suite.
3447
"""Run internal test suite.
3467
3448
3468
3449
If arguments are given, they are regular expressions that say which tests
3469
3450
should run. Tests matching any expression are run, and other tests are
3537
3518
'throughout the test suite.',
3538
3519
type=get_transport_type),
3539
3520
Option('benchmark',
3540
help='Run the benchmarks rather than selftests.',
3541
hidden=True),
3521
help='Run the benchmarks rather than selftests.'),
3542
3522
Option('lsprof-timed',
3543
3523
help='Generate lsprof output for benchmarked'
3544
3524
' sections of code.'),
3545
3525
Option('lsprof-tests',
3546
3526
help='Generate lsprof output for each test.'),
3527
Option('cache-dir', type=str,
3528
help='Cache intermediate benchmark output in this '
3529
'directory.'),
3547
3530
Option('first',
3548
3531
help='Run all tests, but run specified tests first.',
3549
3532
short_name='f',
3583
3566
3584
3567
def run(self, testspecs_list=None, verbose=False, one=False,
3585
3568
transport=None, benchmark=None,
3586
lsprof_timed=None,
3569
lsprof_timed=None, cache_dir=None,
3587
3570
first=False, list_only=False,
3588
3571
randomize=None, exclude=None, strict=False,
3589
3572
load_list=None, debugflag=None, starting_with=None, subunit=False,
3590
3573
parallel=None, lsprof_tests=False):
3591
3574
from bzrlib.tests import selftest
3575
import bzrlib.benchmarks as benchmarks
3576
from bzrlib.benchmarks import tree_creator
3592
3577
3593
3578
# Make deprecation warnings visible, unless -Werror is set
3594
3579
symbol_versioning.activate_deprecation_warnings(override=False)
3595
3580
3581
if cache_dir is not None:
3582
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3596
3583
if testspecs_list is not None:
3597
3584
pattern = '|'.join(testspecs_list)
3598
3585
else:
3604
3591
raise errors.BzrCommandError("subunit not available. subunit "
3605
3592
"needs to be installed to use --subunit.")
3606
3593
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3607
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3608
# stdout, which would corrupt the subunit stream.
3609
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3610
# following code can be deleted when it's sufficiently deployed
3611
# -- vila/mgz 20100514
3612
if (sys.platform == "win32"
3613
and getattr(sys.stdout, 'fileno', None) is not None):
3614
import msvcrt
3615
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3616
3594
if parallel:
3617
3595
self.additional_selftest_args.setdefault(
3618
3596
'suite_decorators', []).append(parallel)
3619
3597
if benchmark:
3620
raise errors.BzrCommandError(
3621
"--benchmark is no longer supported from bzr 2.2; "
3622
"use bzr-usertest instead")
3623
test_suite_factory = None
3598
test_suite_factory = benchmarks.test_suite
3599
# Unless user explicitly asks for quiet, be verbose in benchmarks
3600
verbose = not is_quiet()
3601
# TODO: should possibly lock the history file...
3602
benchfile = open(".perf_history", "at", buffering=1)
3603
self.add_cleanup(benchfile.close)
3604
else:
3605
test_suite_factory = None
3606
benchfile = None
3624
3607
selftest_kwargs = {"verbose": verbose,
3625
3608
"pattern": pattern,
3626
3609
"stop_on_failure": one,
3628
3611
"test_suite_factory": test_suite_factory,
3629
3612
"lsprof_timed": lsprof_timed,
3630
3613
"lsprof_tests": lsprof_tests,
3614
"bench_history": benchfile,
3631
3615
"matching_tests_first": first,
3632
3616
"list_only": list_only,
3633
3617
"random_seed": randomize,
3643
3627
3644
3628
3645
3629
class cmd_version(Command):
3646
__doc__ = """Show version of bzr."""
3630
"""Show version of bzr."""
3647
3631
3648
3632
encoding_type = 'replace'
3649
3633
takes_options = [
3660
3644
3661
3645
3662
3646
class cmd_rocks(Command):
3663
__doc__ = """Statement of optimism."""
3647
"""Statement of optimism."""
3664
3648
3665
3649
hidden = True
3666
3650
3670
3654
3671
3655
3672
3656
class cmd_find_merge_base(Command):
3673
__doc__ = """Find and print a base revision for merging two branches."""
3657
"""Find and print a base revision for merging two branches."""
3674
3658
# TODO: Options to specify revisions on either side, as if
3675
3659
# merging only part of the history.
3676
3660
takes_args = ['branch', 'other']
3682
3666
3683
3667
branch1 = Branch.open_containing(branch)[0]
3684
3668
branch2 = Branch.open_containing(other)[0]
3685
self.add_cleanup(branch1.lock_read().unlock)
3686
self.add_cleanup(branch2.lock_read().unlock)
3669
branch1.lock_read()
3670
self.add_cleanup(branch1.unlock)
3671
branch2.lock_read()
3672
self.add_cleanup(branch2.unlock)
3687
3673
last1 = ensure_null(branch1.last_revision())
3688
3674
last2 = ensure_null(branch2.last_revision())
3689
3675
3694
3680
3695
3681
3696
3682
class cmd_merge(Command):
3697
__doc__ = """Perform a three-way merge.
3683
"""Perform a three-way merge.
3698
3684
3699
3685
The source of the merge can be specified either in the form of a branch,
3700
3686
or in the form of a path to a file containing a merge directive generated
3783
3769
' completely merged into the source, pull from the'
3784
3770
' source rather than merging. When this happens,'
3785
3771
' you do not need to commit the result.'),
3786
custom_help('directory',
3772
Option('directory',
3787
3773
help='Branch to merge into, '
3788
'rather than the one containing the working directory.'),
3774
'rather than the one containing the working directory.',
3775
short_name='d',
3776
type=unicode,
3777
),
3789
3778
Option('preview', help='Instead of merging, show a diff of the'
3790
3779
' merge.'),
3791
3780
Option('interactive', help='Select changes interactively.',
3824
3813
unversioned_filter=tree.is_ignored, view_info=view_info)
3825
3814
pb = ui.ui_factory.nested_progress_bar()
3826
3815
self.add_cleanup(pb.finished)
3827
self.add_cleanup(tree.lock_write().unlock)
3816
tree.lock_write()
3817
self.add_cleanup(tree.unlock)
3828
3818
if location is not None:
3829
3819
try:
3830
3820
mergeable = bundle.read_mergeable_from_url(location,
3891
3881
def _do_preview(self, merger):
3892
3882
from bzrlib.diff import show_diff_trees
3893
3883
result_tree = self._get_preview(merger)
3894
path_encoding = osutils.get_diff_header_encoding()
3895
3884
show_diff_trees(merger.this_tree, result_tree, self.outf,
3896
old_label='', new_label='',
3897
path_encoding=path_encoding)
3885
old_label='', new_label='')
3898
3886
3899
3887
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3900
3888
merger.change_reporter = change_reporter
4053
4041
4054
4042
4055
4043
class cmd_remerge(Command):
4056
__doc__ = """Redo a merge.
4044
"""Redo a merge.
4057
4045
4058
4046
Use this if you want to try a different merge technique while resolving
4059
4047
conflicts. Some merge techniques are better than others, and remerge
4088
4076
if merge_type is None:
4089
4077
merge_type = _mod_merge.Merge3Merger
4090
4078
tree, file_list = tree_files(file_list)
4091
self.add_cleanup(tree.lock_write().unlock)
4079
tree.lock_write()
4080
self.add_cleanup(tree.unlock)
4092
4081
parents = tree.get_parent_ids()
4093
4082
if len(parents) != 2:
4094
4083
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4147
4136
4148
4137
4149
4138
class cmd_revert(Command):
4150
__doc__ = """Revert files to a previous revision.
4139
"""Revert files to a previous revision.
4151
4140
4152
4141
Giving a list of files will revert only those files. Otherwise, all files
4153
4142
will be reverted. If the revision is not specified with '--revision', the
4204
4193
def run(self, revision=None, no_backup=False, file_list=None,
4205
4194
forget_merges=None):
4206
4195
tree, file_list = tree_files(file_list)
4207
self.add_cleanup(tree.lock_tree_write().unlock)
4196
tree.lock_write()
4197
self.add_cleanup(tree.unlock)
4208
4198
if forget_merges:
4209
4199
tree.set_parent_ids(tree.get_parent_ids()[:1])
4210
4200
else:
4218
4208
4219
4209
4220
4210
class cmd_assert_fail(Command):
4221
__doc__ = """Test reporting of assertion failures"""
4211
"""Test reporting of assertion failures"""
4222
4212
# intended just for use in testing
4223
4213
4224
4214
hidden = True
4228
4218
4229
4219
4230
4220
class cmd_help(Command):
4231
__doc__ = """Show help on a command or other topic.
4221
"""Show help on a command or other topic.
4232
4222
"""
4233
4223
4234
4224
_see_also = ['topics']
4247
4237
4248
4238
4249
4239
class cmd_shell_complete(Command):
4250
__doc__ = """Show appropriate completions for context.
4240
"""Show appropriate completions for context.
4251
4241
4252
4242
For a list of all available commands, say 'bzr shell-complete'.
4253
4243
"""
4262
4252
4263
4253
4264
4254
class cmd_missing(Command):
4265
__doc__ = """Show unmerged/unpulled revisions between two branches.
4255
"""Show unmerged/unpulled revisions between two branches.
4266
4256
4267
4257
OTHER_BRANCH may be local or remote.
4268
4258
4299
4289
_see_also = ['merge', 'pull']
4300
4290
takes_args = ['other_branch?']
4301
4291
takes_options = [
4302
'directory',
4303
4292
Option('reverse', 'Reverse the order of revisions.'),
4304
4293
Option('mine-only',
4305
4294
'Display changes in the local branch only.'),
4327
4316
theirs_only=False,
4328
4317
log_format=None, long=False, short=False, line=False,
4329
4318
show_ids=False, verbose=False, this=False, other=False,
4330
include_merges=False, revision=None, my_revision=None,
4331
directory=u'.'):
4319
include_merges=False, revision=None, my_revision=None):
4332
4320
from bzrlib.missing import find_unmerged, iter_log_revisions
4333
4321
def message(s):
4334
4322
if not is_quiet():
4347
4335
elif theirs_only:
4348
4336
restrict = 'remote'
4349
4337
4350
local_branch = Branch.open_containing(directory)[0]
4351
self.add_cleanup(local_branch.lock_read().unlock)
4338
local_branch = Branch.open_containing(u".")[0]
4339
local_branch.lock_read()
4340
self.add_cleanup(local_branch.unlock)
4352
4341
4353
4342
parent = local_branch.get_parent()
4354
4343
if other_branch is None:
4365
4354
if remote_branch.base == local_branch.base:
4366
4355
remote_branch = local_branch
4367
4356
else:
4368
self.add_cleanup(remote_branch.lock_read().unlock)
4357
remote_branch.lock_read()
4358
self.add_cleanup(remote_branch.unlock)
4369
4359
4370
4360
local_revid_range = _revision_range_to_revid_range(
4371
4361
_get_revision_range(my_revision, local_branch,
4426
4416
message("Branches are up to date.\n")
4427
4417
self.cleanup_now()
4428
4418
if not status_code and parent is None and other_branch is not None:
4429
self.add_cleanup(local_branch.lock_write().unlock)
4419
local_branch.lock_write()
4420
self.add_cleanup(local_branch.unlock)
4430
4421
# handle race conditions - a parent might be set while we run.
4431
4422
if local_branch.get_parent() is None:
4432
4423
local_branch.set_parent(remote_branch.base)
4434
4425
4435
4426
4436
4427
class cmd_pack(Command):
4437
__doc__ = """Compress the data within a repository.
4438
4439
This operation compresses the data within a bazaar repository. As
4440
bazaar supports automatic packing of repository, this operation is
4441
normally not required to be done manually.
4442
4443
During the pack operation, bazaar takes a backup of existing repository
4444
data, i.e. pack files. This backup is eventually removed by bazaar
4445
automatically when it is safe to do so. To save disk space by removing
4446
the backed up pack files, the --clean-obsolete-packs option may be
4447
used.
4448
4449
Warning: If you use --clean-obsolete-packs and your machine crashes
4450
during or immediately after repacking, you may be left with a state
4451
where the deletion has been written to disk but the new packs have not
4452
been. In this case the repository may be unusable.
4453
"""
4428
"""Compress the data within a repository."""
4454
4429
4455
4430
_see_also = ['repositories']
4456
4431
takes_args = ['branch_or_repo?']
4457
takes_options = [
4458
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4459
]
4460
4432
4461
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4433
def run(self, branch_or_repo='.'):
4462
4434
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4463
4435
try:
4464
4436
branch = dir.open_branch()
4465
4437
repository = branch.repository
4466
4438
except errors.NotBranchError:
4467
4439
repository = dir.open_repository()
4468
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4440
repository.pack()
4469
4441
4470
4442
4471
4443
class cmd_plugins(Command):
4472
__doc__ = """List the installed plugins.
4444
"""List the installed plugins.
4473
4445
4474
4446
This command displays the list of installed plugins including
4475
4447
version of plugin and a short description of each.
4514
4486
4515
4487
4516
4488
class cmd_testament(Command):
4517
__doc__ = """Show testament (signing-form) of a revision."""
4489
"""Show testament (signing-form) of a revision."""
4518
4490
takes_options = [
4519
4491
'revision',
4520
4492
Option('long', help='Produce long-format testament.'),
4532
4504
b = Branch.open_containing(branch)[0]
4533
4505
else:
4534
4506
b = Branch.open(branch)
4535
self.add_cleanup(b.lock_read().unlock)
4507
b.lock_read()
4508
self.add_cleanup(b.unlock)
4536
4509
if revision is None:
4537
4510
rev_id = b.last_revision()
4538
4511
else:
4545
4518
4546
4519
4547
4520
class cmd_annotate(Command):
4548
__doc__ = """Show the origin of each line in a file.
4521
"""Show the origin of each line in a file.
4549
4522
4550
4523
This prints out the given file with an annotation on the left side
4551
4524
indicating which revision, author and date introduced the change.
4562
4535
Option('long', help='Show commit date in annotations.'),
4563
4536
'revision',
4564
4537
'show-ids',
4565
'directory',
4566
4538
]
4567
4539
encoding_type = 'exact'
4568
4540
4569
4541
@display_command
4570
4542
def run(self, filename, all=False, long=False, revision=None,
4571
show_ids=False, directory=None):
4543
show_ids=False):
4572
4544
from bzrlib.annotate import annotate_file, annotate_file_tree
4573
4545
wt, branch, relpath = \
4574
_open_directory_or_containing_tree_or_branch(filename, directory)
4546
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4575
4547
if wt is not None:
4576
self.add_cleanup(wt.lock_read().unlock)
4548
wt.lock_read()
4549
self.add_cleanup(wt.unlock)
4577
4550
else:
4578
self.add_cleanup(branch.lock_read().unlock)
4551
branch.lock_read()
4552
self.add_cleanup(branch.unlock)
4579
4553
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4580
self.add_cleanup(tree.lock_read().unlock)
4554
tree.lock_read()
4555
self.add_cleanup(tree.unlock)
4581
4556
if wt is not None:
4582
4557
file_id = wt.path2id(relpath)
4583
4558
else:
4596
4571
4597
4572
4598
4573
class cmd_re_sign(Command):
4599
__doc__ = """Create a digital signature for an existing revision."""
4574
"""Create a digital signature for an existing revision."""
4600
4575
# TODO be able to replace existing ones.
4601
4576
4602
4577
hidden = True # is this right ?
4603
4578
takes_args = ['revision_id*']
4604
takes_options = ['directory', 'revision']
4579
takes_options = ['revision']
4605
4580
4606
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4581
def run(self, revision_id_list=None, revision=None):
4607
4582
if revision_id_list is not None and revision is not None:
4608
4583
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4609
4584
if revision_id_list is None and revision is None:
4610
4585
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4611
b = WorkingTree.open_containing(directory)[0].branch
4612
self.add_cleanup(b.lock_write().unlock)
4586
b = WorkingTree.open_containing(u'.')[0].branch
4587
b.lock_write()
4588
self.add_cleanup(b.unlock)
4613
4589
return self._run(b, revision_id_list, revision)
4614
4590
4615
4591
def _run(self, b, revision_id_list, revision):
4661
4637
4662
4638
4663
4639
class cmd_bind(Command):
4664
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4665
If no branch is supplied, rebind to the last bound location.
4640
"""Convert the current branch into a checkout of the supplied branch.
4666
4641
4667
4642
Once converted into a checkout, commits must succeed on the master branch
4668
4643
before they will be applied to the local branch.
4674
4649
4675
4650
_see_also = ['checkouts', 'unbind']
4676
4651
takes_args = ['location?']
4677
takes_options = ['directory']
4652
takes_options = []
4678
4653
4679
def run(self, location=None, directory=u'.'):
4680
b, relpath = Branch.open_containing(directory)
4654
def run(self, location=None):
4655
b, relpath = Branch.open_containing(u'.')
4681
4656
if location is None:
4682
4657
try:
4683
4658
location = b.get_old_bound_location()
4702
4677
4703
4678
4704
4679
class cmd_unbind(Command):
4705
__doc__ = """Convert the current checkout into a regular branch.
4680
"""Convert the current checkout into a regular branch.
4706
4681
4707
4682
After unbinding, the local branch is considered independent and subsequent
4708
4683
commits will be local only.
4710
4685
4711
4686
_see_also = ['checkouts', 'bind']
4712
4687
takes_args = []
4713
takes_options = ['directory']
4688
takes_options = []
4714
4689
4715
def run(self, directory=u'.'):
4716
b, relpath = Branch.open_containing(directory)
4690
def run(self):
4691
b, relpath = Branch.open_containing(u'.')
4717
4692
if not b.unbind():
4718
4693
raise errors.BzrCommandError('Local branch is not bound')
4719
4694
4720
4695
4721
4696
class cmd_uncommit(Command):
4722
__doc__ = """Remove the last committed revision.
4697
"""Remove the last committed revision.
4723
4698
4724
4699
--verbose will print out what is being removed.
4725
4700
--dry-run will go through all the motions, but not actually
4765
4740
b = control.open_branch()
4766
4741
4767
4742
if tree is not None:
4768
self.add_cleanup(tree.lock_write().unlock)
4743
tree.lock_write()
4744
self.add_cleanup(tree.unlock)
4769
4745
else:
4770
self.add_cleanup(b.lock_write().unlock)
4746
b.lock_write()
4747
self.add_cleanup(b.unlock)
4771
4748
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4772
4749
4773
4750
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4825
4802
4826
4803
4827
4804
class cmd_break_lock(Command):
4828
__doc__ = """Break a dead lock on a repository, branch or working directory.
4805
"""Break a dead lock on a repository, branch or working directory.
4829
4806
4830
4807
CAUTION: Locks should only be broken when you are sure that the process
4831
4808
holding the lock has been stopped.
4850
4827
4851
4828
4852
4829
class cmd_wait_until_signalled(Command):
4853
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4830
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
4854
4831
4855
4832
This just prints a line to signal when it is ready, then blocks on stdin.
4856
4833
"""
4864
4841
4865
4842
4866
4843
class cmd_serve(Command):
4867
__doc__ = """Run the bzr server."""
4844
"""Run the bzr server."""
4868
4845
4869
4846
aliases = ['server']
4870
4847
4881
4858
'result in a dynamically allocated port. The default port '
4882
4859
'depends on the protocol.',
4883
4860
type=str),
4884
custom_help('directory',
4885
help='Serve contents of this directory.'),
4861
Option('directory',
4862
help='Serve contents of this directory.',
4863
type=unicode),
4886
4864
Option('allow-writes',
4887
4865
help='By default the server is a readonly server. Supplying '
4888
4866
'--allow-writes enables write access to the contents of '
4915
4893
4916
4894
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4917
4895
protocol=None):
4918
from bzrlib import transport
4896
from bzrlib.transport import get_transport, transport_server_registry
4919
4897
if directory is None:
4920
4898
directory = os.getcwd()
4921
4899
if protocol is None:
4922
protocol = transport.transport_server_registry.get()
4900
protocol = transport_server_registry.get()
4923
4901
host, port = self.get_host_and_port(port)
4924
4902
url = urlutils.local_path_to_url(directory)
4925
4903
if not allow_writes:
4926
4904
url = 'readonly+' + url
4927
t = transport.get_transport(url)
4928
protocol(t, host, port, inet)
4905
transport = get_transport(url)
4906
protocol(transport, host, port, inet)
4929
4907
4930
4908
4931
4909
class cmd_join(Command):
4932
__doc__ = """Combine a tree into its containing tree.
4910
"""Combine a tree into its containing tree.
4933
4911
4934
4912
This command requires the target tree to be in a rich-root format.
4935
4913
4975
4953
4976
4954
4977
4955
class cmd_split(Command):
4978
__doc__ = """Split a subdirectory of a tree into a separate tree.
4956
"""Split a subdirectory of a tree into a separate tree.
4979
4957
4980
4958
This command will produce a target tree in a format that supports
4981
4959
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
5001
4979
5002
4980
5003
4981
class cmd_merge_directive(Command):
5004
__doc__ = """Generate a merge directive for auto-merge tools.
4982
"""Generate a merge directive for auto-merge tools.
5005
4983
5006
4984
A directive requests a merge to be performed, and also provides all the
5007
4985
information necessary to do so. This means it must either include a
5024
5002
_see_also = ['send']
5025
5003
5026
5004
takes_options = [
5027
'directory',
5028
5005
RegistryOption.from_kwargs('patch-type',
5029
5006
'The type of patch to include in the directive.',
5030
5007
title='Patch type',
5043
5020
encoding_type = 'exact'
5044
5021
5045
5022
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5046
sign=False, revision=None, mail_to=None, message=None,
5047
directory=u'.'):
5023
sign=False, revision=None, mail_to=None, message=None):
5048
5024
from bzrlib.revision import ensure_null, NULL_REVISION
5049
5025
include_patch, include_bundle = {
5050
5026
'plain': (False, False),
5051
5027
'diff': (True, False),
5052
5028
'bundle': (True, True),
5053
5029
}[patch_type]
5054
branch = Branch.open(directory)
5030
branch = Branch.open('.')
5055
5031
stored_submit_branch = branch.get_submit_branch()
5056
5032
if submit_branch is None:
5057
5033
submit_branch = stored_submit_branch
5102
5078
5103
5079
5104
5080
class cmd_send(Command):
5105
__doc__ = """Mail or create a merge-directive for submitting changes.
5081
"""Mail or create a merge-directive for submitting changes.
5106
5082
5107
5083
A merge directive provides many things needed for requesting merges:
5108
5084
5142
5118
given, in which case it is sent to a file.
5143
5119
5144
5120
Mail is sent using your preferred mail program. This should be transparent
5145
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
5121
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5146
5122
If the preferred client can't be found (or used), your editor will be used.
5147
5123
5148
5124
To use a specific mail program, set the mail_client configuration option.
5219
5195
5220
5196
5221
5197
class cmd_bundle_revisions(cmd_send):
5222
__doc__ = """Create a merge-directive for submitting changes.
5198
"""Create a merge-directive for submitting changes.
5223
5199
5224
5200
A merge directive provides many things needed for requesting merges:
5225
5201
5292
5268
5293
5269
5294
5270
class cmd_tag(Command):
5295
__doc__ = """Create, remove or modify a tag naming a revision.
5271
"""Create, remove or modify a tag naming a revision.
5296
5272
5297
5273
Tags give human-meaningful names to revisions. Commands that take a -r
5298
5274
(--revision) option can be given -rtag:X, where X is any previously
5319
5295
Option('delete',
5320
5296
help='Delete this tag rather than placing it.',
5321
5297
),
5322
custom_help('directory',
5323
help='Branch in which to place the tag.'),
5298
Option('directory',
5299
help='Branch in which to place the tag.',
5300
short_name='d',
5301
type=unicode,
5302
),
5324
5303
Option('force',
5325
5304
help='Replace existing tags.',
5326
5305
),
5334
5313
revision=None,
5335
5314
):
5336
5315
branch, relpath = Branch.open_containing(directory)
5337
self.add_cleanup(branch.lock_write().unlock)
5316
branch.lock_write()
5317
self.add_cleanup(branch.unlock)
5338
5318
if delete:
5339
5319
if tag_name is None:
5340
5320
raise errors.BzrCommandError("No tag specified to delete.")
5361
5341
5362
5342
5363
5343
class cmd_tags(Command):
5364
__doc__ = """List tags.
5344
"""List tags.
5365
5345
5366
5346
This command shows a table of tag names and the revisions they reference.
5367
5347
"""
5368
5348
5369
5349
_see_also = ['tag']
5370
5350
takes_options = [
5371
custom_help('directory',
5372
help='Branch whose tags should be displayed.'),
5351
Option('directory',
5352
help='Branch whose tags should be displayed.',
5353
short_name='d',
5354
type=unicode,
5355
),
5373
5356
RegistryOption.from_kwargs('sort',
5374
5357
'Sort tags by different criteria.', title='Sorting',
5375
5358
alpha='Sort tags lexicographically (default).',
5392
5375
if not tags:
5393
5376
return
5394
5377
5395
self.add_cleanup(branch.lock_read().unlock)
5378
branch.lock_read()
5379
self.add_cleanup(branch.unlock)
5396
5380
if revision:
5397
5381
graph = branch.repository.get_graph()
5398
5382
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5431
5415
5432
5416
5433
5417
class cmd_reconfigure(Command):
5434
__doc__ = """Reconfigure the type of a bzr directory.
5418
"""Reconfigure the type of a bzr directory.
5435
5419
5436
5420
A target configuration must be specified.
5437
5421
5522
5506
5523
5507
5524
5508
class cmd_switch(Command):
5525
__doc__ = """Set the branch of a checkout and update.
5509
"""Set the branch of a checkout and update.
5526
5510
5527
5511
For lightweight checkouts, this changes the branch being referenced.
5528
5512
For heavyweight checkouts, this checks that there are no local commits
5545
5529
"""
5546
5530
5547
5531
takes_args = ['to_location?']
5548
takes_options = ['directory',
5549
Option('force',
5532
takes_options = [Option('force',
5550
5533
help='Switch even if local commits will be lost.'),
5551
5534
'revision',
5552
5535
Option('create-branch', short_name='b',
5555
5538
]
5556
5539
5557
5540
def run(self, to_location=None, force=False, create_branch=False,
5558
revision=None, directory=u'.'):
5541
revision=None):
5559
5542
from bzrlib import switch
5560
tree_location = directory
5543
tree_location = '.'
5561
5544
revision = _get_one_revision('switch', revision)
5562
5545
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5563
5546
if to_location is None:
5564
5547
if revision is None:
5565
5548
raise errors.BzrCommandError('You must supply either a'
5566
5549
' revision or a location')
5567
to_location = tree_location
5550
to_location = '.'
5568
5551
try:
5569
5552
branch = control_dir.open_branch()
5570
5553
had_explicit_nick = branch.get_config().has_explicit_nickname()
5619
5602
5620
5603
5621
5604
class cmd_view(Command):
5622
__doc__ = """Manage filtered views.
5605
"""Manage filtered views.
5623
5606
5624
5607
Views provide a mask over the tree so that users can focus on
5625
5608
a subset of a tree when doing their work. After creating a view,
5773
5756
5774
5757
5775
5758
class cmd_hooks(Command):
5776
__doc__ = """Show hooks."""
5759
"""Show hooks."""
5777
5760
5778
5761
hidden = True
5779
5762
5793
5776
5794
5777
5795
5778
class cmd_remove_branch(Command):
5796
__doc__ = """Remove a branch.
5779
"""Remove a branch.
5797
5780
5798
5781
This will remove the branch from the specified location but
5799
5782
will keep any working tree or repository in place.
5818
5801
5819
5802
5820
5803
class cmd_shelve(Command):
5821
__doc__ = """Temporarily set aside some changes from the current tree.
5804
"""Temporarily set aside some changes from the current tree.
5822
5805
5823
5806
Shelve allows you to temporarily put changes you've made "on the shelf",
5824
5807
ie. out of the way, until a later time when you can bring them back from
5845
5828
takes_args = ['file*']
5846
5829
5847
5830
takes_options = [
5848
'directory',
5849
5831
'revision',
5850
5832
Option('all', help='Shelve all changes.'),
5851
5833
'message',
5860
5842
_see_also = ['unshelve']
5861
5843
5862
5844
def run(self, revision=None, all=False, file_list=None, message=None,
5863
writer=None, list=False, destroy=False, directory=u'.'):
5845
writer=None, list=False, destroy=False):
5864
5846
if list:
5865
5847
return self.run_for_list()
5866
5848
from bzrlib.shelf_ui import Shelver
5868
5850
writer = bzrlib.option.diff_writer_registry.get()
5869
5851
try:
5870
5852
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5871
file_list, message, destroy=destroy, directory=directory)
5853
file_list, message, destroy=destroy)
5872
5854
try:
5873
5855
shelver.run()
5874
5856
finally:
5878
5860
5879
5861
def run_for_list(self):
5880
5862
tree = WorkingTree.open_containing('.')[0]
5881
self.add_cleanup(tree.lock_read().unlock)
5863
tree.lock_read()
5864
self.add_cleanup(tree.unlock)
5882
5865
manager = tree.get_shelf_manager()
5883
5866
shelves = manager.active_shelves()
5884
5867
if len(shelves) == 0:
5893
5876
5894
5877
5895
5878
class cmd_unshelve(Command):
5896
__doc__ = """Restore shelved changes.
5879
"""Restore shelved changes.
5897
5880
5898
5881
By default, the most recently shelved changes are restored. However if you
5899
5882
specify a shelf by id those changes will be restored instead. This works
5902
5885
5903
5886
takes_args = ['shelf_id?']
5904
5887
takes_options = [
5905
'directory',
5906
5888
RegistryOption.from_kwargs(
5907
5889
'action', help="The action to perform.",
5908
5890
enum_switch=False, value_switches=True,
5916
5898
]
5917
5899
_see_also = ['shelve']
5918
5900
5919
def run(self, shelf_id=None, action='apply', directory=u'.'):
5901
def run(self, shelf_id=None, action='apply'):
5920
5902
from bzrlib.shelf_ui import Unshelver
5921
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5903
unshelver = Unshelver.from_args(shelf_id, action)
5922
5904
try:
5923
5905
unshelver.run()
5924
5906
finally:
5926
5908
5927
5909
5928
5910
class cmd_clean_tree(Command):
5929
__doc__ = """Remove unwanted files from working tree.
5911
"""Remove unwanted files from working tree.
5930
5912
5931
5913
By default, only unknown files, not ignored files, are deleted. Versioned
5932
5914
files are never deleted.
5940
5922
5941
5923
To check what clean-tree will do, use --dry-run.
5942
5924
"""
5943
takes_options = ['directory',
5944
Option('ignored', help='Delete all ignored files.'),
5925
takes_options = [Option('ignored', help='Delete all ignored files.'),
5945
5926
Option('detritus', help='Delete conflict files, merge'
5946
5927
' backups, and failed selftest dirs.'),
5947
5928
Option('unknown',
5950
5931
' deleting them.'),
5951
5932
Option('force', help='Do not prompt before deleting.')]
5952
5933
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5953
force=False, directory=u'.'):
5934
force=False):
5954
5935
from bzrlib.clean_tree import clean_tree
5955
5936
if not (unknown or ignored or detritus):
5956
5937
unknown = True
5957
5938
if dry_run:
5958
5939
force = True
5959
clean_tree(directory, unknown=unknown, ignored=ignored,
5960
detritus=detritus, dry_run=dry_run, no_prompt=force)
5940
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5941
dry_run=dry_run, no_prompt=force)
5961
5942
5962
5943
5963
5944
class cmd_reference(Command):
5964
__doc__ = """list, view and set branch locations for nested trees.
5945
"""list, view and set branch locations for nested trees.
5965
5946
5966
5947
If no arguments are provided, lists the branch locations for nested trees.
5967
5948
If one argument is provided, display the branch location for that tree.
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0