75
76
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
79
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
80
def tree_files(file_list, default_branch=u'.', canonicalize=True,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
82
return internal_tree_files(file_list, default_branch, canonicalize,
88
86
def tree_files_for_add(file_list):
153
151
# XXX: Bad function name; should possibly also be a class method of
154
152
# WorkingTree rather than a function.
153
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
155
154
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
155
apply_view=True):
157
156
"""Convert command-line paths to a WorkingTree and relative paths.
158
Deprecated: use WorkingTree.open_containing_paths instead.
159
160
This is typically used for command-line processors that take one or
160
161
more filenames, and infer the workingtree that contains them.
172
173
:return: workingtree, [relative_paths]
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
175
return WorkingTree.open_containing_paths(
176
file_list, default_directory='.',
223
181
def _get_view_info_for_change_reporter(tree):
193
def _open_directory_or_containing_tree_or_branch(filename, directory):
194
"""Open the tree or branch containing the specified file, unless
195
the --directory option is used to specify a different branch."""
196
if directory is not None:
197
return (None, Branch.open(directory), filename)
198
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
235
201
# TODO: Make sure no commands unconditionally use the working directory as a
236
202
# branch. If a filename argument is used, the first of them should be used to
237
203
# specify the branch. (Perhaps this can be factored out into some kind of
286
252
To skip the display of pending merge information altogether, use
287
253
the no-pending option or specify a file/directory.
289
If a revision argument is given, the status is calculated against
290
that revision, or between two revisions if two are provided.
255
To compare the working directory to a specific revision, pass a
256
single revision to the revision argument.
258
To see which files have changed in a specific revision, or between
259
two revisions, pass a revision range to the revision argument.
260
This will produce the same results as calling 'bzr diff --summarize'.
293
263
# TODO: --no-recurse, --recurse options
315
285
raise errors.BzrCommandError('bzr status --revision takes exactly'
316
286
' one or two revision specifiers')
318
tree, relfile_list = tree_files(file_list)
288
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
319
289
# Avoid asking for specific files when that is not needed.
320
290
if relfile_list == ['']:
321
291
relfile_list = None
353
323
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
326
def run(self, revision_id=None, revision=None, directory=u'.'):
357
327
if revision_id is not None and revision is not None:
358
328
raise errors.BzrCommandError('You can only supply one of'
359
329
' revision_id or --revision')
360
330
if revision_id is None and revision is None:
361
331
raise errors.BzrCommandError('You must supply either'
362
332
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
333
b = WorkingTree.open_containing(directory)[0].branch
365
335
revisions = b.repository.revisions
366
336
if revisions is None:
504
474
if (working.has_changes()):
505
475
raise errors.UncommittedChanges(working)
476
if working.get_shelf_manager().last_shelf() is not None:
477
raise errors.ShelvedChanges(working)
507
479
if working.user_url != working.branch.user_url:
508
480
raise errors.BzrCommandError("You cannot remove the working tree"
530
502
wt = WorkingTree.open_containing(location)[0]
503
self.add_cleanup(wt.lock_read().unlock)
532
504
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
505
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
506
revid = wt.last_revision()
537
508
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
540
511
revno = ".".join(str(n) for n in revno_t)
542
513
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
514
self.add_cleanup(b.lock_read().unlock)
545
515
revno = b.revno()
546
516
self.cleanup_now()
547
517
self.outf.write(str(revno) + '\n')
554
524
takes_args = ['revision_info*']
555
525
takes_options = [
527
custom_help('directory',
558
528
help='Branch to examine, '
559
'rather than the one containing the working directory.',
529
'rather than the one containing the working directory.'),
563
530
Option('tree', help='Show revno of working tree'),
571
538
wt = WorkingTree.open_containing(directory)[0]
574
self.add_cleanup(wt.unlock)
540
self.add_cleanup(wt.lock_read().unlock)
575
541
except (errors.NoWorkingTree, errors.NotLocalUrl):
577
543
b = Branch.open_containing(directory)[0]
579
self.add_cleanup(b.unlock)
544
self.add_cleanup(b.lock_read().unlock)
580
545
revision_ids = []
581
546
if revision is not None:
582
547
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
681
646
should_print=(not is_quiet()))
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
649
self.add_cleanup(base_tree.lock_read().unlock)
686
650
tree, file_list = tree_files_for_add(file_list)
687
651
added, ignored = tree.smart_add(file_list, not
688
652
no_recurse, action=action, save=not dry_run)
759
723
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
761
725
revision = _get_one_revision('inventory', revision)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
726
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
727
self.add_cleanup(work_tree.lock_read().unlock)
765
728
if revision is not None:
766
729
tree = revision.as_tree(work_tree.branch)
768
731
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
732
self.add_cleanup(tree.lock_read().unlock)
833
795
if len(names_list) < 2:
834
796
raise errors.BzrCommandError("missing file argument")
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
797
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
798
self.add_cleanup(tree.lock_tree_write().unlock)
838
799
self._run(tree, names_list, rel_names, after)
840
801
def run_auto(self, names_list, after, dry_run):
845
806
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
808
work_tree, file_list = WorkingTree.open_containing_paths(
809
names_list, default_directory='.')
810
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
811
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
813
def _run(self, tree, names_list, rel_names, after):
960
921
takes_options = ['remember', 'overwrite', 'revision',
961
922
custom_help('verbose',
962
923
help='Show logs of pulled revisions.'),
924
custom_help('directory',
964
925
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
926
'rather than the one containing the working directory.'),
970
928
help="Perform a local pull in a bound "
971
929
"branch. Local pulls are not applied to "
972
930
"the master branch."
933
help="Show base revision text in conflicts.")
975
935
takes_args = ['location?']
976
936
encoding_type = 'replace'
978
938
def run(self, location=None, remember=False, overwrite=False,
979
939
revision=None, verbose=False,
980
directory=None, local=False):
940
directory=None, local=False,
981
942
# FIXME: too much stuff is in the command class
982
943
revision_id = None
987
948
tree_to = WorkingTree.open_containing(directory)[0]
988
949
branch_to = tree_to.branch
990
self.add_cleanup(tree_to.unlock)
950
self.add_cleanup(tree_to.lock_write().unlock)
991
951
except errors.NoWorkingTree:
993
953
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
954
self.add_cleanup(branch_to.lock_write().unlock)
956
if tree_to is None and show_base:
957
raise errors.BzrCommandError("Need working tree for --show-base.")
997
959
if local and not branch_to.get_bound_location():
998
960
raise errors.LocalRequiresBoundBranch()
1030
992
branch_from = Branch.open(location,
1031
993
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
994
self.add_cleanup(branch_from.lock_read().unlock)
1035
996
if branch_to.get_parent() is None or remember:
1036
997
branch_to.set_parent(branch_from.base)
1045
1006
view_info=view_info)
1046
1007
result = tree_to.pull(
1047
1008
branch_from, overwrite, revision_id, change_reporter,
1048
possible_transports=possible_transports, local=local)
1009
possible_transports=possible_transports, local=local,
1010
show_base=show_base)
1050
1012
result = branch_to.pull(
1051
1013
branch_from, overwrite, revision_id, local=local)
1088
1050
Option('create-prefix',
1089
1051
help='Create the path leading up to the branch '
1090
1052
'if it does not already exist.'),
1053
custom_help('directory',
1092
1054
help='Branch to push from, '
1093
'rather than the one containing the working directory.',
1055
'rather than the one containing the working directory.'),
1097
1056
Option('use-existing-dir',
1098
1057
help='By default push will fail if the target'
1099
1058
' directory exists, but does not already'
1110
1069
Option('strict',
1111
1070
help='Refuse to push if there are uncommitted changes in'
1112
1071
' the working tree, --no-strict disables the check.'),
1073
help="Don't populate the working tree, even for protocols"
1074
" that support it."),
1114
1076
takes_args = ['location?']
1115
1077
encoding_type = 'replace'
1117
1079
def run(self, location=None, remember=False, overwrite=False,
1118
1080
create_prefix=False, verbose=False, revision=None,
1119
1081
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1082
stacked=False, strict=None, no_tree=False):
1121
1083
from bzrlib.push import _show_push_branch
1123
1085
if directory is None:
1169
1131
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1132
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1133
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1134
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1137
class cmd_branch(Command):
1189
1151
_see_also = ['checkout']
1190
1152
takes_args = ['from_location', 'to_location?']
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1153
takes_options = ['revision',
1154
Option('hardlink', help='Hard-link working tree files where possible.'),
1155
Option('files-from', type=str,
1156
help="Get file contents from this tree."),
1193
1157
Option('no-tree',
1194
1158
help="Create a branch without a working-tree."),
1195
1159
Option('switch',
1214
1178
def run(self, from_location, to_location=None, revision=None,
1215
1179
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1180
use_existing_dir=False, switch=False, bind=False,
1217
1182
from bzrlib import switch as _mod_switch
1218
1183
from bzrlib.tag import _merge_tags_if_possible
1219
1184
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1186
if not (hardlink or files_from):
1187
# accelerator_tree is usually slower because you have to read N
1188
# files (no readahead, lots of seeks, etc), but allow the user to
1189
# explicitly request it
1190
accelerator_tree = None
1191
if files_from is not None and files_from != from_location:
1192
accelerator_tree = WorkingTree.open(files_from)
1221
1193
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1194
self.add_cleanup(br_from.lock_read().unlock)
1224
1195
if revision is not None:
1225
1196
revision_id = revision.as_revision_id(br_from)
1331
1302
to_location = branch_location
1332
1303
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1333
1304
branch_location)
1305
if not (hardlink or files_from):
1306
# accelerator_tree is usually slower because you have to read N
1307
# files (no readahead, lots of seeks, etc), but allow the user to
1308
# explicitly request it
1309
accelerator_tree = None
1334
1310
revision = _get_one_revision('checkout', revision)
1335
if files_from is not None:
1311
if files_from is not None and files_from != branch_location:
1336
1312
accelerator_tree = WorkingTree.open(files_from)
1337
1313
if revision is not None:
1338
1314
revision_id = revision.as_revision_id(source)
1366
1342
@display_command
1367
1343
def run(self, dir=u'.'):
1368
1344
tree = WorkingTree.open_containing(dir)[0]
1370
self.add_cleanup(tree.unlock)
1345
self.add_cleanup(tree.lock_read().unlock)
1371
1346
new_inv = tree.inventory
1372
1347
old_tree = tree.basis_tree()
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1348
self.add_cleanup(old_tree.lock_read().unlock)
1375
1349
old_inv = old_tree.inventory
1377
1351
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1396
1370
If you want to discard your local changes, you can just do a
1397
1371
'bzr revert' instead of 'bzr commit' after the update.
1373
If you want to restore a file that has been removed locally, use
1374
'bzr revert' instead of 'bzr update'.
1399
1376
If the tree's branch is bound to a master branch, it will also update
1400
1377
the branch from the master.
1403
1380
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1381
takes_args = ['dir?']
1405
takes_options = ['revision']
1382
takes_options = ['revision',
1384
help="Show base revision text in conflicts."),
1406
1386
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1388
def run(self, dir='.', revision=None, show_base=None):
1409
1389
if revision is not None and len(revision) != 1:
1410
1390
raise errors.BzrCommandError(
1411
1391
"bzr update --revision takes exactly one revision")
1415
1395
master = branch.get_master_branch(
1416
1396
possible_transports=possible_transports)
1417
1397
if master is not None:
1419
1398
branch_location = master.base
1401
branch_location = tree.branch.base
1421
1402
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1403
self.add_cleanup(tree.unlock)
1424
1404
# get rid of the final '/' and be ready for display
1425
1405
branch_location = urlutils.unescape_for_display(
1451
1431
change_reporter,
1452
1432
possible_transports=possible_transports,
1453
1433
revision=revision_id,
1435
show_base=show_base)
1455
1436
except errors.NoSuchRevision, e:
1456
1437
raise errors.BzrCommandError(
1457
1438
"branch has no revision %s\n"
1519
1500
class cmd_remove(Command):
1520
1501
__doc__ = """Remove files or directories.
1522
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
them if they can easily be recovered using revert. If no options or
1524
parameters are given bzr will scan for files that are being tracked by bzr
1525
but missing in your tree and stop tracking them for you.
1503
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1504
delete them if they can easily be recovered using revert otherwise they
1505
will be backed up (adding an extention of the form .~#~). If no options or
1506
parameters are given Bazaar will scan for files that are being tracked by
1507
Bazaar but missing in your tree and stop tracking them for you.
1527
1509
takes_args = ['file*']
1528
1510
takes_options = ['verbose',
1530
1512
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1513
'The file deletion mode to be used.',
1532
1514
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1515
safe='Backup changed files (default).',
1535
1516
keep='Delete from bzr but leave the working copy.',
1517
no_backup='Don\'t backup changed files.',
1536
1518
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1519
'recovered and even if they are non-empty directories. '
1520
'(deprecated, use no-backup)')]
1538
1521
aliases = ['rm', 'del']
1539
1522
encoding_type = 'replace'
1541
1524
def run(self, file_list, verbose=False, new=False,
1542
1525
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1526
if file_deletion_strategy == 'force':
1527
note("(The --force option is deprecated, rather use --no-backup "
1529
file_deletion_strategy = 'no-backup'
1531
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1533
if file_list is not None:
1546
1534
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1536
self.add_cleanup(tree.lock_write().unlock)
1550
1537
# Heuristics should probably all move into tree.remove_smart or
1567
1554
file_deletion_strategy = 'keep'
1568
1555
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1569
1556
keep_files=file_deletion_strategy=='keep',
1570
force=file_deletion_strategy=='force')
1557
force=(file_deletion_strategy=='no-backup'))
1573
1560
class cmd_file_id(Command):
1636
1623
_see_also = ['check']
1637
1624
takes_args = ['branch?']
1626
Option('canonicalize-chks',
1627
help='Make sure CHKs are in canonical form (repairs '
1639
def run(self, branch="."):
1632
def run(self, branch=".", canonicalize_chks=False):
1640
1633
from bzrlib.reconcile import reconcile
1641
1634
dir = bzrdir.BzrDir.open(branch)
1635
reconcile(dir, canonicalize_chks=canonicalize_chks)
1645
1638
class cmd_revision_history(Command):
1723
1716
Option('append-revisions-only',
1724
1717
help='Never change revnos or the existing log.'
1725
' Append revisions to it only.')
1718
' Append revisions to it only.'),
1720
'Create a branch without a working tree.')
1727
1722
def run(self, location=None, format=None, append_revisions_only=False,
1728
create_prefix=False):
1723
create_prefix=False, no_tree=False):
1729
1724
if format is None:
1730
1725
format = bzrdir.format_registry.make_bzrdir('default')
1731
1726
if location is None:
1754
1749
except errors.NotBranchError:
1755
1750
# really a NotBzrDir error...
1756
1751
create_branch = bzrdir.BzrDir.create_branch_convenience
1753
force_new_tree = False
1755
force_new_tree = None
1757
1756
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
1757
possible_transports=[to_transport],
1758
force_new_tree=force_new_tree)
1759
1759
a_bzrdir = branch.bzrdir
1761
1761
from bzrlib.transport.local import LocalTransport
1765
1765
raise errors.BranchExistsWithoutWorkingTree(location)
1766
1766
raise errors.AlreadyBranchError(location)
1767
1767
branch = a_bzrdir.create_branch()
1768
a_bzrdir.create_workingtree()
1769
a_bzrdir.create_workingtree()
1769
1770
if append_revisions_only:
1771
1772
branch.set_append_revisions_only(True)
1985
1990
old_branch, new_branch,
1986
1991
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
1992
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1993
# GNU diff on Windows uses ANSI encoding for filenames
1994
path_encoding = osutils.get_diff_header_encoding()
1988
1995
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1996
specific_files=specific_files,
1990
1997
external_diff_options=diff_options,
1991
1998
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1999
extra_trees=extra_trees,
2000
path_encoding=path_encoding,
1993
2002
format_cls=format)
2003
2012
# level of effort but possibly much less IO. (Or possibly not,
2004
2013
# if the directories are very large...)
2005
2014
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
2015
takes_options = ['directory', 'show-ids']
2008
2017
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2018
def run(self, show_ids=False, directory=u'.'):
2019
tree = WorkingTree.open_containing(directory)[0]
2020
self.add_cleanup(tree.lock_read().unlock)
2013
2021
old = tree.basis_tree()
2015
self.add_cleanup(old.unlock)
2022
self.add_cleanup(old.lock_read().unlock)
2016
2023
for path, ie in old.inventory.iter_entries():
2017
2024
if not tree.has_id(ie.file_id):
2018
2025
self.outf.write(path)
2030
2037
_see_also = ['status', 'ls']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2038
takes_options = ['directory', 'null']
2037
2040
@display_command
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2041
def run(self, null=False, directory=u'.'):
2042
tree = WorkingTree.open_containing(directory)[0]
2040
2043
td = tree.changes_from(tree.basis_tree())
2041
2044
for path, id, kind, text_modified, meta_modified in td.modified:
2053
2056
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2057
takes_options = ['directory', 'null']
2060
2059
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2060
def run(self, null=False, directory=u'.'):
2061
wt = WorkingTree.open_containing(directory)[0]
2062
self.add_cleanup(wt.lock_read().unlock)
2065
2063
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2064
self.add_cleanup(basis.lock_read().unlock)
2068
2065
basis_inv = basis.inventory
2069
2066
inv = wt.inventory
2070
2067
for file_id in inv:
2073
2070
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2072
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2073
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2076
self.outf.write(path + '\0')
2279
2276
help='Show just the specified revision.'
2280
2277
' See also "help revisionspec".'),
2279
RegistryOption('authors',
2280
'What names to list as authors - first, all or committer.',
2282
lazy_registry=('bzrlib.log', 'author_list_registry'),
2282
2284
Option('levels',
2283
2285
short_name='n',
2284
2286
help='Number of levels to display - 0 for all, 1 for flat.',
2353
2356
# find the file ids to log and check for directory filtering
2354
2357
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2358
revision, file_list, self.add_cleanup)
2357
2359
for relpath, file_id, kind in file_info_list:
2358
2360
if file_id is None:
2359
2361
raise errors.BzrCommandError(
2378
2380
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
2381
b = dir.open_branch()
2381
self.add_cleanup(b.unlock)
2382
self.add_cleanup(b.lock_read().unlock)
2382
2383
rev1, rev2 = _get_revision_range(revision, b, self.name())
2384
2385
# Decide on the type of delta & diff filtering to use
2404
2405
show_timezone=timezone,
2405
2406
delta_format=get_verbosity_level(),
2407
show_advice=levels is None)
2408
show_advice=levels is None,
2409
author_list_handler=authors)
2409
2411
# Choose the algorithm for doing the logging. It's annoying
2410
2412
# having multiple code paths like this but necessary until
2508
2510
tree, relpath = WorkingTree.open_containing(filename)
2509
2511
file_id = tree.path2id(relpath)
2510
2512
b = tree.branch
2512
self.add_cleanup(b.unlock)
2513
self.add_cleanup(b.lock_read().unlock)
2513
2514
touching_revs = log.find_touching_revisions(b, file_id)
2514
2515
for revno, revision_id, what in touching_revs:
2515
2516
self.outf.write("%6d %s\n" % (revno, what))
2528
2529
help='Recurse into subdirectories.'),
2529
2530
Option('from-root',
2530
2531
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2532
Option('unknown', short_name='u',
2533
help='Print unknown files.'),
2532
2534
Option('versioned', help='Print versioned files.',
2533
2535
short_name='V'),
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2536
Option('ignored', short_name='i',
2537
help='Print ignored files.'),
2538
Option('kind', short_name='k',
2539
2539
help='List entries of a particular kind: file, directory, symlink.',
2543
2545
@display_command
2544
2546
def run(self, revision=None, verbose=False,
2545
2547
recursive=False, from_root=False,
2546
2548
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2549
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2551
if kind and kind not in ('file', 'directory', 'symlink'):
2550
2552
raise errors.BzrCommandError('invalid kind specified')
2562
2564
raise errors.BzrCommandError('cannot specify both --from-root'
2565
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2567
tree, branch, relpath = \
2568
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2568
2570
# Calculate the prefix to use
2584
2586
view_str = views.view_display_str(view_files)
2585
2587
note("Ignoring files outside view. View is %s" % view_str)
2588
self.add_cleanup(tree.unlock)
2589
self.add_cleanup(tree.lock_read().unlock)
2589
2590
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
2591
from_dir=relpath, recursive=recursive):
2591
2592
# Apply additional masking
2640
2641
_see_also = ['ls']
2642
takes_options = ['directory']
2642
2644
@display_command
2644
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2645
def run(self, directory=u'.'):
2646
for f in WorkingTree.open_containing(directory)[0].unknowns():
2645
2647
self.outf.write(osutils.quotefn(f) + '\n')
2713
2715
_see_also = ['status', 'ignored', 'patterns']
2714
2716
takes_args = ['name_pattern*']
2717
takes_options = ['directory',
2716
2718
Option('default-rules',
2717
2719
help='Display the default ignore rules that bzr uses.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2722
def run(self, name_pattern_list=None, default_rules=None,
2721
2724
from bzrlib import ignores
2722
2725
if default_rules is not None:
2723
2726
# dump the default rules and exit
2729
2732
"NAME_PATTERN or --default-rules.")
2730
2733
name_pattern_list = [globbing.normalize_pattern(p)
2731
2734
for p in name_pattern_list]
2736
for p in name_pattern_list:
2737
if not globbing.Globster.is_pattern_valid(p):
2738
bad_patterns += ('\n %s' % p)
2740
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2741
ui.ui_factory.show_error(msg)
2742
raise errors.InvalidPattern('')
2732
2743
for name_pattern in name_pattern_list:
2733
2744
if (name_pattern[0] == '/' or
2734
2745
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
2746
raise errors.BzrCommandError(
2736
2747
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
2748
tree, relpath = WorkingTree.open_containing(directory)
2738
2749
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
2750
ignored = globbing.Globster(name_pattern_list)
2752
self.add_cleanup(tree.lock_read().unlock)
2742
2753
for entry in tree.list_files():
2744
2755
if id is not None:
2745
2756
filename = entry[0]
2746
2757
if ignored.match(filename):
2747
2758
matches.append(filename)
2749
2759
if len(matches) > 0:
2750
2760
self.outf.write("Warning: the following files are version controlled and"
2751
2761
" match your ignore pattern:\n%s"
2767
2777
encoding_type = 'replace'
2768
2778
_see_also = ['ignore', 'ls']
2779
takes_options = ['directory']
2770
2781
@display_command
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
2782
def run(self, directory=u'.'):
2783
tree = WorkingTree.open_containing(directory)[0]
2784
self.add_cleanup(tree.lock_read().unlock)
2775
2785
for path, file_class, kind, file_id, entry in tree.list_files():
2776
2786
if file_class != 'I':
2790
2800
takes_args = ['revno']
2801
takes_options = ['directory']
2792
2803
@display_command
2793
def run(self, revno):
2804
def run(self, revno, directory=u'.'):
2795
2806
revno = int(revno)
2796
2807
except ValueError:
2797
2808
raise errors.BzrCommandError("not a valid revision-number: %r"
2799
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2810
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2800
2811
self.outf.write("%s\n" % revid)
2829
2840
================= =========================
2831
2842
takes_args = ['dest', 'branch_or_subdir?']
2843
takes_options = ['directory',
2833
2844
Option('format',
2834
2845
help="Type of file to export to.",
2844
2855
'revision in which it was changed.'),
2846
2857
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2858
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2848
2859
from bzrlib.export import export
2850
2861
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
2862
tree = WorkingTree.open_containing(directory)[0]
2852
2863
b = tree.branch
2875
2886
_see_also = ['ls']
2887
takes_options = ['directory',
2877
2888
Option('name-from-revision', help='The path name in the old tree.'),
2878
2889
Option('filters', help='Apply content filters to display the '
2879
2890
'convenience form.'),
2885
2896
@display_command
2886
2897
def run(self, filename, revision=None, name_from_revision=False,
2898
filters=False, directory=None):
2888
2899
if revision is not None and len(revision) != 1:
2889
2900
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
2901
" one revision specifier")
2891
2902
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
2903
_open_directory_or_containing_tree_or_branch(filename, directory)
2904
self.add_cleanup(branch.lock_read().unlock)
2895
2905
return self._run(tree, branch, relpath, filename, revision,
2896
2906
name_from_revision, filters)
2900
2910
if tree is None:
2901
2911
tree = b.basis_tree()
2902
2912
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2913
self.add_cleanup(rev_tree.lock_read().unlock)
2906
2915
old_file_id = rev_tree.path2id(relpath)
3129
3138
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3140
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3141
if selected_list == ['']:
3133
3142
# workaround - commit of root of tree should be exactly the same
3134
3143
# as just default commit in that tree, and succeed even though
3169
3178
def get_message(commit_obj):
3170
3179
"""Callback to get commit message"""
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3183
my_message = f.read().decode(osutils.get_user_encoding())
3174
3186
elif message is not None:
3175
3187
my_message = message
3205
3217
reporter=None, verbose=verbose, revprops=properties,
3206
3218
authors=author, timestamp=commit_stamp,
3207
3219
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3220
exclude=tree.safe_relpath_files(exclude))
3209
3221
except PointlessCommit:
3210
3222
raise errors.BzrCommandError("No changes to commit."
3211
3223
" Use --unchanged to commit anyhow.")
3331
3343
bzr whoami "Frank Chu <fchu@example.com>"
3333
takes_options = [ Option('email',
3345
takes_options = [ 'directory',
3334
3347
help='Display email address only.'),
3335
3348
Option('branch',
3336
3349
help='Set identity for the current branch instead of '
3340
3353
encoding_type = 'replace'
3342
3355
@display_command
3343
def run(self, email=False, branch=False, name=None):
3356
def run(self, email=False, branch=False, name=None, directory=None):
3344
3357
if name is None:
3345
# use branch if we're inside one; otherwise global config
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3358
if directory is None:
3359
# use branch if we're inside one; otherwise global config
3361
c = Branch.open_containing(u'.')[0].get_config()
3362
except errors.NotBranchError:
3363
c = _mod_config.GlobalConfig()
3365
c = Branch.open(directory).get_config()
3351
3367
self.outf.write(c.user_email() + '\n')
3356
3372
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3374
_mod_config.extract_email_address(name)
3359
3375
except errors.NoEmailInUsername, e:
3360
3376
warning('"%s" does not seem to contain an email address. '
3361
3377
'This is allowed, but not recommended.', name)
3363
3379
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3381
if directory is None:
3382
c = Branch.open_containing(u'.')[0].get_config()
3384
c = Branch.open(directory).get_config()
3367
c = config.GlobalConfig()
3386
c = _mod_config.GlobalConfig()
3368
3387
c.set_user_option('email', name)
3381
3400
_see_also = ['info']
3382
3401
takes_args = ['nickname?']
3383
def run(self, nickname=None):
3384
branch = Branch.open_containing(u'.')[0]
3402
takes_options = ['directory']
3403
def run(self, nickname=None, directory=u'.'):
3404
branch = Branch.open_containing(directory)[0]
3385
3405
if nickname is None:
3386
3406
self.printme(branch)
3436
3456
'bzr alias --remove expects an alias to remove.')
3437
3457
# If alias is not found, print something like:
3438
3458
# unalias: foo: not found
3439
c = config.GlobalConfig()
3459
c = _mod_config.GlobalConfig()
3440
3460
c.unset_alias(alias_name)
3442
3462
@display_command
3443
3463
def print_aliases(self):
3444
3464
"""Print out the defined aliases in a similar format to bash."""
3445
aliases = config.GlobalConfig().get_aliases()
3465
aliases = _mod_config.GlobalConfig().get_aliases()
3446
3466
for key, value in sorted(aliases.iteritems()):
3447
3467
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3459
3479
def set_alias(self, alias_name, alias_command):
3460
3480
"""Save the alias in the global config."""
3461
c = config.GlobalConfig()
3481
c = _mod_config.GlobalConfig()
3462
3482
c.set_alias(alias_name, alias_command)
3499
3519
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
3500
3520
into a pdb postmortem session.
3522
The --coverage=DIRNAME global option produces a report with covered code
3503
3526
Run only tests relating to 'ignore'::
3537
3560
'throughout the test suite.',
3538
3561
type=get_transport_type),
3539
3562
Option('benchmark',
3540
help='Run the benchmarks rather than selftests.'),
3563
help='Run the benchmarks rather than selftests.',
3541
3565
Option('lsprof-timed',
3542
3566
help='Generate lsprof output for benchmarked'
3543
3567
' sections of code.'),
3544
3568
Option('lsprof-tests',
3545
3569
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3549
3570
Option('first',
3550
3571
help='Run all tests, but run specified tests first.',
3551
3572
short_name='f',
3586
3607
def run(self, testspecs_list=None, verbose=False, one=False,
3587
3608
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
3610
first=False, list_only=False,
3590
3611
randomize=None, exclude=None, strict=False,
3591
3612
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
3613
parallel=None, lsprof_tests=False):
3593
from bzrlib.tests import selftest
3594
import bzrlib.benchmarks as benchmarks
3595
from bzrlib.benchmarks import tree_creator
3597
# Make deprecation warnings visible, unless -Werror is set
3598
symbol_versioning.activate_deprecation_warnings(override=False)
3600
if cache_dir is not None:
3601
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3614
from bzrlib import tests
3602
3616
if testspecs_list is not None:
3603
3617
pattern = '|'.join(testspecs_list)
3612
3626
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3627
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3628
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3629
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3630
# following code can be deleted when it's sufficiently deployed
3631
# -- vila/mgz 20100514
3632
if (sys.platform == "win32"
3633
and getattr(sys.stdout, 'fileno', None) is not None):
3617
3635
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
3637
self.additional_selftest_args.setdefault(
3620
3638
'suite_decorators', []).append(parallel)
3622
test_suite_factory = benchmarks.test_suite
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
verbose = not is_quiet()
3625
# TODO: should possibly lock the history file...
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3629
test_suite_factory = None
3640
raise errors.BzrCommandError(
3641
"--benchmark is no longer supported from bzr 2.2; "
3642
"use bzr-usertest instead")
3643
test_suite_factory = None
3631
3644
selftest_kwargs = {"verbose": verbose,
3632
3645
"pattern": pattern,
3633
3646
"stop_on_failure": one,
3635
3648
"test_suite_factory": test_suite_factory,
3636
3649
"lsprof_timed": lsprof_timed,
3637
3650
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
3651
"matching_tests_first": first,
3640
3652
"list_only": list_only,
3641
3653
"random_seed": randomize,
3646
3658
"starting_with": starting_with
3648
3660
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3662
# Make deprecation warnings visible, unless -Werror is set
3663
cleanup = symbol_versioning.activate_deprecation_warnings(
3666
result = tests.selftest(**selftest_kwargs)
3650
3669
return int(not result)
3691
3710
branch1 = Branch.open_containing(branch)[0]
3692
3711
branch2 = Branch.open_containing(other)[0]
3694
self.add_cleanup(branch1.unlock)
3696
self.add_cleanup(branch2.unlock)
3712
self.add_cleanup(branch1.lock_read().unlock)
3713
self.add_cleanup(branch2.lock_read().unlock)
3697
3714
last1 = ensure_null(branch1.last_revision())
3698
3715
last2 = ensure_null(branch2.last_revision())
3793
3810
' completely merged into the source, pull from the'
3794
3811
' source rather than merging. When this happens,'
3795
3812
' you do not need to commit the result.'),
3813
custom_help('directory',
3797
3814
help='Branch to merge into, '
3798
'rather than the one containing the working directory.',
3815
'rather than the one containing the working directory.'),
3802
3816
Option('preview', help='Instead of merging, show a diff of the'
3804
3818
Option('interactive', help='Select changes interactively.',
3837
3851
unversioned_filter=tree.is_ignored, view_info=view_info)
3838
3852
pb = ui.ui_factory.nested_progress_bar()
3839
3853
self.add_cleanup(pb.finished)
3841
self.add_cleanup(tree.unlock)
3854
self.add_cleanup(tree.lock_write().unlock)
3842
3855
if location is not None:
3844
3857
mergeable = bundle.read_mergeable_from_url(location,
3905
3918
def _do_preview(self, merger):
3906
3919
from bzrlib.diff import show_diff_trees
3907
3920
result_tree = self._get_preview(merger)
3921
path_encoding = osutils.get_diff_header_encoding()
3908
3922
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
3923
old_label='', new_label='',
3924
path_encoding=path_encoding)
3911
3926
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
3927
merger.change_reporter = change_reporter
4099
4114
from bzrlib.conflicts import restore
4100
4115
if merge_type is None:
4101
4116
merge_type = _mod_merge.Merge3Merger
4102
tree, file_list = tree_files(file_list)
4104
self.add_cleanup(tree.unlock)
4117
tree, file_list = WorkingTree.open_containing_paths(file_list)
4118
self.add_cleanup(tree.lock_write().unlock)
4105
4119
parents = tree.get_parent_ids()
4106
4120
if len(parents) != 2:
4107
4121
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4217
4231
def run(self, revision=None, no_backup=False, file_list=None,
4218
4232
forget_merges=None):
4219
tree, file_list = tree_files(file_list)
4220
tree.lock_tree_write()
4221
self.add_cleanup(tree.unlock)
4233
tree, file_list = WorkingTree.open_containing_paths(file_list)
4234
self.add_cleanup(tree.lock_tree_write().unlock)
4222
4235
if forget_merges:
4223
4236
tree.set_parent_ids(tree.get_parent_ids()[:1])
4313
4326
_see_also = ['merge', 'pull']
4314
4327
takes_args = ['other_branch?']
4315
4328
takes_options = [
4316
4330
Option('reverse', 'Reverse the order of revisions.'),
4317
4331
Option('mine-only',
4318
4332
'Display changes in the local branch only.'),
4340
4354
theirs_only=False,
4341
4355
log_format=None, long=False, short=False, line=False,
4342
4356
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4357
include_merges=False, revision=None, my_revision=None,
4344
4359
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4360
def message(s):
4346
4361
if not is_quiet():
4359
4374
elif theirs_only:
4360
4375
restrict = 'remote'
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4377
local_branch = Branch.open_containing(directory)[0]
4378
self.add_cleanup(local_branch.lock_read().unlock)
4366
4380
parent = local_branch.get_parent()
4367
4381
if other_branch is None:
4378
4392
if remote_branch.base == local_branch.base:
4379
4393
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4395
self.add_cleanup(remote_branch.lock_read().unlock)
4384
4397
local_revid_range = _revision_range_to_revid_range(
4385
4398
_get_revision_range(my_revision, local_branch,
4440
4453
message("Branches are up to date.\n")
4441
4454
self.cleanup_now()
4442
4455
if not status_code and parent is None and other_branch is not None:
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4456
self.add_cleanup(local_branch.lock_write().unlock)
4445
4457
# handle race conditions - a parent might be set while we run.
4446
4458
if local_branch.get_parent() is None:
4447
4459
local_branch.set_parent(remote_branch.base)
4578
4589
Option('long', help='Show commit date in annotations.'),
4582
4594
encoding_type = 'exact'
4584
4596
@display_command
4585
4597
def run(self, filename, all=False, long=False, revision=None,
4598
show_ids=False, directory=None):
4587
4599
from bzrlib.annotate import annotate_file, annotate_file_tree
4588
4600
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4601
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
4602
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4603
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4605
self.add_cleanup(branch.lock_read().unlock)
4596
4606
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4607
self.add_cleanup(tree.lock_read().unlock)
4599
4608
if wt is not None:
4600
4609
file_id = wt.path2id(relpath)
4620
4629
hidden = True # is this right ?
4621
4630
takes_args = ['revision_id*']
4622
takes_options = ['revision']
4631
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
4633
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
4634
if revision_id_list is not None and revision is not None:
4626
4635
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4627
4636
if revision_id_list is None and revision is None:
4628
4637
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
4638
b = WorkingTree.open_containing(directory)[0].branch
4639
self.add_cleanup(b.lock_write().unlock)
4632
4640
return self._run(b, revision_id_list, revision)
4634
4642
def _run(self, b, revision_id_list, revision):
4694
4702
_see_also = ['checkouts', 'unbind']
4695
4703
takes_args = ['location?']
4704
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4706
def run(self, location=None, directory=u'.'):
4707
b, relpath = Branch.open_containing(directory)
4700
4708
if location is None:
4702
4710
location = b.get_old_bound_location()
4730
4738
_see_also = ['checkouts', 'bind']
4731
4739
takes_args = []
4740
takes_options = ['directory']
4735
b, relpath = Branch.open_containing(u'.')
4742
def run(self, directory=u'.'):
4743
b, relpath = Branch.open_containing(directory)
4736
4744
if not b.unbind():
4737
4745
raise errors.BzrCommandError('Local branch is not bound')
4784
4792
b = control.open_branch()
4786
4794
if tree is not None:
4788
self.add_cleanup(tree.unlock)
4795
self.add_cleanup(tree.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4797
self.add_cleanup(b.lock_write().unlock)
4792
4798
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4794
4800
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4833
4839
self.outf.write('The above revision(s) will be removed.\n')
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
4842
if not ui.ui_factory.confirm_action(
4843
'Uncommit these revisions',
4844
'bzrlib.builtins.uncommit',
4846
self.outf.write('Canceled\n')
4840
4849
mutter('Uncommitting from {%s} to {%s}',
4848
4857
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4858
__doc__ = """Break a dead lock.
4860
This command breaks a lock on a repository, branch, working directory or
4851
4863
CAUTION: Locks should only be broken when you are sure that the process
4852
4864
holding the lock has been stopped.
4859
4871
bzr break-lock bzr+ssh://example.com/bzr/foo
4872
bzr break-lock --conf ~/.bazaar
4861
4875
takes_args = ['location?']
4878
help='LOCATION is the directory where the config lock is.'),
4880
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
4883
def run(self, location=None, config=False, force=False):
4864
4884
if location is None:
4865
4885
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
4887
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
4889
{'bzrlib.lockdir.break': True})
4891
conf = _mod_config.LockableConfig(file_name=location)
4894
control, relpath = bzrdir.BzrDir.open_containing(location)
4896
control.break_lock()
4897
except NotImplementedError:
4873
4901
class cmd_wait_until_signalled(Command):
4902
4930
'result in a dynamically allocated port. The default port '
4903
4931
'depends on the protocol.',
4906
help='Serve contents of this directory.',
4933
custom_help('directory',
4934
help='Serve contents of this directory.'),
4908
4935
Option('allow-writes',
4909
4936
help='By default the server is a readonly server. Supplying '
4910
4937
'--allow-writes enables write access to the contents of '
4938
4965
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4939
4966
protocol=None):
4940
from bzrlib.transport import get_transport, transport_server_registry
4967
from bzrlib import transport
4941
4968
if directory is None:
4942
4969
directory = os.getcwd()
4943
4970
if protocol is None:
4944
protocol = transport_server_registry.get()
4971
protocol = transport.transport_server_registry.get()
4945
4972
host, port = self.get_host_and_port(port)
4946
4973
url = urlutils.local_path_to_url(directory)
4947
4974
if not allow_writes:
4948
4975
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
4976
t = transport.get_transport(url)
4977
protocol(t, host, port, inet)
4953
4980
class cmd_join(Command):
4959
4986
not part of it. (Such trees can be produced by "bzr split", but also by
4960
4987
running "bzr branch" with the target inside a tree.)
4962
The result is a combined tree, with the subtree no longer an independant
4989
The result is a combined tree, with the subtree no longer an independent
4963
4990
part. This is marked as a merge of the subtree into the containing tree,
4964
4991
and all history is preserved.
5064
5092
encoding_type = 'exact'
5066
5094
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5067
sign=False, revision=None, mail_to=None, message=None):
5095
sign=False, revision=None, mail_to=None, message=None,
5068
5097
from bzrlib.revision import ensure_null, NULL_REVISION
5069
5098
include_patch, include_bundle = {
5070
5099
'plain': (False, False),
5071
5100
'diff': (True, False),
5072
5101
'bundle': (True, True),
5074
branch = Branch.open('.')
5103
branch = Branch.open(directory)
5075
5104
stored_submit_branch = branch.get_submit_branch()
5076
5105
if submit_branch is None:
5077
5106
submit_branch = stored_submit_branch
5162
5191
given, in which case it is sent to a file.
5164
5193
Mail is sent using your preferred mail program. This should be transparent
5165
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5194
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
5166
5195
If the preferred client can't be found (or used), your editor will be used.
5168
5197
To use a specific mail program, set the mail_client configuration option.
5339
5368
Option('delete',
5340
5369
help='Delete this tag rather than placing it.',
5343
help='Branch in which to place the tag.',
5371
custom_help('directory',
5372
help='Branch in which to place the tag.'),
5347
5373
Option('force',
5348
5374
help='Replace existing tags.',
5359
5385
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5386
self.add_cleanup(branch.lock_write().unlock)
5363
5388
if tag_name is None:
5364
5389
raise errors.BzrCommandError("No tag specified to delete.")
5365
5390
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5391
note('Deleted tag %s.' % tag_name)
5369
5394
if len(revision) != 1:
5381
5406
if (not force) and branch.tags.has_tag(tag_name):
5382
5407
raise errors.TagAlreadyExists(tag_name)
5383
5408
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5409
note('Created tag %s.' % tag_name)
5387
5412
class cmd_tags(Command):
5393
5418
_see_also = ['tag']
5394
5419
takes_options = [
5396
help='Branch whose tags should be displayed.',
5420
custom_help('directory',
5421
help='Branch whose tags should be displayed.'),
5400
5422
RegistryOption.from_kwargs('sort',
5401
5423
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5424
natural='Sort numeric substrings as numbers:'
5425
' suitable for version numbers. (default)',
5426
alpha='Sort tags lexicographically.',
5403
5427
time='Sort tags chronologically.',
5423
self.add_cleanup(branch.unlock)
5446
self.add_cleanup(branch.lock_read().unlock)
5425
5448
graph = branch.repository.get_graph()
5426
5449
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5428
5451
# only show revisions between revid1 and revid2 (inclusive)
5429
5452
tags = [(tag, revid) for tag, revid in tags if
5430
5453
graph.is_between(revid, revid1, revid2)]
5454
if sort == 'natural':
5455
def natural_sort_key(tag):
5456
return [f(s) for f,s in
5457
zip(itertools.cycle((unicode.lower,int)),
5458
re.split('([0-9]+)', tag[0]))]
5459
tags.sort(key=natural_sort_key)
5460
elif sort == 'alpha':
5433
5462
elif sort == 'time':
5434
5463
timestamps = {}
5575
5604
takes_args = ['to_location?']
5576
takes_options = [Option('force',
5605
takes_options = ['directory',
5577
5607
help='Switch even if local commits will be lost.'),
5579
5609
Option('create-branch', short_name='b',
5584
5614
def run(self, to_location=None, force=False, create_branch=False,
5615
revision=None, directory=u'.'):
5586
5616
from bzrlib import switch
5617
tree_location = directory
5588
5618
revision = _get_one_revision('switch', revision)
5589
5619
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
5620
if to_location is None:
5591
5621
if revision is None:
5592
5622
raise errors.BzrCommandError('You must supply either a'
5593
5623
' revision or a location')
5624
to_location = tree_location
5596
5626
branch = control_dir.open_branch()
5597
5627
had_explicit_nick = branch.get_config().has_explicit_nickname()
5735
tree, file_list = tree_files(file_list, apply_view=False)
5765
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
5767
current_view, view_dict = tree.views.get_view_info()
5737
5768
if name is None:
5738
5769
name = current_view
5886
5918
_see_also = ['unshelve']
5888
5920
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
5921
writer=None, list=False, destroy=False, directory=u'.'):
5891
5923
return self.run_for_list()
5892
5924
from bzrlib.shelf_ui import Shelver
5894
5926
writer = bzrlib.option.diff_writer_registry.get()
5896
5928
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
5929
file_list, message, destroy=destroy, directory=directory)
5905
5937
def run_for_list(self):
5906
5938
tree = WorkingTree.open_containing('.')[0]
5908
self.add_cleanup(tree.unlock)
5939
self.add_cleanup(tree.lock_read().unlock)
5909
5940
manager = tree.get_shelf_manager()
5910
5941
shelves = manager.active_shelves()
5911
5942
if len(shelves) == 0:
5930
5961
takes_args = ['shelf_id?']
5931
5962
takes_options = [
5932
5964
RegistryOption.from_kwargs(
5933
5965
'action', help="The action to perform.",
5934
5966
enum_switch=False, value_switches=True,
5943
5975
_see_also = ['shelve']
5945
def run(self, shelf_id=None, action='apply'):
5977
def run(self, shelf_id=None, action='apply', directory=u'.'):
5946
5978
from bzrlib.shelf_ui import Unshelver
5947
unshelver = Unshelver.from_args(shelf_id, action)
5979
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5949
5981
unshelver.run()
5967
5999
To check what clean-tree will do, use --dry-run.
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
6001
takes_options = ['directory',
6002
Option('ignored', help='Delete all ignored files.'),
5970
6003
Option('detritus', help='Delete conflict files, merge'
5971
6004
' backups, and failed selftest dirs.'),
5972
6005
Option('unknown',
5975
6008
' deleting them.'),
5976
6009
Option('force', help='Do not prompt before deleting.')]
5977
6010
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6011
force=False, directory=u'.'):
5979
6012
from bzrlib.clean_tree import clean_tree
5980
6013
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6017
clean_tree(directory, unknown=unknown, ignored=ignored,
6018
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6021
class cmd_reference(Command):
6037
6070
# be only called once.
6038
6071
for (name, aliases, module_name) in [
6039
6072
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6073
('cmd_config', [], 'bzrlib.config'),
6040
6074
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6075
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6076
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6077
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
6078
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6079
('cmd_test_script', [], 'bzrlib.tests.script'),
6046
6081
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
