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'
1189
1148
_see_also = ['checkout']
1190
1149
takes_args = ['from_location', 'to_location?']
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1150
takes_options = ['revision',
1151
Option('hardlink', help='Hard-link working tree files where possible.'),
1152
Option('files-from', type=str,
1153
help="Get file contents from this tree."),
1193
1154
Option('no-tree',
1194
1155
help="Create a branch without a working-tree."),
1195
1156
Option('switch',
1214
1175
def run(self, from_location, to_location=None, revision=None,
1215
1176
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1177
use_existing_dir=False, switch=False, bind=False,
1217
1179
from bzrlib import switch as _mod_switch
1218
1180
from bzrlib.tag import _merge_tags_if_possible
1219
1181
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1183
if not (hardlink or files_from):
1184
# accelerator_tree is usually slower because you have to read N
1185
# files (no readahead, lots of seeks, etc), but allow the user to
1186
# explicitly request it
1187
accelerator_tree = None
1188
if files_from is not None and files_from != from_location:
1189
accelerator_tree = WorkingTree.open(files_from)
1221
1190
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1191
self.add_cleanup(br_from.lock_read().unlock)
1224
1192
if revision is not None:
1225
1193
revision_id = revision.as_revision_id(br_from)
1331
1299
to_location = branch_location
1332
1300
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1333
1301
branch_location)
1302
if not (hardlink or files_from):
1303
# accelerator_tree is usually slower because you have to read N
1304
# files (no readahead, lots of seeks, etc), but allow the user to
1305
# explicitly request it
1306
accelerator_tree = None
1334
1307
revision = _get_one_revision('checkout', revision)
1335
if files_from is not None:
1308
if files_from is not None and files_from != branch_location:
1336
1309
accelerator_tree = WorkingTree.open(files_from)
1337
1310
if revision is not None:
1338
1311
revision_id = revision.as_revision_id(source)
1366
1339
@display_command
1367
1340
def run(self, dir=u'.'):
1368
1341
tree = WorkingTree.open_containing(dir)[0]
1370
self.add_cleanup(tree.unlock)
1342
self.add_cleanup(tree.lock_read().unlock)
1371
1343
new_inv = tree.inventory
1372
1344
old_tree = tree.basis_tree()
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1345
self.add_cleanup(old_tree.lock_read().unlock)
1375
1346
old_inv = old_tree.inventory
1377
1348
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1396
1367
If you want to discard your local changes, you can just do a
1397
1368
'bzr revert' instead of 'bzr commit' after the update.
1370
If you want to restore a file that has been removed locally, use
1371
'bzr revert' instead of 'bzr update'.
1399
1373
If the tree's branch is bound to a master branch, it will also update
1400
1374
the branch from the master.
1403
1377
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1378
takes_args = ['dir?']
1405
takes_options = ['revision']
1379
takes_options = ['revision',
1381
help="Show base revision text in conflicts."),
1406
1383
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1385
def run(self, dir='.', revision=None, show_base=None):
1409
1386
if revision is not None and len(revision) != 1:
1410
1387
raise errors.BzrCommandError(
1411
1388
"bzr update --revision takes exactly one revision")
1415
1392
master = branch.get_master_branch(
1416
1393
possible_transports=possible_transports)
1417
1394
if master is not None:
1419
1395
branch_location = master.base
1398
branch_location = tree.branch.base
1421
1399
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1400
self.add_cleanup(tree.unlock)
1424
1401
# get rid of the final '/' and be ready for display
1425
1402
branch_location = urlutils.unescape_for_display(
1451
1428
change_reporter,
1452
1429
possible_transports=possible_transports,
1453
1430
revision=revision_id,
1432
show_base=show_base)
1455
1433
except errors.NoSuchRevision, e:
1456
1434
raise errors.BzrCommandError(
1457
1435
"branch has no revision %s\n"
1519
1497
class cmd_remove(Command):
1520
1498
__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.
1500
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1501
delete them if they can easily be recovered using revert otherwise they
1502
will be backed up (adding an extention of the form .~#~). If no options or
1503
parameters are given Bazaar will scan for files that are being tracked by
1504
Bazaar but missing in your tree and stop tracking them for you.
1527
1506
takes_args = ['file*']
1528
1507
takes_options = ['verbose',
1530
1509
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1510
'The file deletion mode to be used.',
1532
1511
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1512
safe='Backup changed files (default).',
1535
1513
keep='Delete from bzr but leave the working copy.',
1514
no_backup='Don\'t backup changed files.',
1536
1515
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1516
'recovered and even if they are non-empty directories. '
1517
'(deprecated, use no-backup)')]
1538
1518
aliases = ['rm', 'del']
1539
1519
encoding_type = 'replace'
1541
1521
def run(self, file_list, verbose=False, new=False,
1542
1522
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1523
if file_deletion_strategy == 'force':
1524
note("(The --force option is deprecated, rather use --no-backup "
1526
file_deletion_strategy = 'no-backup'
1528
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1530
if file_list is not None:
1546
1531
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1533
self.add_cleanup(tree.lock_write().unlock)
1550
1534
# Heuristics should probably all move into tree.remove_smart or
1567
1551
file_deletion_strategy = 'keep'
1568
1552
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1569
1553
keep_files=file_deletion_strategy=='keep',
1570
force=file_deletion_strategy=='force')
1554
force=(file_deletion_strategy=='no-backup'))
1573
1557
class cmd_file_id(Command):
1636
1620
_see_also = ['check']
1637
1621
takes_args = ['branch?']
1623
Option('canonicalize-chks',
1624
help='Make sure CHKs are in canonical form (repairs '
1639
def run(self, branch="."):
1629
def run(self, branch=".", canonicalize_chks=False):
1640
1630
from bzrlib.reconcile import reconcile
1641
1631
dir = bzrdir.BzrDir.open(branch)
1632
reconcile(dir, canonicalize_chks=canonicalize_chks)
1645
1635
class cmd_revision_history(Command):
1985
1979
old_branch, new_branch,
1986
1980
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
1981
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1982
# GNU diff on Windows uses ANSI encoding for filenames
1983
path_encoding = osutils.get_diff_header_encoding()
1988
1984
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1985
specific_files=specific_files,
1990
1986
external_diff_options=diff_options,
1991
1987
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1988
extra_trees=extra_trees,
1989
path_encoding=path_encoding,
1993
1991
format_cls=format)
2003
2001
# level of effort but possibly much less IO. (Or possibly not,
2004
2002
# if the directories are very large...)
2005
2003
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
2004
takes_options = ['directory', 'show-ids']
2008
2006
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2007
def run(self, show_ids=False, directory=u'.'):
2008
tree = WorkingTree.open_containing(directory)[0]
2009
self.add_cleanup(tree.lock_read().unlock)
2013
2010
old = tree.basis_tree()
2015
self.add_cleanup(old.unlock)
2011
self.add_cleanup(old.lock_read().unlock)
2016
2012
for path, ie in old.inventory.iter_entries():
2017
2013
if not tree.has_id(ie.file_id):
2018
2014
self.outf.write(path)
2030
2026
_see_also = ['status', 'ls']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2027
takes_options = ['directory', 'null']
2037
2029
@display_command
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2030
def run(self, null=False, directory=u'.'):
2031
tree = WorkingTree.open_containing(directory)[0]
2040
2032
td = tree.changes_from(tree.basis_tree())
2041
2033
for path, id, kind, text_modified, meta_modified in td.modified:
2053
2045
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2046
takes_options = ['directory', 'null']
2060
2048
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2049
def run(self, null=False, directory=u'.'):
2050
wt = WorkingTree.open_containing(directory)[0]
2051
self.add_cleanup(wt.lock_read().unlock)
2065
2052
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2053
self.add_cleanup(basis.lock_read().unlock)
2068
2054
basis_inv = basis.inventory
2069
2055
inv = wt.inventory
2070
2056
for file_id in inv:
2073
2059
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2061
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2062
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2065
self.outf.write(path + '\0')
2279
2265
help='Show just the specified revision.'
2280
2266
' See also "help revisionspec".'),
2268
RegistryOption('authors',
2269
'What names to list as authors - first, all or committer.',
2271
lazy_registry=('bzrlib.log', 'author_list_registry'),
2282
2273
Option('levels',
2283
2274
short_name='n',
2284
2275
help='Number of levels to display - 0 for all, 1 for flat.',
2353
2345
# find the file ids to log and check for directory filtering
2354
2346
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2347
revision, file_list, self.add_cleanup)
2357
2348
for relpath, file_id, kind in file_info_list:
2358
2349
if file_id is None:
2359
2350
raise errors.BzrCommandError(
2378
2369
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
2370
b = dir.open_branch()
2381
self.add_cleanup(b.unlock)
2371
self.add_cleanup(b.lock_read().unlock)
2382
2372
rev1, rev2 = _get_revision_range(revision, b, self.name())
2384
2374
# Decide on the type of delta & diff filtering to use
2404
2394
show_timezone=timezone,
2405
2395
delta_format=get_verbosity_level(),
2407
show_advice=levels is None)
2397
show_advice=levels is None,
2398
author_list_handler=authors)
2409
2400
# Choose the algorithm for doing the logging. It's annoying
2410
2401
# having multiple code paths like this but necessary until
2508
2499
tree, relpath = WorkingTree.open_containing(filename)
2509
2500
file_id = tree.path2id(relpath)
2510
2501
b = tree.branch
2512
self.add_cleanup(b.unlock)
2502
self.add_cleanup(b.lock_read().unlock)
2513
2503
touching_revs = log.find_touching_revisions(b, file_id)
2514
2504
for revno, revision_id, what in touching_revs:
2515
2505
self.outf.write("%6d %s\n" % (revno, what))
2528
2518
help='Recurse into subdirectories.'),
2529
2519
Option('from-root',
2530
2520
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2521
Option('unknown', short_name='u',
2522
help='Print unknown files.'),
2532
2523
Option('versioned', help='Print versioned files.',
2533
2524
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.'),
2525
Option('ignored', short_name='i',
2526
help='Print ignored files.'),
2527
Option('kind', short_name='k',
2539
2528
help='List entries of a particular kind: file, directory, symlink.',
2543
2534
@display_command
2544
2535
def run(self, revision=None, verbose=False,
2545
2536
recursive=False, from_root=False,
2546
2537
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2538
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2540
if kind and kind not in ('file', 'directory', 'symlink'):
2550
2541
raise errors.BzrCommandError('invalid kind specified')
2562
2553
raise errors.BzrCommandError('cannot specify both --from-root'
2565
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2556
tree, branch, relpath = \
2557
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2568
2559
# Calculate the prefix to use
2584
2575
view_str = views.view_display_str(view_files)
2585
2576
note("Ignoring files outside view. View is %s" % view_str)
2588
self.add_cleanup(tree.unlock)
2578
self.add_cleanup(tree.lock_read().unlock)
2589
2579
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
2580
from_dir=relpath, recursive=recursive):
2591
2581
# Apply additional masking
2640
2630
_see_also = ['ls']
2631
takes_options = ['directory']
2642
2633
@display_command
2644
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2634
def run(self, directory=u'.'):
2635
for f in WorkingTree.open_containing(directory)[0].unknowns():
2645
2636
self.outf.write(osutils.quotefn(f) + '\n')
2713
2704
_see_also = ['status', 'ignored', 'patterns']
2714
2705
takes_args = ['name_pattern*']
2706
takes_options = ['directory',
2716
2707
Option('default-rules',
2717
2708
help='Display the default ignore rules that bzr uses.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2711
def run(self, name_pattern_list=None, default_rules=None,
2721
2713
from bzrlib import ignores
2722
2714
if default_rules is not None:
2723
2715
# dump the default rules and exit
2729
2721
"NAME_PATTERN or --default-rules.")
2730
2722
name_pattern_list = [globbing.normalize_pattern(p)
2731
2723
for p in name_pattern_list]
2725
for p in name_pattern_list:
2726
if not globbing.Globster.is_pattern_valid(p):
2727
bad_patterns += ('\n %s' % p)
2729
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2730
ui.ui_factory.show_error(msg)
2731
raise errors.InvalidPattern('')
2732
2732
for name_pattern in name_pattern_list:
2733
2733
if (name_pattern[0] == '/' or
2734
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
2735
raise errors.BzrCommandError(
2736
2736
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
2737
tree, relpath = WorkingTree.open_containing(directory)
2738
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
2739
ignored = globbing.Globster(name_pattern_list)
2741
self.add_cleanup(tree.lock_read().unlock)
2742
2742
for entry in tree.list_files():
2744
2744
if id is not None:
2745
2745
filename = entry[0]
2746
2746
if ignored.match(filename):
2747
2747
matches.append(filename)
2749
2748
if len(matches) > 0:
2750
2749
self.outf.write("Warning: the following files are version controlled and"
2751
2750
" match your ignore pattern:\n%s"
2767
2766
encoding_type = 'replace'
2768
2767
_see_also = ['ignore', 'ls']
2768
takes_options = ['directory']
2770
2770
@display_command
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
2771
def run(self, directory=u'.'):
2772
tree = WorkingTree.open_containing(directory)[0]
2773
self.add_cleanup(tree.lock_read().unlock)
2775
2774
for path, file_class, kind, file_id, entry in tree.list_files():
2776
2775
if file_class != 'I':
2790
2789
takes_args = ['revno']
2790
takes_options = ['directory']
2792
2792
@display_command
2793
def run(self, revno):
2793
def run(self, revno, directory=u'.'):
2795
2795
revno = int(revno)
2796
2796
except ValueError:
2797
2797
raise errors.BzrCommandError("not a valid revision-number: %r"
2799
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2799
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2800
2800
self.outf.write("%s\n" % revid)
2829
2829
================= =========================
2831
2831
takes_args = ['dest', 'branch_or_subdir?']
2832
takes_options = ['directory',
2833
2833
Option('format',
2834
2834
help="Type of file to export to.",
2844
2844
'revision in which it was changed.'),
2846
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2847
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2848
2848
from bzrlib.export import export
2850
2850
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
2851
tree = WorkingTree.open_containing(directory)[0]
2852
2852
b = tree.branch
2875
2875
_see_also = ['ls']
2876
takes_options = ['directory',
2877
2877
Option('name-from-revision', help='The path name in the old tree.'),
2878
2878
Option('filters', help='Apply content filters to display the '
2879
2879
'convenience form.'),
2885
2885
@display_command
2886
2886
def run(self, filename, revision=None, name_from_revision=False,
2887
filters=False, directory=None):
2888
2888
if revision is not None and len(revision) != 1:
2889
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
2890
" one revision specifier")
2891
2891
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
2892
_open_directory_or_containing_tree_or_branch(filename, directory)
2893
self.add_cleanup(branch.lock_read().unlock)
2895
2894
return self._run(tree, branch, relpath, filename, revision,
2896
2895
name_from_revision, filters)
2900
2899
if tree is None:
2901
2900
tree = b.basis_tree()
2902
2901
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2902
self.add_cleanup(rev_tree.lock_read().unlock)
2906
2904
old_file_id = rev_tree.path2id(relpath)
3129
3127
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3129
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3130
if selected_list == ['']:
3133
3131
# workaround - commit of root of tree should be exactly the same
3134
3132
# as just default commit in that tree, and succeed even though
3169
3167
def get_message(commit_obj):
3170
3168
"""Callback to get commit message"""
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3172
my_message = f.read().decode(osutils.get_user_encoding())
3174
3175
elif message is not None:
3175
3176
my_message = message
3205
3206
reporter=None, verbose=verbose, revprops=properties,
3206
3207
authors=author, timestamp=commit_stamp,
3207
3208
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3209
exclude=tree.safe_relpath_files(exclude))
3209
3210
except PointlessCommit:
3210
3211
raise errors.BzrCommandError("No changes to commit."
3211
3212
" Use --unchanged to commit anyhow.")
3331
3332
bzr whoami "Frank Chu <fchu@example.com>"
3333
takes_options = [ Option('email',
3334
takes_options = [ 'directory',
3334
3336
help='Display email address only.'),
3335
3337
Option('branch',
3336
3338
help='Set identity for the current branch instead of '
3340
3342
encoding_type = 'replace'
3342
3344
@display_command
3343
def run(self, email=False, branch=False, name=None):
3345
def run(self, email=False, branch=False, name=None, directory=None):
3344
3346
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()
3347
if directory is None:
3348
# use branch if we're inside one; otherwise global config
3350
c = Branch.open_containing(u'.')[0].get_config()
3351
except errors.NotBranchError:
3352
c = _mod_config.GlobalConfig()
3354
c = Branch.open(directory).get_config()
3351
3356
self.outf.write(c.user_email() + '\n')
3356
3361
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3363
_mod_config.extract_email_address(name)
3359
3364
except errors.NoEmailInUsername, e:
3360
3365
warning('"%s" does not seem to contain an email address. '
3361
3366
'This is allowed, but not recommended.', name)
3363
3368
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3370
if directory is None:
3371
c = Branch.open_containing(u'.')[0].get_config()
3373
c = Branch.open(directory).get_config()
3367
c = config.GlobalConfig()
3375
c = _mod_config.GlobalConfig()
3368
3376
c.set_user_option('email', name)
3381
3389
_see_also = ['info']
3382
3390
takes_args = ['nickname?']
3383
def run(self, nickname=None):
3384
branch = Branch.open_containing(u'.')[0]
3391
takes_options = ['directory']
3392
def run(self, nickname=None, directory=u'.'):
3393
branch = Branch.open_containing(directory)[0]
3385
3394
if nickname is None:
3386
3395
self.printme(branch)
3436
3445
'bzr alias --remove expects an alias to remove.')
3437
3446
# If alias is not found, print something like:
3438
3447
# unalias: foo: not found
3439
c = config.GlobalConfig()
3448
c = _mod_config.GlobalConfig()
3440
3449
c.unset_alias(alias_name)
3442
3451
@display_command
3443
3452
def print_aliases(self):
3444
3453
"""Print out the defined aliases in a similar format to bash."""
3445
aliases = config.GlobalConfig().get_aliases()
3454
aliases = _mod_config.GlobalConfig().get_aliases()
3446
3455
for key, value in sorted(aliases.iteritems()):
3447
3456
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3459
3468
def set_alias(self, alias_name, alias_command):
3460
3469
"""Save the alias in the global config."""
3461
c = config.GlobalConfig()
3470
c = _mod_config.GlobalConfig()
3462
3471
c.set_alias(alias_name, alias_command)
3499
3508
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
3500
3509
into a pdb postmortem session.
3511
The --coverage=DIRNAME global option produces a report with covered code
3503
3515
Run only tests relating to 'ignore'::
3537
3549
'throughout the test suite.',
3538
3550
type=get_transport_type),
3539
3551
Option('benchmark',
3540
help='Run the benchmarks rather than selftests.'),
3552
help='Run the benchmarks rather than selftests.',
3541
3554
Option('lsprof-timed',
3542
3555
help='Generate lsprof output for benchmarked'
3543
3556
' sections of code.'),
3544
3557
Option('lsprof-tests',
3545
3558
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3549
3559
Option('first',
3550
3560
help='Run all tests, but run specified tests first.',
3551
3561
short_name='f',
3586
3596
def run(self, testspecs_list=None, verbose=False, one=False,
3587
3597
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
3599
first=False, list_only=False,
3590
3600
randomize=None, exclude=None, strict=False,
3591
3601
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
3602
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)
3603
from bzrlib import tests
3602
3605
if testspecs_list is not None:
3603
3606
pattern = '|'.join(testspecs_list)
3612
3615
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3616
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3617
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3618
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3619
# following code can be deleted when it's sufficiently deployed
3620
# -- vila/mgz 20100514
3621
if (sys.platform == "win32"
3622
and getattr(sys.stdout, 'fileno', None) is not None):
3617
3624
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
3626
self.additional_selftest_args.setdefault(
3620
3627
'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
3629
raise errors.BzrCommandError(
3630
"--benchmark is no longer supported from bzr 2.2; "
3631
"use bzr-usertest instead")
3632
test_suite_factory = None
3631
3633
selftest_kwargs = {"verbose": verbose,
3632
3634
"pattern": pattern,
3633
3635
"stop_on_failure": one,
3635
3637
"test_suite_factory": test_suite_factory,
3636
3638
"lsprof_timed": lsprof_timed,
3637
3639
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
3640
"matching_tests_first": first,
3640
3641
"list_only": list_only,
3641
3642
"random_seed": randomize,
3646
3647
"starting_with": starting_with
3648
3649
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3651
# Make deprecation warnings visible, unless -Werror is set
3652
cleanup = symbol_versioning.activate_deprecation_warnings(
3655
result = tests.selftest(**selftest_kwargs)
3650
3658
return int(not result)
3691
3699
branch1 = Branch.open_containing(branch)[0]
3692
3700
branch2 = Branch.open_containing(other)[0]
3694
self.add_cleanup(branch1.unlock)
3696
self.add_cleanup(branch2.unlock)
3701
self.add_cleanup(branch1.lock_read().unlock)
3702
self.add_cleanup(branch2.lock_read().unlock)
3697
3703
last1 = ensure_null(branch1.last_revision())
3698
3704
last2 = ensure_null(branch2.last_revision())
3793
3799
' completely merged into the source, pull from the'
3794
3800
' source rather than merging. When this happens,'
3795
3801
' you do not need to commit the result.'),
3802
custom_help('directory',
3797
3803
help='Branch to merge into, '
3798
'rather than the one containing the working directory.',
3804
'rather than the one containing the working directory.'),
3802
3805
Option('preview', help='Instead of merging, show a diff of the'
3804
3807
Option('interactive', help='Select changes interactively.',
3837
3840
unversioned_filter=tree.is_ignored, view_info=view_info)
3838
3841
pb = ui.ui_factory.nested_progress_bar()
3839
3842
self.add_cleanup(pb.finished)
3841
self.add_cleanup(tree.unlock)
3843
self.add_cleanup(tree.lock_write().unlock)
3842
3844
if location is not None:
3844
3846
mergeable = bundle.read_mergeable_from_url(location,
3905
3907
def _do_preview(self, merger):
3906
3908
from bzrlib.diff import show_diff_trees
3907
3909
result_tree = self._get_preview(merger)
3910
path_encoding = osutils.get_diff_header_encoding()
3908
3911
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
3912
old_label='', new_label='',
3913
path_encoding=path_encoding)
3911
3915
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
3916
merger.change_reporter = change_reporter
4099
4103
from bzrlib.conflicts import restore
4100
4104
if merge_type is None:
4101
4105
merge_type = _mod_merge.Merge3Merger
4102
tree, file_list = tree_files(file_list)
4104
self.add_cleanup(tree.unlock)
4106
tree, file_list = WorkingTree.open_containing_paths(file_list)
4107
self.add_cleanup(tree.lock_write().unlock)
4105
4108
parents = tree.get_parent_ids()
4106
4109
if len(parents) != 2:
4107
4110
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4217
4220
def run(self, revision=None, no_backup=False, file_list=None,
4218
4221
forget_merges=None):
4219
tree, file_list = tree_files(file_list)
4220
tree.lock_tree_write()
4221
self.add_cleanup(tree.unlock)
4222
tree, file_list = WorkingTree.open_containing_paths(file_list)
4223
self.add_cleanup(tree.lock_tree_write().unlock)
4222
4224
if forget_merges:
4223
4225
tree.set_parent_ids(tree.get_parent_ids()[:1])
4313
4315
_see_also = ['merge', 'pull']
4314
4316
takes_args = ['other_branch?']
4315
4317
takes_options = [
4316
4319
Option('reverse', 'Reverse the order of revisions.'),
4317
4320
Option('mine-only',
4318
4321
'Display changes in the local branch only.'),
4340
4343
theirs_only=False,
4341
4344
log_format=None, long=False, short=False, line=False,
4342
4345
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4346
include_merges=False, revision=None, my_revision=None,
4344
4348
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4349
def message(s):
4346
4350
if not is_quiet():
4359
4363
elif theirs_only:
4360
4364
restrict = 'remote'
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4366
local_branch = Branch.open_containing(directory)[0]
4367
self.add_cleanup(local_branch.lock_read().unlock)
4366
4369
parent = local_branch.get_parent()
4367
4370
if other_branch is None:
4378
4381
if remote_branch.base == local_branch.base:
4379
4382
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4384
self.add_cleanup(remote_branch.lock_read().unlock)
4384
4386
local_revid_range = _revision_range_to_revid_range(
4385
4387
_get_revision_range(my_revision, local_branch,
4440
4442
message("Branches are up to date.\n")
4441
4443
self.cleanup_now()
4442
4444
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)
4445
self.add_cleanup(local_branch.lock_write().unlock)
4445
4446
# handle race conditions - a parent might be set while we run.
4446
4447
if local_branch.get_parent() is None:
4447
4448
local_branch.set_parent(remote_branch.base)
4578
4578
Option('long', help='Show commit date in annotations.'),
4582
4583
encoding_type = 'exact'
4584
4585
@display_command
4585
4586
def run(self, filename, all=False, long=False, revision=None,
4587
show_ids=False, directory=None):
4587
4588
from bzrlib.annotate import annotate_file, annotate_file_tree
4588
4589
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4590
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
4591
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4592
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4594
self.add_cleanup(branch.lock_read().unlock)
4596
4595
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4596
self.add_cleanup(tree.lock_read().unlock)
4599
4597
if wt is not None:
4600
4598
file_id = wt.path2id(relpath)
4620
4618
hidden = True # is this right ?
4621
4619
takes_args = ['revision_id*']
4622
takes_options = ['revision']
4620
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
4622
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
4623
if revision_id_list is not None and revision is not None:
4626
4624
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4627
4625
if revision_id_list is None and revision is None:
4628
4626
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)
4627
b = WorkingTree.open_containing(directory)[0].branch
4628
self.add_cleanup(b.lock_write().unlock)
4632
4629
return self._run(b, revision_id_list, revision)
4634
4631
def _run(self, b, revision_id_list, revision):
4694
4691
_see_also = ['checkouts', 'unbind']
4695
4692
takes_args = ['location?']
4693
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4695
def run(self, location=None, directory=u'.'):
4696
b, relpath = Branch.open_containing(directory)
4700
4697
if location is None:
4702
4699
location = b.get_old_bound_location()
4730
4727
_see_also = ['checkouts', 'bind']
4731
4728
takes_args = []
4729
takes_options = ['directory']
4735
b, relpath = Branch.open_containing(u'.')
4731
def run(self, directory=u'.'):
4732
b, relpath = Branch.open_containing(directory)
4736
4733
if not b.unbind():
4737
4734
raise errors.BzrCommandError('Local branch is not bound')
4784
4781
b = control.open_branch()
4786
4783
if tree is not None:
4788
self.add_cleanup(tree.unlock)
4784
self.add_cleanup(tree.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4786
self.add_cleanup(b.lock_write().unlock)
4792
4787
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4794
4789
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4833
4828
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')
4831
if not ui.ui_factory.confirm_action(
4832
'Uncommit these revisions',
4833
'bzrlib.builtins.uncommit',
4835
self.outf.write('Canceled\n')
4840
4838
mutter('Uncommitting from {%s} to {%s}',
4848
4846
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4847
__doc__ = """Break a dead lock.
4849
This command breaks a lock on a repository, branch, working directory or
4851
4852
CAUTION: Locks should only be broken when you are sure that the process
4852
4853
holding the lock has been stopped.
4859
4860
bzr break-lock bzr+ssh://example.com/bzr/foo
4861
bzr break-lock --conf ~/.bazaar
4861
4864
takes_args = ['location?']
4867
help='LOCATION is the directory where the config lock is.'),
4869
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
4872
def run(self, location=None, config=False, force=False):
4864
4873
if location is None:
4865
4874
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
4876
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
4878
{'bzrlib.lockdir.break': True})
4880
conf = _mod_config.LockableConfig(file_name=location)
4883
control, relpath = bzrdir.BzrDir.open_containing(location)
4885
control.break_lock()
4886
except NotImplementedError:
4873
4890
class cmd_wait_until_signalled(Command):
4902
4919
'result in a dynamically allocated port. The default port '
4903
4920
'depends on the protocol.',
4906
help='Serve contents of this directory.',
4922
custom_help('directory',
4923
help='Serve contents of this directory.'),
4908
4924
Option('allow-writes',
4909
4925
help='By default the server is a readonly server. Supplying '
4910
4926
'--allow-writes enables write access to the contents of '
4938
4954
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4939
4955
protocol=None):
4940
from bzrlib.transport import get_transport, transport_server_registry
4956
from bzrlib import transport
4941
4957
if directory is None:
4942
4958
directory = os.getcwd()
4943
4959
if protocol is None:
4944
protocol = transport_server_registry.get()
4960
protocol = transport.transport_server_registry.get()
4945
4961
host, port = self.get_host_and_port(port)
4946
4962
url = urlutils.local_path_to_url(directory)
4947
4963
if not allow_writes:
4948
4964
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
4965
t = transport.get_transport(url)
4966
protocol(t, host, port, inet)
4953
4969
class cmd_join(Command):
4959
4975
not part of it. (Such trees can be produced by "bzr split", but also by
4960
4976
running "bzr branch" with the target inside a tree.)
4962
The result is a combined tree, with the subtree no longer an independant
4978
The result is a combined tree, with the subtree no longer an independent
4963
4979
part. This is marked as a merge of the subtree into the containing tree,
4964
4980
and all history is preserved.
5064
5081
encoding_type = 'exact'
5066
5083
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5067
sign=False, revision=None, mail_to=None, message=None):
5084
sign=False, revision=None, mail_to=None, message=None,
5068
5086
from bzrlib.revision import ensure_null, NULL_REVISION
5069
5087
include_patch, include_bundle = {
5070
5088
'plain': (False, False),
5071
5089
'diff': (True, False),
5072
5090
'bundle': (True, True),
5074
branch = Branch.open('.')
5092
branch = Branch.open(directory)
5075
5093
stored_submit_branch = branch.get_submit_branch()
5076
5094
if submit_branch is None:
5077
5095
submit_branch = stored_submit_branch
5162
5180
given, in which case it is sent to a file.
5164
5182
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.
5183
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
5166
5184
If the preferred client can't be found (or used), your editor will be used.
5168
5186
To use a specific mail program, set the mail_client configuration option.
5339
5357
Option('delete',
5340
5358
help='Delete this tag rather than placing it.',
5343
help='Branch in which to place the tag.',
5360
custom_help('directory',
5361
help='Branch in which to place the tag.'),
5347
5362
Option('force',
5348
5363
help='Replace existing tags.',
5359
5374
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5375
self.add_cleanup(branch.lock_write().unlock)
5363
5377
if tag_name is None:
5364
5378
raise errors.BzrCommandError("No tag specified to delete.")
5365
5379
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5380
note('Deleted tag %s.' % tag_name)
5369
5383
if len(revision) != 1:
5381
5395
if (not force) and branch.tags.has_tag(tag_name):
5382
5396
raise errors.TagAlreadyExists(tag_name)
5383
5397
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5398
note('Created tag %s.' % tag_name)
5387
5401
class cmd_tags(Command):
5393
5407
_see_also = ['tag']
5394
5408
takes_options = [
5396
help='Branch whose tags should be displayed.',
5409
custom_help('directory',
5410
help='Branch whose tags should be displayed.'),
5400
5411
RegistryOption.from_kwargs('sort',
5401
5412
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5413
natural='Sort numeric substrings as numbers:'
5414
' suitable for version numbers. (default)',
5415
alpha='Sort tags lexicographically.',
5403
5416
time='Sort tags chronologically.',
5423
self.add_cleanup(branch.unlock)
5435
self.add_cleanup(branch.lock_read().unlock)
5425
5437
graph = branch.repository.get_graph()
5426
5438
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5428
5440
# only show revisions between revid1 and revid2 (inclusive)
5429
5441
tags = [(tag, revid) for tag, revid in tags if
5430
5442
graph.is_between(revid, revid1, revid2)]
5443
if sort == 'natural':
5444
def natural_sort_key(tag):
5445
return [f(s) for f,s in
5446
zip(itertools.cycle((unicode.lower,int)),
5447
re.split('([0-9]+)', tag[0]))]
5448
tags.sort(key=natural_sort_key)
5449
elif sort == 'alpha':
5433
5451
elif sort == 'time':
5434
5452
timestamps = {}
5575
5593
takes_args = ['to_location?']
5576
takes_options = [Option('force',
5594
takes_options = ['directory',
5577
5596
help='Switch even if local commits will be lost.'),
5579
5598
Option('create-branch', short_name='b',
5584
5603
def run(self, to_location=None, force=False, create_branch=False,
5604
revision=None, directory=u'.'):
5586
5605
from bzrlib import switch
5606
tree_location = directory
5588
5607
revision = _get_one_revision('switch', revision)
5589
5608
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
5609
if to_location is None:
5591
5610
if revision is None:
5592
5611
raise errors.BzrCommandError('You must supply either a'
5593
5612
' revision or a location')
5613
to_location = tree_location
5596
5615
branch = control_dir.open_branch()
5597
5616
had_explicit_nick = branch.get_config().has_explicit_nickname()
5735
tree, file_list = tree_files(file_list, apply_view=False)
5754
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
5756
current_view, view_dict = tree.views.get_view_info()
5737
5757
if name is None:
5738
5758
name = current_view
5886
5907
_see_also = ['unshelve']
5888
5909
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
5910
writer=None, list=False, destroy=False, directory=u'.'):
5891
5912
return self.run_for_list()
5892
5913
from bzrlib.shelf_ui import Shelver
5894
5915
writer = bzrlib.option.diff_writer_registry.get()
5896
5917
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
5918
file_list, message, destroy=destroy, directory=directory)
5905
5926
def run_for_list(self):
5906
5927
tree = WorkingTree.open_containing('.')[0]
5908
self.add_cleanup(tree.unlock)
5928
self.add_cleanup(tree.lock_read().unlock)
5909
5929
manager = tree.get_shelf_manager()
5910
5930
shelves = manager.active_shelves()
5911
5931
if len(shelves) == 0:
5930
5950
takes_args = ['shelf_id?']
5931
5951
takes_options = [
5932
5953
RegistryOption.from_kwargs(
5933
5954
'action', help="The action to perform.",
5934
5955
enum_switch=False, value_switches=True,
5943
5964
_see_also = ['shelve']
5945
def run(self, shelf_id=None, action='apply'):
5966
def run(self, shelf_id=None, action='apply', directory=u'.'):
5946
5967
from bzrlib.shelf_ui import Unshelver
5947
unshelver = Unshelver.from_args(shelf_id, action)
5968
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5949
5970
unshelver.run()
5967
5988
To check what clean-tree will do, use --dry-run.
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5990
takes_options = ['directory',
5991
Option('ignored', help='Delete all ignored files.'),
5970
5992
Option('detritus', help='Delete conflict files, merge'
5971
5993
' backups, and failed selftest dirs.'),
5972
5994
Option('unknown',
5975
5997
' deleting them.'),
5976
5998
Option('force', help='Do not prompt before deleting.')]
5977
5999
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6000
force=False, directory=u'.'):
5979
6001
from bzrlib.clean_tree import clean_tree
5980
6002
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6006
clean_tree(directory, unknown=unknown, ignored=ignored,
6007
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6010
class cmd_reference(Command):
added
removed
bzrlib/builtins.py
