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
315
281
raise errors.BzrCommandError('bzr status --revision takes exactly'
316
282
' one or two revision specifiers')
318
tree, relfile_list = tree_files(file_list)
284
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
319
285
# Avoid asking for specific files when that is not needed.
320
286
if relfile_list == ['']:
321
287
relfile_list = None
353
319
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
322
def run(self, revision_id=None, revision=None, directory=u'.'):
357
323
if revision_id is not None and revision is not None:
358
324
raise errors.BzrCommandError('You can only supply one of'
359
325
' revision_id or --revision')
360
326
if revision_id is None and revision is None:
361
327
raise errors.BzrCommandError('You must supply either'
362
328
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
329
b = WorkingTree.open_containing(directory)[0].branch
365
331
revisions = b.repository.revisions
366
332
if revisions is None:
504
470
if (working.has_changes()):
505
471
raise errors.UncommittedChanges(working)
472
if working.get_shelf_manager().last_shelf() is not None:
473
raise errors.ShelvedChanges(working)
507
475
if working.user_url != working.branch.user_url:
508
476
raise errors.BzrCommandError("You cannot remove the working tree"
530
498
wt = WorkingTree.open_containing(location)[0]
499
self.add_cleanup(wt.lock_read().unlock)
532
500
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
501
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
502
revid = wt.last_revision()
537
504
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
540
507
revno = ".".join(str(n) for n in revno_t)
542
509
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
510
self.add_cleanup(b.lock_read().unlock)
545
511
revno = b.revno()
546
512
self.cleanup_now()
547
513
self.outf.write(str(revno) + '\n')
554
520
takes_args = ['revision_info*']
555
521
takes_options = [
523
custom_help('directory',
558
524
help='Branch to examine, '
559
'rather than the one containing the working directory.',
525
'rather than the one containing the working directory.'),
563
526
Option('tree', help='Show revno of working tree'),
571
534
wt = WorkingTree.open_containing(directory)[0]
574
self.add_cleanup(wt.unlock)
536
self.add_cleanup(wt.lock_read().unlock)
575
537
except (errors.NoWorkingTree, errors.NotLocalUrl):
577
539
b = Branch.open_containing(directory)[0]
579
self.add_cleanup(b.unlock)
540
self.add_cleanup(b.lock_read().unlock)
580
541
revision_ids = []
581
542
if revision is not None:
582
543
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
681
642
should_print=(not is_quiet()))
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
645
self.add_cleanup(base_tree.lock_read().unlock)
686
646
tree, file_list = tree_files_for_add(file_list)
687
647
added, ignored = tree.smart_add(file_list, not
688
648
no_recurse, action=action, save=not dry_run)
759
719
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
761
721
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)
722
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
723
self.add_cleanup(work_tree.lock_read().unlock)
765
724
if revision is not None:
766
725
tree = revision.as_tree(work_tree.branch)
768
727
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
728
self.add_cleanup(tree.lock_read().unlock)
833
791
if len(names_list) < 2:
834
792
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)
793
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
794
self.add_cleanup(tree.lock_tree_write().unlock)
838
795
self._run(tree, names_list, rel_names, after)
840
797
def run_auto(self, names_list, after, dry_run):
845
802
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)
804
work_tree, file_list = WorkingTree.open_containing_paths(
805
names_list, default_directory='.')
806
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
807
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
809
def _run(self, tree, names_list, rel_names, after):
960
917
takes_options = ['remember', 'overwrite', 'revision',
961
918
custom_help('verbose',
962
919
help='Show logs of pulled revisions.'),
920
custom_help('directory',
964
921
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
922
'rather than the one containing the working directory.'),
970
924
help="Perform a local pull in a bound "
971
925
"branch. Local pulls are not applied to "
972
926
"the master branch."
929
help="Show base revision text in conflicts.")
975
931
takes_args = ['location?']
976
932
encoding_type = 'replace'
978
934
def run(self, location=None, remember=False, overwrite=False,
979
935
revision=None, verbose=False,
980
directory=None, local=False):
936
directory=None, local=False,
981
938
# FIXME: too much stuff is in the command class
982
939
revision_id = None
987
944
tree_to = WorkingTree.open_containing(directory)[0]
988
945
branch_to = tree_to.branch
990
self.add_cleanup(tree_to.unlock)
946
self.add_cleanup(tree_to.lock_write().unlock)
991
947
except errors.NoWorkingTree:
993
949
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
950
self.add_cleanup(branch_to.lock_write().unlock)
952
if tree_to is None and show_base:
953
raise errors.BzrCommandError("Need working tree for --show-base.")
997
955
if local and not branch_to.get_bound_location():
998
956
raise errors.LocalRequiresBoundBranch()
1030
988
branch_from = Branch.open(location,
1031
989
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
990
self.add_cleanup(branch_from.lock_read().unlock)
1035
992
if branch_to.get_parent() is None or remember:
1036
993
branch_to.set_parent(branch_from.base)
1045
1002
view_info=view_info)
1046
1003
result = tree_to.pull(
1047
1004
branch_from, overwrite, revision_id, change_reporter,
1048
possible_transports=possible_transports, local=local)
1005
possible_transports=possible_transports, local=local,
1006
show_base=show_base)
1050
1008
result = branch_to.pull(
1051
1009
branch_from, overwrite, revision_id, local=local)
1088
1046
Option('create-prefix',
1089
1047
help='Create the path leading up to the branch '
1090
1048
'if it does not already exist.'),
1049
custom_help('directory',
1092
1050
help='Branch to push from, '
1093
'rather than the one containing the working directory.',
1051
'rather than the one containing the working directory.'),
1097
1052
Option('use-existing-dir',
1098
1053
help='By default push will fail if the target'
1099
1054
' directory exists, but does not already'
1189
1144
_see_also = ['checkout']
1190
1145
takes_args = ['from_location', 'to_location?']
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1146
takes_options = ['revision',
1147
Option('hardlink', help='Hard-link working tree files where possible.'),
1148
Option('files-from', type=str,
1149
help="Get file contents from this tree."),
1193
1150
Option('no-tree',
1194
1151
help="Create a branch without a working-tree."),
1195
1152
Option('switch',
1214
1171
def run(self, from_location, to_location=None, revision=None,
1215
1172
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1173
use_existing_dir=False, switch=False, bind=False,
1217
1175
from bzrlib import switch as _mod_switch
1218
1176
from bzrlib.tag import _merge_tags_if_possible
1219
1177
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1179
if not (hardlink or files_from):
1180
# accelerator_tree is usually slower because you have to read N
1181
# files (no readahead, lots of seeks, etc), but allow the user to
1182
# explicitly request it
1183
accelerator_tree = None
1184
if files_from is not None and files_from != from_location:
1185
accelerator_tree = WorkingTree.open(files_from)
1221
1186
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1187
self.add_cleanup(br_from.lock_read().unlock)
1224
1188
if revision is not None:
1225
1189
revision_id = revision.as_revision_id(br_from)
1331
1295
to_location = branch_location
1332
1296
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1333
1297
branch_location)
1298
if not (hardlink or files_from):
1299
# accelerator_tree is usually slower because you have to read N
1300
# files (no readahead, lots of seeks, etc), but allow the user to
1301
# explicitly request it
1302
accelerator_tree = None
1334
1303
revision = _get_one_revision('checkout', revision)
1335
if files_from is not None:
1304
if files_from is not None and files_from != branch_location:
1336
1305
accelerator_tree = WorkingTree.open(files_from)
1337
1306
if revision is not None:
1338
1307
revision_id = revision.as_revision_id(source)
1366
1335
@display_command
1367
1336
def run(self, dir=u'.'):
1368
1337
tree = WorkingTree.open_containing(dir)[0]
1370
self.add_cleanup(tree.unlock)
1338
self.add_cleanup(tree.lock_read().unlock)
1371
1339
new_inv = tree.inventory
1372
1340
old_tree = tree.basis_tree()
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1341
self.add_cleanup(old_tree.lock_read().unlock)
1375
1342
old_inv = old_tree.inventory
1377
1344
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1396
1363
If you want to discard your local changes, you can just do a
1397
1364
'bzr revert' instead of 'bzr commit' after the update.
1366
If you want to restore a file that has been removed locally, use
1367
'bzr revert' instead of 'bzr update'.
1399
1369
If the tree's branch is bound to a master branch, it will also update
1400
1370
the branch from the master.
1403
1373
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1374
takes_args = ['dir?']
1405
takes_options = ['revision']
1375
takes_options = ['revision',
1377
help="Show base revision text in conflicts."),
1406
1379
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1381
def run(self, dir='.', revision=None, show_base=None):
1409
1382
if revision is not None and len(revision) != 1:
1410
1383
raise errors.BzrCommandError(
1411
1384
"bzr update --revision takes exactly one revision")
1415
1388
master = branch.get_master_branch(
1416
1389
possible_transports=possible_transports)
1417
1390
if master is not None:
1419
1391
branch_location = master.base
1394
branch_location = tree.branch.base
1421
1395
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1396
self.add_cleanup(tree.unlock)
1424
1397
# get rid of the final '/' and be ready for display
1425
1398
branch_location = urlutils.unescape_for_display(
1451
1424
change_reporter,
1452
1425
possible_transports=possible_transports,
1453
1426
revision=revision_id,
1428
show_base=show_base)
1455
1429
except errors.NoSuchRevision, e:
1456
1430
raise errors.BzrCommandError(
1457
1431
"branch has no revision %s\n"
1519
1493
class cmd_remove(Command):
1520
1494
__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.
1496
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1497
delete them if they can easily be recovered using revert otherwise they
1498
will be backed up (adding an extention of the form .~#~). If no options or
1499
parameters are given Bazaar will scan for files that are being tracked by
1500
Bazaar but missing in your tree and stop tracking them for you.
1527
1502
takes_args = ['file*']
1528
1503
takes_options = ['verbose',
1530
1505
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1506
'The file deletion mode to be used.',
1532
1507
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1508
safe='Backup changed files (default).',
1535
1509
keep='Delete from bzr but leave the working copy.',
1510
no_backup='Don\'t backup changed files.',
1536
1511
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1512
'recovered and even if they are non-empty directories. '
1513
'(deprecated, use no-backup)')]
1538
1514
aliases = ['rm', 'del']
1539
1515
encoding_type = 'replace'
1541
1517
def run(self, file_list, verbose=False, new=False,
1542
1518
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1519
if file_deletion_strategy == 'force':
1520
note("(The --force option is deprecated, rather use --no-backup "
1522
file_deletion_strategy = 'no-backup'
1524
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1526
if file_list is not None:
1546
1527
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1529
self.add_cleanup(tree.lock_write().unlock)
1550
1530
# Heuristics should probably all move into tree.remove_smart or
1567
1547
file_deletion_strategy = 'keep'
1568
1548
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1569
1549
keep_files=file_deletion_strategy=='keep',
1570
force=file_deletion_strategy=='force')
1550
force=(file_deletion_strategy=='no-backup'))
1573
1553
class cmd_file_id(Command):
1636
1616
_see_also = ['check']
1637
1617
takes_args = ['branch?']
1619
Option('canonicalize-chks',
1620
help='Make sure CHKs are in canonical form (repairs '
1639
def run(self, branch="."):
1625
def run(self, branch=".", canonicalize_chks=False):
1640
1626
from bzrlib.reconcile import reconcile
1641
1627
dir = bzrdir.BzrDir.open(branch)
1628
reconcile(dir, canonicalize_chks=canonicalize_chks)
1645
1631
class cmd_revision_history(Command):
1985
1975
old_branch, new_branch,
1986
1976
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
1977
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1978
# GNU diff on Windows uses ANSI encoding for filenames
1979
path_encoding = osutils.get_diff_header_encoding()
1988
1980
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1981
specific_files=specific_files,
1990
1982
external_diff_options=diff_options,
1991
1983
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1984
extra_trees=extra_trees,
1985
path_encoding=path_encoding,
1993
1987
format_cls=format)
2003
1997
# level of effort but possibly much less IO. (Or possibly not,
2004
1998
# if the directories are very large...)
2005
1999
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
2000
takes_options = ['directory', 'show-ids']
2008
2002
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2003
def run(self, show_ids=False, directory=u'.'):
2004
tree = WorkingTree.open_containing(directory)[0]
2005
self.add_cleanup(tree.lock_read().unlock)
2013
2006
old = tree.basis_tree()
2015
self.add_cleanup(old.unlock)
2007
self.add_cleanup(old.lock_read().unlock)
2016
2008
for path, ie in old.inventory.iter_entries():
2017
2009
if not tree.has_id(ie.file_id):
2018
2010
self.outf.write(path)
2030
2022
_see_also = ['status', 'ls']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2023
takes_options = ['directory', 'null']
2037
2025
@display_command
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2026
def run(self, null=False, directory=u'.'):
2027
tree = WorkingTree.open_containing(directory)[0]
2040
2028
td = tree.changes_from(tree.basis_tree())
2041
2029
for path, id, kind, text_modified, meta_modified in td.modified:
2053
2041
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2042
takes_options = ['directory', 'null']
2060
2044
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2045
def run(self, null=False, directory=u'.'):
2046
wt = WorkingTree.open_containing(directory)[0]
2047
self.add_cleanup(wt.lock_read().unlock)
2065
2048
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2049
self.add_cleanup(basis.lock_read().unlock)
2068
2050
basis_inv = basis.inventory
2069
2051
inv = wt.inventory
2070
2052
for file_id in inv:
2073
2055
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2057
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2058
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2061
self.outf.write(path + '\0')
2279
2261
help='Show just the specified revision.'
2280
2262
' See also "help revisionspec".'),
2264
RegistryOption('authors',
2265
'What names to list as authors - first, all or committer.',
2267
lazy_registry=('bzrlib.log', 'author_list_registry'),
2282
2269
Option('levels',
2283
2270
short_name='n',
2284
2271
help='Number of levels to display - 0 for all, 1 for flat.',
2353
2341
# find the file ids to log and check for directory filtering
2354
2342
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2343
revision, file_list, self.add_cleanup)
2357
2344
for relpath, file_id, kind in file_info_list:
2358
2345
if file_id is None:
2359
2346
raise errors.BzrCommandError(
2378
2365
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
2366
b = dir.open_branch()
2381
self.add_cleanup(b.unlock)
2367
self.add_cleanup(b.lock_read().unlock)
2382
2368
rev1, rev2 = _get_revision_range(revision, b, self.name())
2384
2370
# Decide on the type of delta & diff filtering to use
2404
2390
show_timezone=timezone,
2405
2391
delta_format=get_verbosity_level(),
2407
show_advice=levels is None)
2393
show_advice=levels is None,
2394
author_list_handler=authors)
2409
2396
# Choose the algorithm for doing the logging. It's annoying
2410
2397
# having multiple code paths like this but necessary until
2508
2495
tree, relpath = WorkingTree.open_containing(filename)
2509
2496
file_id = tree.path2id(relpath)
2510
2497
b = tree.branch
2512
self.add_cleanup(b.unlock)
2498
self.add_cleanup(b.lock_read().unlock)
2513
2499
touching_revs = log.find_touching_revisions(b, file_id)
2514
2500
for revno, revision_id, what in touching_revs:
2515
2501
self.outf.write("%6d %s\n" % (revno, what))
2528
2514
help='Recurse into subdirectories.'),
2529
2515
Option('from-root',
2530
2516
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2517
Option('unknown', short_name='u',
2518
help='Print unknown files.'),
2532
2519
Option('versioned', help='Print versioned files.',
2533
2520
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.'),
2521
Option('ignored', short_name='i',
2522
help='Print ignored files.'),
2523
Option('kind', short_name='k',
2539
2524
help='List entries of a particular kind: file, directory, symlink.',
2543
2530
@display_command
2544
2531
def run(self, revision=None, verbose=False,
2545
2532
recursive=False, from_root=False,
2546
2533
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2534
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2536
if kind and kind not in ('file', 'directory', 'symlink'):
2550
2537
raise errors.BzrCommandError('invalid kind specified')
2562
2549
raise errors.BzrCommandError('cannot specify both --from-root'
2565
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2552
tree, branch, relpath = \
2553
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2568
2555
# Calculate the prefix to use
2584
2571
view_str = views.view_display_str(view_files)
2585
2572
note("Ignoring files outside view. View is %s" % view_str)
2588
self.add_cleanup(tree.unlock)
2574
self.add_cleanup(tree.lock_read().unlock)
2589
2575
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
2576
from_dir=relpath, recursive=recursive):
2591
2577
# Apply additional masking
2640
2626
_see_also = ['ls']
2627
takes_options = ['directory']
2642
2629
@display_command
2644
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2630
def run(self, directory=u'.'):
2631
for f in WorkingTree.open_containing(directory)[0].unknowns():
2645
2632
self.outf.write(osutils.quotefn(f) + '\n')
2713
2700
_see_also = ['status', 'ignored', 'patterns']
2714
2701
takes_args = ['name_pattern*']
2702
takes_options = ['directory',
2716
2703
Option('default-rules',
2717
2704
help='Display the default ignore rules that bzr uses.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2707
def run(self, name_pattern_list=None, default_rules=None,
2721
2709
from bzrlib import ignores
2722
2710
if default_rules is not None:
2723
2711
# dump the default rules and exit
2729
2717
"NAME_PATTERN or --default-rules.")
2730
2718
name_pattern_list = [globbing.normalize_pattern(p)
2731
2719
for p in name_pattern_list]
2721
for p in name_pattern_list:
2722
if not globbing.Globster.is_pattern_valid(p):
2723
bad_patterns += ('\n %s' % p)
2725
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2726
ui.ui_factory.show_error(msg)
2727
raise errors.InvalidPattern('')
2732
2728
for name_pattern in name_pattern_list:
2733
2729
if (name_pattern[0] == '/' or
2734
2730
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
2731
raise errors.BzrCommandError(
2736
2732
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
2733
tree, relpath = WorkingTree.open_containing(directory)
2738
2734
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
2735
ignored = globbing.Globster(name_pattern_list)
2737
self.add_cleanup(tree.lock_read().unlock)
2742
2738
for entry in tree.list_files():
2744
2740
if id is not None:
2745
2741
filename = entry[0]
2746
2742
if ignored.match(filename):
2747
2743
matches.append(filename)
2749
2744
if len(matches) > 0:
2750
2745
self.outf.write("Warning: the following files are version controlled and"
2751
2746
" match your ignore pattern:\n%s"
2767
2762
encoding_type = 'replace'
2768
2763
_see_also = ['ignore', 'ls']
2764
takes_options = ['directory']
2770
2766
@display_command
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
2767
def run(self, directory=u'.'):
2768
tree = WorkingTree.open_containing(directory)[0]
2769
self.add_cleanup(tree.lock_read().unlock)
2775
2770
for path, file_class, kind, file_id, entry in tree.list_files():
2776
2771
if file_class != 'I':
2790
2785
takes_args = ['revno']
2786
takes_options = ['directory']
2792
2788
@display_command
2793
def run(self, revno):
2789
def run(self, revno, directory=u'.'):
2795
2791
revno = int(revno)
2796
2792
except ValueError:
2797
2793
raise errors.BzrCommandError("not a valid revision-number: %r"
2799
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2795
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2800
2796
self.outf.write("%s\n" % revid)
2829
2825
================= =========================
2831
2827
takes_args = ['dest', 'branch_or_subdir?']
2828
takes_options = ['directory',
2833
2829
Option('format',
2834
2830
help="Type of file to export to.",
2844
2840
'revision in which it was changed.'),
2846
2842
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2843
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2848
2844
from bzrlib.export import export
2850
2846
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
2847
tree = WorkingTree.open_containing(directory)[0]
2852
2848
b = tree.branch
2875
2871
_see_also = ['ls']
2872
takes_options = ['directory',
2877
2873
Option('name-from-revision', help='The path name in the old tree.'),
2878
2874
Option('filters', help='Apply content filters to display the '
2879
2875
'convenience form.'),
2885
2881
@display_command
2886
2882
def run(self, filename, revision=None, name_from_revision=False,
2883
filters=False, directory=None):
2888
2884
if revision is not None and len(revision) != 1:
2889
2885
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
2886
" one revision specifier")
2891
2887
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
2888
_open_directory_or_containing_tree_or_branch(filename, directory)
2889
self.add_cleanup(branch.lock_read().unlock)
2895
2890
return self._run(tree, branch, relpath, filename, revision,
2896
2891
name_from_revision, filters)
2900
2895
if tree is None:
2901
2896
tree = b.basis_tree()
2902
2897
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2898
self.add_cleanup(rev_tree.lock_read().unlock)
2906
2900
old_file_id = rev_tree.path2id(relpath)
3129
3123
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3125
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3126
if selected_list == ['']:
3133
3127
# workaround - commit of root of tree should be exactly the same
3134
3128
# as just default commit in that tree, and succeed even though
3169
3163
def get_message(commit_obj):
3170
3164
"""Callback to get commit message"""
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3168
my_message = f.read().decode(osutils.get_user_encoding())
3174
3171
elif message is not None:
3175
3172
my_message = message
3205
3202
reporter=None, verbose=verbose, revprops=properties,
3206
3203
authors=author, timestamp=commit_stamp,
3207
3204
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3205
exclude=tree.safe_relpath_files(exclude))
3209
3206
except PointlessCommit:
3210
3207
raise errors.BzrCommandError("No changes to commit."
3211
3208
" Use --unchanged to commit anyhow.")
3331
3328
bzr whoami "Frank Chu <fchu@example.com>"
3333
takes_options = [ Option('email',
3330
takes_options = [ 'directory',
3334
3332
help='Display email address only.'),
3335
3333
Option('branch',
3336
3334
help='Set identity for the current branch instead of '
3340
3338
encoding_type = 'replace'
3342
3340
@display_command
3343
def run(self, email=False, branch=False, name=None):
3341
def run(self, email=False, branch=False, name=None, directory=None):
3344
3342
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()
3343
if directory is None:
3344
# use branch if we're inside one; otherwise global config
3346
c = Branch.open_containing(u'.')[0].get_config()
3347
except errors.NotBranchError:
3348
c = _mod_config.GlobalConfig()
3350
c = Branch.open(directory).get_config()
3351
3352
self.outf.write(c.user_email() + '\n')
3356
3357
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3359
_mod_config.extract_email_address(name)
3359
3360
except errors.NoEmailInUsername, e:
3360
3361
warning('"%s" does not seem to contain an email address. '
3361
3362
'This is allowed, but not recommended.', name)
3363
3364
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3366
if directory is None:
3367
c = Branch.open_containing(u'.')[0].get_config()
3369
c = Branch.open(directory).get_config()
3367
c = config.GlobalConfig()
3371
c = _mod_config.GlobalConfig()
3368
3372
c.set_user_option('email', name)
3381
3385
_see_also = ['info']
3382
3386
takes_args = ['nickname?']
3383
def run(self, nickname=None):
3384
branch = Branch.open_containing(u'.')[0]
3387
takes_options = ['directory']
3388
def run(self, nickname=None, directory=u'.'):
3389
branch = Branch.open_containing(directory)[0]
3385
3390
if nickname is None:
3386
3391
self.printme(branch)
3436
3441
'bzr alias --remove expects an alias to remove.')
3437
3442
# If alias is not found, print something like:
3438
3443
# unalias: foo: not found
3439
c = config.GlobalConfig()
3444
c = _mod_config.GlobalConfig()
3440
3445
c.unset_alias(alias_name)
3442
3447
@display_command
3443
3448
def print_aliases(self):
3444
3449
"""Print out the defined aliases in a similar format to bash."""
3445
aliases = config.GlobalConfig().get_aliases()
3450
aliases = _mod_config.GlobalConfig().get_aliases()
3446
3451
for key, value in sorted(aliases.iteritems()):
3447
3452
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3459
3464
def set_alias(self, alias_name, alias_command):
3460
3465
"""Save the alias in the global config."""
3461
c = config.GlobalConfig()
3466
c = _mod_config.GlobalConfig()
3462
3467
c.set_alias(alias_name, alias_command)
3499
3504
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
3500
3505
into a pdb postmortem session.
3507
The --coverage=DIRNAME global option produces a report with covered code
3503
3511
Run only tests relating to 'ignore'::
3537
3545
'throughout the test suite.',
3538
3546
type=get_transport_type),
3539
3547
Option('benchmark',
3540
help='Run the benchmarks rather than selftests.'),
3548
help='Run the benchmarks rather than selftests.',
3541
3550
Option('lsprof-timed',
3542
3551
help='Generate lsprof output for benchmarked'
3543
3552
' sections of code.'),
3544
3553
Option('lsprof-tests',
3545
3554
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3549
3555
Option('first',
3550
3556
help='Run all tests, but run specified tests first.',
3551
3557
short_name='f',
3586
3592
def run(self, testspecs_list=None, verbose=False, one=False,
3587
3593
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
3595
first=False, list_only=False,
3590
3596
randomize=None, exclude=None, strict=False,
3591
3597
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
3598
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)
3599
from bzrlib import tests
3602
3601
if testspecs_list is not None:
3603
3602
pattern = '|'.join(testspecs_list)
3612
3611
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3612
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3613
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3614
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3615
# following code can be deleted when it's sufficiently deployed
3616
# -- vila/mgz 20100514
3617
if (sys.platform == "win32"
3618
and getattr(sys.stdout, 'fileno', None) is not None):
3617
3620
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
3622
self.additional_selftest_args.setdefault(
3620
3623
'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
3625
raise errors.BzrCommandError(
3626
"--benchmark is no longer supported from bzr 2.2; "
3627
"use bzr-usertest instead")
3628
test_suite_factory = None
3631
3629
selftest_kwargs = {"verbose": verbose,
3632
3630
"pattern": pattern,
3633
3631
"stop_on_failure": one,
3635
3633
"test_suite_factory": test_suite_factory,
3636
3634
"lsprof_timed": lsprof_timed,
3637
3635
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
3636
"matching_tests_first": first,
3640
3637
"list_only": list_only,
3641
3638
"random_seed": randomize,
3646
3643
"starting_with": starting_with
3648
3645
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3647
# Make deprecation warnings visible, unless -Werror is set
3648
cleanup = symbol_versioning.activate_deprecation_warnings(
3651
result = tests.selftest(**selftest_kwargs)
3650
3654
return int(not result)
3691
3695
branch1 = Branch.open_containing(branch)[0]
3692
3696
branch2 = Branch.open_containing(other)[0]
3694
self.add_cleanup(branch1.unlock)
3696
self.add_cleanup(branch2.unlock)
3697
self.add_cleanup(branch1.lock_read().unlock)
3698
self.add_cleanup(branch2.lock_read().unlock)
3697
3699
last1 = ensure_null(branch1.last_revision())
3698
3700
last2 = ensure_null(branch2.last_revision())
3793
3795
' completely merged into the source, pull from the'
3794
3796
' source rather than merging. When this happens,'
3795
3797
' you do not need to commit the result.'),
3798
custom_help('directory',
3797
3799
help='Branch to merge into, '
3798
'rather than the one containing the working directory.',
3800
'rather than the one containing the working directory.'),
3802
3801
Option('preview', help='Instead of merging, show a diff of the'
3804
3803
Option('interactive', help='Select changes interactively.',
3837
3836
unversioned_filter=tree.is_ignored, view_info=view_info)
3838
3837
pb = ui.ui_factory.nested_progress_bar()
3839
3838
self.add_cleanup(pb.finished)
3841
self.add_cleanup(tree.unlock)
3839
self.add_cleanup(tree.lock_write().unlock)
3842
3840
if location is not None:
3844
3842
mergeable = bundle.read_mergeable_from_url(location,
3905
3903
def _do_preview(self, merger):
3906
3904
from bzrlib.diff import show_diff_trees
3907
3905
result_tree = self._get_preview(merger)
3906
path_encoding = osutils.get_diff_header_encoding()
3908
3907
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
3908
old_label='', new_label='',
3909
path_encoding=path_encoding)
3911
3911
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
3912
merger.change_reporter = change_reporter
4099
4099
from bzrlib.conflicts import restore
4100
4100
if merge_type is None:
4101
4101
merge_type = _mod_merge.Merge3Merger
4102
tree, file_list = tree_files(file_list)
4104
self.add_cleanup(tree.unlock)
4102
tree, file_list = WorkingTree.open_containing_paths(file_list)
4103
self.add_cleanup(tree.lock_write().unlock)
4105
4104
parents = tree.get_parent_ids()
4106
4105
if len(parents) != 2:
4107
4106
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4217
4216
def run(self, revision=None, no_backup=False, file_list=None,
4218
4217
forget_merges=None):
4219
tree, file_list = tree_files(file_list)
4220
tree.lock_tree_write()
4221
self.add_cleanup(tree.unlock)
4218
tree, file_list = WorkingTree.open_containing_paths(file_list)
4219
self.add_cleanup(tree.lock_tree_write().unlock)
4222
4220
if forget_merges:
4223
4221
tree.set_parent_ids(tree.get_parent_ids()[:1])
4313
4311
_see_also = ['merge', 'pull']
4314
4312
takes_args = ['other_branch?']
4315
4313
takes_options = [
4316
4315
Option('reverse', 'Reverse the order of revisions.'),
4317
4316
Option('mine-only',
4318
4317
'Display changes in the local branch only.'),
4340
4339
theirs_only=False,
4341
4340
log_format=None, long=False, short=False, line=False,
4342
4341
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4342
include_merges=False, revision=None, my_revision=None,
4344
4344
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4345
def message(s):
4346
4346
if not is_quiet():
4359
4359
elif theirs_only:
4360
4360
restrict = 'remote'
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4362
local_branch = Branch.open_containing(directory)[0]
4363
self.add_cleanup(local_branch.lock_read().unlock)
4366
4365
parent = local_branch.get_parent()
4367
4366
if other_branch is None:
4378
4377
if remote_branch.base == local_branch.base:
4379
4378
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4380
self.add_cleanup(remote_branch.lock_read().unlock)
4384
4382
local_revid_range = _revision_range_to_revid_range(
4385
4383
_get_revision_range(my_revision, local_branch,
4440
4438
message("Branches are up to date.\n")
4441
4439
self.cleanup_now()
4442
4440
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)
4441
self.add_cleanup(local_branch.lock_write().unlock)
4445
4442
# handle race conditions - a parent might be set while we run.
4446
4443
if local_branch.get_parent() is None:
4447
4444
local_branch.set_parent(remote_branch.base)
4578
4574
Option('long', help='Show commit date in annotations.'),
4582
4579
encoding_type = 'exact'
4584
4581
@display_command
4585
4582
def run(self, filename, all=False, long=False, revision=None,
4583
show_ids=False, directory=None):
4587
4584
from bzrlib.annotate import annotate_file, annotate_file_tree
4588
4585
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4586
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
4587
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4588
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4590
self.add_cleanup(branch.lock_read().unlock)
4596
4591
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4592
self.add_cleanup(tree.lock_read().unlock)
4599
4593
if wt is not None:
4600
4594
file_id = wt.path2id(relpath)
4620
4614
hidden = True # is this right ?
4621
4615
takes_args = ['revision_id*']
4622
takes_options = ['revision']
4616
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
4618
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
4619
if revision_id_list is not None and revision is not None:
4626
4620
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4627
4621
if revision_id_list is None and revision is None:
4628
4622
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)
4623
b = WorkingTree.open_containing(directory)[0].branch
4624
self.add_cleanup(b.lock_write().unlock)
4632
4625
return self._run(b, revision_id_list, revision)
4634
4627
def _run(self, b, revision_id_list, revision):
4694
4687
_see_also = ['checkouts', 'unbind']
4695
4688
takes_args = ['location?']
4689
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4691
def run(self, location=None, directory=u'.'):
4692
b, relpath = Branch.open_containing(directory)
4700
4693
if location is None:
4702
4695
location = b.get_old_bound_location()
4730
4723
_see_also = ['checkouts', 'bind']
4731
4724
takes_args = []
4725
takes_options = ['directory']
4735
b, relpath = Branch.open_containing(u'.')
4727
def run(self, directory=u'.'):
4728
b, relpath = Branch.open_containing(directory)
4736
4729
if not b.unbind():
4737
4730
raise errors.BzrCommandError('Local branch is not bound')
4784
4777
b = control.open_branch()
4786
4779
if tree is not None:
4788
self.add_cleanup(tree.unlock)
4780
self.add_cleanup(tree.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4782
self.add_cleanup(b.lock_write().unlock)
4792
4783
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4794
4785
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4833
4824
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')
4827
if not ui.ui_factory.confirm_action(
4828
'Uncommit these revisions',
4829
'bzrlib.builtins.uncommit',
4831
self.outf.write('Canceled\n')
4840
4834
mutter('Uncommitting from {%s} to {%s}',
4848
4842
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4843
__doc__ = """Break a dead lock.
4845
This command breaks a lock on a repository, branch, working directory or
4851
4848
CAUTION: Locks should only be broken when you are sure that the process
4852
4849
holding the lock has been stopped.
4859
4856
bzr break-lock bzr+ssh://example.com/bzr/foo
4857
bzr break-lock --conf ~/.bazaar
4861
4860
takes_args = ['location?']
4863
help='LOCATION is the directory where the config lock is.'),
4865
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
4868
def run(self, location=None, config=False, force=False):
4864
4869
if location is None:
4865
4870
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
4872
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
4874
{'bzrlib.lockdir.break': True})
4876
conf = _mod_config.LockableConfig(file_name=location)
4879
control, relpath = bzrdir.BzrDir.open_containing(location)
4881
control.break_lock()
4882
except NotImplementedError:
4873
4886
class cmd_wait_until_signalled(Command):
4902
4915
'result in a dynamically allocated port. The default port '
4903
4916
'depends on the protocol.',
4906
help='Serve contents of this directory.',
4918
custom_help('directory',
4919
help='Serve contents of this directory.'),
4908
4920
Option('allow-writes',
4909
4921
help='By default the server is a readonly server. Supplying '
4910
4922
'--allow-writes enables write access to the contents of '
4938
4950
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4939
4951
protocol=None):
4940
from bzrlib.transport import get_transport, transport_server_registry
4952
from bzrlib import transport
4941
4953
if directory is None:
4942
4954
directory = os.getcwd()
4943
4955
if protocol is None:
4944
protocol = transport_server_registry.get()
4956
protocol = transport.transport_server_registry.get()
4945
4957
host, port = self.get_host_and_port(port)
4946
4958
url = urlutils.local_path_to_url(directory)
4947
4959
if not allow_writes:
4948
4960
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
4961
t = transport.get_transport(url)
4962
protocol(t, host, port, inet)
4953
4965
class cmd_join(Command):
4959
4971
not part of it. (Such trees can be produced by "bzr split", but also by
4960
4972
running "bzr branch" with the target inside a tree.)
4962
The result is a combined tree, with the subtree no longer an independant
4974
The result is a combined tree, with the subtree no longer an independent
4963
4975
part. This is marked as a merge of the subtree into the containing tree,
4964
4976
and all history is preserved.
5064
5077
encoding_type = 'exact'
5066
5079
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5067
sign=False, revision=None, mail_to=None, message=None):
5080
sign=False, revision=None, mail_to=None, message=None,
5068
5082
from bzrlib.revision import ensure_null, NULL_REVISION
5069
5083
include_patch, include_bundle = {
5070
5084
'plain': (False, False),
5071
5085
'diff': (True, False),
5072
5086
'bundle': (True, True),
5074
branch = Branch.open('.')
5088
branch = Branch.open(directory)
5075
5089
stored_submit_branch = branch.get_submit_branch()
5076
5090
if submit_branch is None:
5077
5091
submit_branch = stored_submit_branch
5162
5176
given, in which case it is sent to a file.
5164
5178
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.
5179
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
5166
5180
If the preferred client can't be found (or used), your editor will be used.
5168
5182
To use a specific mail program, set the mail_client configuration option.
5339
5353
Option('delete',
5340
5354
help='Delete this tag rather than placing it.',
5343
help='Branch in which to place the tag.',
5356
custom_help('directory',
5357
help='Branch in which to place the tag.'),
5347
5358
Option('force',
5348
5359
help='Replace existing tags.',
5359
5370
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5371
self.add_cleanup(branch.lock_write().unlock)
5363
5373
if tag_name is None:
5364
5374
raise errors.BzrCommandError("No tag specified to delete.")
5393
5403
_see_also = ['tag']
5394
5404
takes_options = [
5396
help='Branch whose tags should be displayed.',
5405
custom_help('directory',
5406
help='Branch whose tags should be displayed.'),
5400
5407
RegistryOption.from_kwargs('sort',
5401
5408
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5409
natural='Sort numeric substrings as numbers:'
5410
' suitable for version numbers. (default)',
5411
alpha='Sort tags lexicographically.',
5403
5412
time='Sort tags chronologically.',
5423
self.add_cleanup(branch.unlock)
5431
self.add_cleanup(branch.lock_read().unlock)
5425
5433
graph = branch.repository.get_graph()
5426
5434
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5428
5436
# only show revisions between revid1 and revid2 (inclusive)
5429
5437
tags = [(tag, revid) for tag, revid in tags if
5430
5438
graph.is_between(revid, revid1, revid2)]
5439
if sort == 'natural':
5440
def natural_sort_key(tag):
5441
return [f(s) for f,s in
5442
zip(itertools.cycle((unicode.lower,int)),
5443
re.split('([0-9]+)', tag[0]))]
5444
tags.sort(key=natural_sort_key)
5445
elif sort == 'alpha':
5433
5447
elif sort == 'time':
5434
5448
timestamps = {}
5575
5589
takes_args = ['to_location?']
5576
takes_options = [Option('force',
5590
takes_options = ['directory',
5577
5592
help='Switch even if local commits will be lost.'),
5579
5594
Option('create-branch', short_name='b',
5584
5599
def run(self, to_location=None, force=False, create_branch=False,
5600
revision=None, directory=u'.'):
5586
5601
from bzrlib import switch
5602
tree_location = directory
5588
5603
revision = _get_one_revision('switch', revision)
5589
5604
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
5605
if to_location is None:
5591
5606
if revision is None:
5592
5607
raise errors.BzrCommandError('You must supply either a'
5593
5608
' revision or a location')
5609
to_location = tree_location
5596
5611
branch = control_dir.open_branch()
5597
5612
had_explicit_nick = branch.get_config().has_explicit_nickname()
5735
tree, file_list = tree_files(file_list, apply_view=False)
5750
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
5752
current_view, view_dict = tree.views.get_view_info()
5737
5753
if name is None:
5738
5754
name = current_view
5886
5903
_see_also = ['unshelve']
5888
5905
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
5906
writer=None, list=False, destroy=False, directory=u'.'):
5891
5908
return self.run_for_list()
5892
5909
from bzrlib.shelf_ui import Shelver
5894
5911
writer = bzrlib.option.diff_writer_registry.get()
5896
5913
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
5914
file_list, message, destroy=destroy, directory=directory)
5905
5922
def run_for_list(self):
5906
5923
tree = WorkingTree.open_containing('.')[0]
5908
self.add_cleanup(tree.unlock)
5924
self.add_cleanup(tree.lock_read().unlock)
5909
5925
manager = tree.get_shelf_manager()
5910
5926
shelves = manager.active_shelves()
5911
5927
if len(shelves) == 0:
5930
5946
takes_args = ['shelf_id?']
5931
5947
takes_options = [
5932
5949
RegistryOption.from_kwargs(
5933
5950
'action', help="The action to perform.",
5934
5951
enum_switch=False, value_switches=True,
5943
5960
_see_also = ['shelve']
5945
def run(self, shelf_id=None, action='apply'):
5962
def run(self, shelf_id=None, action='apply', directory=u'.'):
5946
5963
from bzrlib.shelf_ui import Unshelver
5947
unshelver = Unshelver.from_args(shelf_id, action)
5964
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5949
5966
unshelver.run()
5967
5984
To check what clean-tree will do, use --dry-run.
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5986
takes_options = ['directory',
5987
Option('ignored', help='Delete all ignored files.'),
5970
5988
Option('detritus', help='Delete conflict files, merge'
5971
5989
' backups, and failed selftest dirs.'),
5972
5990
Option('unknown',
5975
5993
' deleting them.'),
5976
5994
Option('force', help='Do not prompt before deleting.')]
5977
5995
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5996
force=False, directory=u'.'):
5979
5997
from bzrlib.clean_tree import clean_tree
5980
5998
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6002
clean_tree(directory, unknown=unknown, ignored=ignored,
6003
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6006
class cmd_reference(Command):
added
removed
bzrlib/builtins.py
