172
178
: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)
180
return WorkingTree.open_containing_paths(
181
file_list, default_directory='.',
223
186
def _get_view_info_for_change_reporter(tree):
310
289
def run(self, show_ids=False, file_list=None, revision=None, short=False,
311
versioned=False, no_pending=False, verbose=False):
290
versioned=False, no_pending=False, verbose=False,
312
292
from bzrlib.status import show_tree_status
314
294
if revision and len(revision) > 2:
315
raise errors.BzrCommandError('bzr status --revision takes exactly'
316
' one or two revision specifiers')
295
raise errors.BzrCommandError(gettext('bzr status --revision takes exactly'
296
' one or two revision specifiers'))
318
tree, relfile_list = tree_files(file_list)
298
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
319
299
# Avoid asking for specific files when that is not needed.
320
300
if relfile_list == ['']:
321
301
relfile_list = None
353
334
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
337
def run(self, revision_id=None, revision=None, directory=u'.'):
357
338
if revision_id is not None and revision is not None:
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
339
raise errors.BzrCommandError(gettext('You can only supply one of'
340
' revision_id or --revision'))
360
341
if revision_id is None and revision is None:
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
342
raise errors.BzrCommandError(gettext('You must supply either'
343
' --revision or a revision_id'))
345
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
347
revisions = b.repository.revisions
366
348
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
349
raise errors.BzrCommandError(gettext('Repository %r does not support '
350
'access to raw revision texts'))
370
352
b.repository.lock_read()
491
476
location_list=['.']
493
478
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
479
d = controldir.ControlDir.open(location)
497
482
working = d.open_workingtree()
498
483
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
484
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
485
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
486
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
487
" of a remote path"))
504
489
if (working.has_changes()):
505
490
raise errors.UncommittedChanges(working)
491
if working.get_shelf_manager().last_shelf() is not None:
492
raise errors.ShelvedChanges(working)
507
494
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
495
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
496
" from a lightweight checkout"))
511
498
d.destroy_workingtree()
501
class cmd_repair_workingtree(Command):
502
__doc__ = """Reset the working tree state file.
504
This is not meant to be used normally, but more as a way to recover from
505
filesystem corruption, etc. This rebuilds the working inventory back to a
506
'known good' state. Any new modifications (adding a file, renaming, etc)
507
will be lost, though modified files will still be detected as such.
509
Most users will want something more like "bzr revert" or "bzr update"
510
unless the state file has become corrupted.
512
By default this attempts to recover the current state by looking at the
513
headers of the state file. If the state file is too corrupted to even do
514
that, you can supply --revision to force the state of the tree.
517
takes_options = ['revision', 'directory',
519
help='Reset the tree even if it doesn\'t appear to be'
524
def run(self, revision=None, directory='.', force=False):
525
tree, _ = WorkingTree.open_containing(directory)
526
self.add_cleanup(tree.lock_tree_write().unlock)
530
except errors.BzrError:
531
pass # There seems to be a real error here, so we'll reset
534
raise errors.BzrCommandError(gettext(
535
'The tree does not appear to be corrupt. You probably'
536
' want "bzr revert" instead. Use "--force" if you are'
537
' sure you want to reset the working tree.'))
541
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
543
tree.reset_state(revision_ids)
544
except errors.BzrError, e:
545
if revision_ids is None:
546
extra = (gettext(', the header appears corrupt, try passing -r -1'
547
' to set the state to the last commit'))
550
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
553
class cmd_revno(Command):
515
554
__doc__ = """Show current revision number.
520
559
_see_also = ['info']
521
560
takes_args = ['location?']
522
561
takes_options = [
523
Option('tree', help='Show revno of working tree'),
562
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
567
def run(self, tree=False, location=u'.', revision=None):
568
if revision is not None and tree:
569
raise errors.BzrCommandError(gettext("--tree and --revision can "
570
"not be used together"))
530
574
wt = WorkingTree.open_containing(location)[0]
575
self.add_cleanup(wt.lock_read().unlock)
532
576
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
577
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
579
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
542
581
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
582
self.add_cleanup(b.lock_read().unlock)
584
if len(revision) != 1:
585
raise errors.BzrCommandError(gettext(
586
"Tags can only be placed on a single revision, "
588
revid = revision[0].as_revision_id(b)
590
revid = b.last_revision()
592
revno_t = b.revision_id_to_dotted_revno(revid)
593
except errors.NoSuchRevision:
595
revno = ".".join(str(n) for n in revno_t)
546
596
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
597
self.outf.write(revno + '\n')
550
600
class cmd_revision_info(Command):
704
756
takes_args = ['dir+']
760
help='No error if existing, make parent directories as needed.',
705
764
encoding_type = 'replace'
707
def run(self, dir_list):
709
wt, dd = WorkingTree.open_containing(d)
710
base = os.path.dirname(dd)
711
id = wt.path2id(base)
715
self.outf.write('added %s\n' % d)
767
def add_file_with_parents(cls, wt, relpath):
768
if wt.path2id(relpath) is not None:
770
cls.add_file_with_parents(wt, osutils.dirname(relpath))
774
def add_file_single(cls, wt, relpath):
777
def run(self, dir_list, parents=False):
779
add_file = self.add_file_with_parents
781
add_file = self.add_file_single
783
wt, relpath = WorkingTree.open_containing(dir)
788
if e.errno != errno.EEXIST:
717
raise errors.NotVersionedError(path=base)
792
add_file(wt, relpath)
794
self.outf.write(gettext('added %s\n') % dir)
720
797
class cmd_relpath(Command):
757
834
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
758
835
if kind and kind not in ['file', 'directory', 'symlink']:
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
836
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
761
838
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)
839
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
840
self.add_cleanup(work_tree.lock_read().unlock)
765
841
if revision is not None:
766
842
tree = revision.as_tree(work_tree.branch)
768
844
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
845
self.add_cleanup(tree.lock_read().unlock)
828
904
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
906
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
907
if names_list is None:
833
909
if len(names_list) < 2:
834
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)
910
raise errors.BzrCommandError(gettext("missing file argument"))
911
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
912
for file_name in rel_names[0:-1]:
914
raise errors.BzrCommandError(gettext("can not move root of branch"))
915
self.add_cleanup(tree.lock_tree_write().unlock)
838
916
self._run(tree, names_list, rel_names, after)
840
918
def run_auto(self, names_list, after, dry_run):
841
919
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
920
raise errors.BzrCommandError(gettext('Only one path may be specified to'
845
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)
923
raise errors.BzrCommandError(gettext('--after cannot be specified with'
925
work_tree, file_list = WorkingTree.open_containing_paths(
926
names_list, default_directory='.')
927
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
928
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
930
def _run(self, tree, names_list, rel_names, after):
946
1024
match the remote one, use pull --overwrite. This will work even if the two
947
1025
branches have diverged.
949
If there is no default location set, the first pull will set it. After
950
that, you can omit the location to use the default. To change the
951
default, use --remember. The value will only be saved if the remote
952
location can be accessed.
1027
If there is no default location set, the first pull will set it (use
1028
--no-remember to avoid setting it). After that, you can omit the
1029
location to use the default. To change the default, use --remember. The
1030
value will only be saved if the remote location can be accessed.
1032
The --verbose option will display the revisions pulled using the log_format
1033
configuration option. You can use a different format by overriding it with
1034
-Olog_format=<other_format>.
954
1036
Note: The location can be specified either in the form of a branch,
955
1037
or in the form of a path to a file containing a merge directive generated
960
1042
takes_options = ['remember', 'overwrite', 'revision',
961
1043
custom_help('verbose',
962
1044
help='Show logs of pulled revisions.'),
1045
custom_help('directory',
964
1046
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
1047
'rather than the one containing the working directory.'),
970
1049
help="Perform a local pull in a bound "
971
1050
"branch. Local pulls are not applied to "
972
1051
"the master branch."
1054
help="Show base revision text in conflicts.")
975
1056
takes_args = ['location?']
976
1057
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1059
def run(self, location=None, remember=None, overwrite=False,
979
1060
revision=None, verbose=False,
980
directory=None, local=False):
1061
directory=None, local=False,
981
1063
# FIXME: too much stuff is in the command class
982
1064
revision_id = None
983
1065
mergeable = None
1077
1164
do a merge (see bzr help merge) from the other branch, and commit that.
1078
1165
After that you will be able to do a push without '--overwrite'.
1080
If there is no default push location set, the first push will set it.
1081
After that, you can omit the location to use the default. To change the
1082
default, use --remember. The value will only be saved if the remote
1083
location can be accessed.
1167
If there is no default push location set, the first push will set it (use
1168
--no-remember to avoid setting it). After that, you can omit the
1169
location to use the default. To change the default, use --remember. The
1170
value will only be saved if the remote location can be accessed.
1172
The --verbose option will display the revisions pushed using the log_format
1173
configuration option. You can use a different format by overriding it with
1174
-Olog_format=<other_format>.
1086
1177
_see_also = ['pull', 'update', 'working-trees']
1110
1198
Option('strict',
1111
1199
help='Refuse to push if there are uncommitted changes in'
1112
1200
' the working tree, --no-strict disables the check.'),
1202
help="Don't populate the working tree, even for protocols"
1203
" that support it."),
1114
1205
takes_args = ['location?']
1115
1206
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1208
def run(self, location=None, remember=None, overwrite=False,
1118
1209
create_prefix=False, verbose=False, revision=None,
1119
1210
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1211
stacked=False, strict=None, no_tree=False):
1121
1212
from bzrlib.push import _show_push_branch
1123
1214
if directory is None:
1124
1215
directory = '.'
1125
1216
# Get the source branch
1126
1217
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1218
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1128
1219
# Get the tip's revision_id
1129
1220
revision = _get_one_revision('push', revision)
1130
1221
if revision is not None:
1151
1242
# error by the feedback given to them. RBC 20080227.
1152
1243
stacked_on = parent_url
1153
1244
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1245
raise errors.BzrCommandError(gettext(
1246
"Could not determine branch to refer to."))
1157
1248
# Get the destination location
1158
1249
if location is None:
1159
1250
stored_loc = br_from.get_push_location()
1160
1251
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1252
raise errors.BzrCommandError(gettext(
1253
"No push location known or specified."))
1164
1255
display_url = urlutils.unescape_for_display(stored_loc,
1165
1256
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1257
note(gettext("Using saved push location: %s") % display_url)
1167
1258
location = stored_loc
1169
1260
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1261
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1262
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1263
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1266
class cmd_branch(Command):
1214
1309
def run(self, from_location, to_location=None, revision=None,
1215
1310
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1311
use_existing_dir=False, switch=False, bind=False,
1217
1313
from bzrlib import switch as _mod_switch
1218
1314
from bzrlib.tag import _merge_tags_if_possible
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1315
if self.invoked_as in ['get', 'clone']:
1316
ui.ui_factory.show_user_warning(
1317
'deprecated_command',
1318
deprecated_name=self.invoked_as,
1319
recommended_name='branch',
1320
deprecated_in_version='2.4')
1321
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1323
if not (hardlink or files_from):
1324
# accelerator_tree is usually slower because you have to read N
1325
# files (no readahead, lots of seeks, etc), but allow the user to
1326
# explicitly request it
1327
accelerator_tree = None
1328
if files_from is not None and files_from != from_location:
1329
accelerator_tree = WorkingTree.open(files_from)
1221
1330
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1331
self.add_cleanup(br_from.lock_read().unlock)
1224
1332
if revision is not None:
1225
1333
revision_id = revision.as_revision_id(br_from)
1230
1338
revision_id = br_from.last_revision()
1231
1339
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1340
to_location = getattr(br_from, "name", None)
1341
if to_location is None:
1342
to_location = urlutils.derive_to_location(from_location)
1233
1343
to_transport = transport.get_transport(to_location)
1235
1345
to_transport.mkdir('.')
1236
1346
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1348
to_dir = controldir.ControlDir.open_from_transport(
1350
except errors.NotBranchError:
1351
if not use_existing_dir:
1352
raise errors.BzrCommandError(gettext('Target directory "%s" '
1353
'already exists.') % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1358
to_dir.open_branch()
1243
1359
except errors.NotBranchError:
1246
1362
raise errors.AlreadyBranchError(to_location)
1247
1363
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1364
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1264
raise errors.BzrCommandError(msg)
1370
# preserve whatever source format we have.
1371
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1372
possible_transports=[to_transport],
1373
accelerator_tree=accelerator_tree,
1374
hardlink=hardlink, stacked=stacked,
1375
force_new_repo=standalone,
1376
create_tree_if_local=not no_tree,
1377
source_branch=br_from)
1378
branch = to_dir.open_branch(
1379
possible_transports=[
1380
br_from.bzrdir.root_transport, to_transport])
1381
except errors.NoSuchRevision:
1382
to_transport.delete_tree('.')
1383
msg = gettext("The branch {0} has no revision {1}.").format(
1384
from_location, revision)
1385
raise errors.BzrCommandError(msg)
1387
branch = br_from.sprout(to_dir, revision_id=revision_id)
1265
1388
_merge_tags_if_possible(br_from, branch)
1266
1389
# If the source branch is stacked, the new branch may
1267
1390
# be stacked whether we asked for that explicitly or not.
1268
1391
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1393
note(gettext('Created new stacked branch referring to %s.') %
1271
1394
branch.get_stacked_on_url())
1272
1395
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
1396
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1397
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1399
# Bind to the parent
1277
1400
parent_branch = Branch.open(from_location)
1278
1401
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1402
note(gettext('New branch bound to %s') % from_location)
1281
1404
# Switch to the new branch
1282
1405
wt, _ = WorkingTree.open_containing('.')
1283
1406
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1407
note(gettext('Switched to branch: %s'),
1285
1408
urlutils.unescape_for_display(branch.base, 'utf-8'))
1411
class cmd_branches(Command):
1412
__doc__ = """List the branches available at the current location.
1414
This command will print the names of all the branches at the current
1418
takes_args = ['location?']
1420
Option('recursive', short_name='R',
1421
help='Recursively scan for branches rather than '
1422
'just looking in the specified location.')]
1424
def run(self, location=".", recursive=False):
1426
t = transport.get_transport(location)
1427
if not t.listable():
1428
raise errors.BzrCommandError(
1429
"Can't scan this type of location.")
1430
for b in controldir.ControlDir.find_branches(t):
1431
self.outf.write("%s\n" % urlutils.unescape_for_display(
1432
urlutils.relative_url(t.base, b.base),
1433
self.outf.encoding).rstrip("/"))
1435
dir = controldir.ControlDir.open_containing(location)[0]
1436
for branch in dir.list_branches():
1437
if branch.name is None:
1438
self.outf.write(gettext(" (default)\n"))
1440
self.outf.write(" %s\n" % branch.name.encode(
1441
self.outf.encoding))
1288
1444
class cmd_checkout(Command):
1289
1445
__doc__ = """Create a new checkout of an existing branch.
1389
1548
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1392
This will perform a merge into the working tree, and may generate
1393
conflicts. If you have any local changes, you will still
1394
need to commit them after the update for the update to be complete.
1396
If you want to discard your local changes, you can just do a
1397
'bzr revert' instead of 'bzr commit' after the update.
1399
If the tree's branch is bound to a master branch, it will also update
1549
__doc__ = """Update a working tree to a new revision.
1551
This will perform a merge of the destination revision (the tip of the
1552
branch, or the specified revision) into the working tree, and then make
1553
that revision the basis revision for the working tree.
1555
You can use this to visit an older revision, or to update a working tree
1556
that is out of date from its branch.
1558
If there are any uncommitted changes in the tree, they will be carried
1559
across and remain as uncommitted changes after the update. To discard
1560
these changes, use 'bzr revert'. The uncommitted changes may conflict
1561
with the changes brought in by the change in basis revision.
1563
If the tree's branch is bound to a master branch, bzr will also update
1400
1564
the branch from the master.
1566
You cannot update just a single file or directory, because each Bazaar
1567
working tree has just a single basis revision. If you want to restore a
1568
file that has been removed locally, use 'bzr revert' instead of 'bzr
1569
update'. If you want to restore a file to its state in a previous
1570
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1571
out the old content of that file to a new location.
1573
The 'dir' argument, if given, must be the location of the root of a
1574
working tree to update. By default, the working tree that contains the
1575
current working directory is used.
1403
1578
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1579
takes_args = ['dir?']
1405
takes_options = ['revision']
1580
takes_options = ['revision',
1582
help="Show base revision text in conflicts."),
1406
1584
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1586
def run(self, dir=None, revision=None, show_base=None):
1409
1587
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1412
tree = WorkingTree.open_containing(dir)[0]
1588
raise errors.BzrCommandError(gettext(
1589
"bzr update --revision takes exactly one revision"))
1591
tree = WorkingTree.open_containing('.')[0]
1593
tree, relpath = WorkingTree.open_containing(dir)
1596
raise errors.BzrCommandError(gettext(
1597
"bzr update can only update a whole tree, "
1598
"not a file or subdirectory"))
1413
1599
branch = tree.branch
1414
1600
possible_transports = []
1415
1601
master = branch.get_master_branch(
1416
1602
possible_transports=possible_transports)
1417
1603
if master is not None:
1419
1604
branch_location = master.base
1607
branch_location = tree.branch.base
1421
1608
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1609
self.add_cleanup(tree.unlock)
1424
1610
# get rid of the final '/' and be ready for display
1425
1611
branch_location = urlutils.unescape_for_display(
1451
1637
change_reporter,
1452
1638
possible_transports=possible_transports,
1453
1639
revision=revision_id,
1641
show_base=show_base)
1455
1642
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1643
raise errors.BzrCommandError(gettext(
1457
1644
"branch has no revision %s\n"
1458
1645
"bzr update --revision only works"
1459
" for a revision in the branch history"
1646
" for a revision in the branch history")
1460
1647
% (e.revision))
1461
1648
revno = tree.branch.revision_id_to_dotted_revno(
1462
1649
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1650
note(gettext('Updated to revision {0} of branch {1}').format(
1651
'.'.join(map(str, revno)), branch_location))
1465
1652
parent_ids = tree.get_parent_ids()
1466
1653
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1654
note(gettext('Your local commits will now show as pending merges with '
1655
"'bzr status', and can be committed with 'bzr commit'."))
1469
1656
if conflicts != 0:
1513
1700
noise_level = 0
1514
1701
from bzrlib.info import show_bzrdir_info
1515
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1702
show_bzrdir_info(controldir.ControlDir.open_containing(location)[0],
1516
1703
verbose=noise_level, outfile=self.outf)
1519
1706
class cmd_remove(Command):
1520
1707
__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.
1709
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1710
delete them if they can easily be recovered using revert otherwise they
1711
will be backed up (adding an extention of the form .~#~). If no options or
1712
parameters are given Bazaar will scan for files that are being tracked by
1713
Bazaar but missing in your tree and stop tracking them for you.
1527
1715
takes_args = ['file*']
1528
1716
takes_options = ['verbose',
1530
1718
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1719
'The file deletion mode to be used.',
1532
1720
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1721
safe='Backup changed files (default).',
1535
1722
keep='Delete from bzr but leave the working copy.',
1723
no_backup='Don\'t backup changed files.',
1536
1724
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1725
'recovered and even if they are non-empty directories. '
1726
'(deprecated, use no-backup)')]
1538
1727
aliases = ['rm', 'del']
1539
1728
encoding_type = 'replace'
1541
1730
def run(self, file_list, verbose=False, new=False,
1542
1731
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1732
if file_deletion_strategy == 'force':
1733
note(gettext("(The --force option is deprecated, rather use --no-backup "
1735
file_deletion_strategy = 'no-backup'
1737
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1739
if file_list is not None:
1546
1740
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1742
self.add_cleanup(tree.lock_write().unlock)
1550
1743
# Heuristics should probably all move into tree.remove_smart or
1716
1923
help='Specify a format for this branch. '
1717
1924
'See "help formats".',
1718
1925
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1719
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1926
converter=lambda name: controldir.format_registry.make_bzrdir(name),
1720
1927
value_switches=True,
1721
1928
title="Branch format",
1723
1930
Option('append-revisions-only',
1724
1931
help='Never change revnos or the existing log.'
1725
' Append revisions to it only.')
1932
' Append revisions to it only.'),
1934
'Create a branch without a working tree.')
1727
1936
def run(self, location=None, format=None, append_revisions_only=False,
1728
create_prefix=False):
1937
create_prefix=False, no_tree=False):
1729
1938
if format is None:
1730
format = bzrdir.format_registry.make_bzrdir('default')
1939
format = controldir.format_registry.make_bzrdir('default')
1731
1940
if location is None:
1732
1941
location = u'.'
1742
1951
to_transport.ensure_base()
1743
1952
except errors.NoSuchFile:
1744
1953
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
1954
raise errors.BzrCommandError(gettext("Parent directory of %s"
1746
1955
" does not exist."
1747
1956
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
1957
" leading parent directories.")
1750
1959
to_transport.create_prefix()
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1962
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1754
1963
except errors.NotBranchError:
1755
1964
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
1965
create_branch = controldir.ControlDir.create_branch_convenience
1967
force_new_tree = False
1969
force_new_tree = None
1757
1970
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
1971
possible_transports=[to_transport],
1972
force_new_tree=force_new_tree)
1759
1973
a_bzrdir = branch.bzrdir
1761
1975
from bzrlib.transport.local import LocalTransport
1969
2202
elif ':' in prefix:
1970
2203
old_label, new_label = prefix.split(":")
1972
raise errors.BzrCommandError(
2205
raise errors.BzrCommandError(gettext(
1973
2206
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2207
' (eg "old/:new/")'))
1976
2209
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2210
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2211
' one or two revision specifiers'))
1980
2213
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2214
raise errors.BzrCommandError(gettext(
2215
'{0} and {1} are mutually exclusive').format(
2216
'--using', '--format'))
1984
2218
(old_tree, new_tree,
1985
2219
old_branch, new_branch,
1986
2220
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2221
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2222
# GNU diff on Windows uses ANSI encoding for filenames
2223
path_encoding = osutils.get_diff_header_encoding()
1988
2224
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2225
specific_files=specific_files,
1990
2226
external_diff_options=diff_options,
1991
2227
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2228
extra_trees=extra_trees,
2229
path_encoding=path_encoding,
1993
2231
format_cls=format)
2003
2241
# level of effort but possibly much less IO. (Or possibly not,
2004
2242
# if the directories are very large...)
2005
2243
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
2244
takes_options = ['directory', 'show-ids']
2008
2246
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2247
def run(self, show_ids=False, directory=u'.'):
2248
tree = WorkingTree.open_containing(directory)[0]
2249
self.add_cleanup(tree.lock_read().unlock)
2013
2250
old = tree.basis_tree()
2015
self.add_cleanup(old.unlock)
2251
self.add_cleanup(old.lock_read().unlock)
2016
2252
for path, ie in old.inventory.iter_entries():
2017
2253
if not tree.has_id(ie.file_id):
2018
2254
self.outf.write(path)
2053
2287
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2288
takes_options = ['directory', 'null']
2060
2290
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2291
def run(self, null=False, directory=u'.'):
2292
wt = WorkingTree.open_containing(directory)[0]
2293
self.add_cleanup(wt.lock_read().unlock)
2065
2294
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2295
self.add_cleanup(basis.lock_read().unlock)
2068
2296
basis_inv = basis.inventory
2069
2297
inv = wt.inventory
2070
2298
for file_id in inv:
2071
if file_id in basis_inv:
2299
if basis_inv.has_id(file_id):
2073
2301
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2303
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2304
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2307
self.outf.write(path + '\0')
2297
2533
Option('show-diff',
2298
2534
short_name='p',
2299
2535
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2536
Option('include-merged',
2301
2537
help='Show merged revisions like --levels 0 does.'),
2538
Option('include-merges', hidden=True,
2539
help='Historical alias for --include-merged.'),
2540
Option('omit-merges',
2541
help='Do not report commits with more than one parent.'),
2302
2542
Option('exclude-common-ancestry',
2303
2543
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2544
' of both ancestries (require -rX..Y).'
2546
Option('signatures',
2547
help='Show digital signature validity.'),
2550
help='Show revisions whose properties match this '
2553
ListOption('match-message',
2554
help='Show revisions whose message matches this '
2557
ListOption('match-committer',
2558
help='Show revisions whose committer matches this '
2561
ListOption('match-author',
2562
help='Show revisions whose authors match this '
2565
ListOption('match-bugs',
2566
help='Show revisions whose bugs match this '
2307
2570
encoding_type = 'replace'
2327
2599
_get_info_for_log_files,
2329
2601
direction = (forward and 'forward') or 'reverse'
2602
if symbol_versioning.deprecated_passed(include_merges):
2603
ui.ui_factory.show_user_warning(
2604
'deprecated_command_option',
2605
deprecated_name='--include-merges',
2606
recommended_name='--include-merged',
2607
deprecated_in_version='2.5',
2608
command=self.invoked_as)
2609
if include_merged is None:
2610
include_merged = include_merges
2612
raise errors.BzrCommandError(gettext(
2613
'{0} and {1} are mutually exclusive').format(
2614
'--include-merges', '--include-merged'))
2615
if include_merged is None:
2616
include_merged = False
2330
2617
if (exclude_common_ancestry
2331
2618
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2619
raise errors.BzrCommandError(gettext(
2620
'--exclude-common-ancestry requires -r with two revisions'))
2335
2622
if levels is None:
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2625
raise errors.BzrCommandError(gettext(
2626
'{0} and {1} are mutually exclusive').format(
2627
'--levels', '--include-merged'))
2341
2629
if change is not None:
2342
2630
if len(change) > 1:
2343
2631
raise errors.RangeInChangeOption()
2344
2632
if revision is not None:
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2633
raise errors.BzrCommandError(gettext(
2634
'{0} and {1} are mutually exclusive').format(
2635
'--revision', '--change'))
2348
2637
revision = change
2528
2835
help='Recurse into subdirectories.'),
2529
2836
Option('from-root',
2530
2837
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2838
Option('unknown', short_name='u',
2839
help='Print unknown files.'),
2532
2840
Option('versioned', help='Print versioned files.',
2533
2841
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.'),
2842
Option('ignored', short_name='i',
2843
help='Print ignored files.'),
2844
Option('kind', short_name='k',
2539
2845
help='List entries of a particular kind: file, directory, symlink.',
2543
2851
@display_command
2544
2852
def run(self, revision=None, verbose=False,
2545
2853
recursive=False, from_root=False,
2546
2854
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2855
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2857
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2858
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
2860
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2861
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
2862
all = not (unknown or versioned or ignored)
2556
2864
selection = {'I':ignored, '?':unknown, 'V':versioned}
2725
3043
self.outf.write("%s\n" % pattern)
2727
3045
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3046
raise errors.BzrCommandError(gettext("ignore requires at least one "
3047
"NAME_PATTERN or --default-rules."))
2730
3048
name_pattern_list = [globbing.normalize_pattern(p)
2731
3049
for p in name_pattern_list]
3051
bad_patterns_count = 0
3052
for p in name_pattern_list:
3053
if not globbing.Globster.is_pattern_valid(p):
3054
bad_patterns_count += 1
3055
bad_patterns += ('\n %s' % p)
3057
msg = (ngettext('Invalid ignore pattern found. %s',
3058
'Invalid ignore patterns found. %s',
3059
bad_patterns_count) % bad_patterns)
3060
ui.ui_factory.show_error(msg)
3061
raise errors.InvalidPattern('')
2732
3062
for name_pattern in name_pattern_list:
2733
3063
if (name_pattern[0] == '/' or
2734
3064
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
raise errors.BzrCommandError(
2736
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
3065
raise errors.BzrCommandError(gettext(
3066
"NAME_PATTERN should not be an absolute path"))
3067
tree, relpath = WorkingTree.open_containing(directory)
2738
3068
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3069
ignored = globbing.Globster(name_pattern_list)
3071
self.add_cleanup(tree.lock_read().unlock)
2742
3072
for entry in tree.list_files():
2744
3074
if id is not None:
2745
3075
filename = entry[0]
2746
3076
if ignored.match(filename):
2747
3077
matches.append(filename)
2749
3078
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3079
self.outf.write(gettext("Warning: the following files are version "
3080
"controlled and match your ignore pattern:\n%s"
2752
3081
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3082
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2756
3085
class cmd_ignored(Command):
2842
3173
Option('per-file-timestamps',
2843
3174
help='Set modification time of files to that of the last '
2844
3175
'revision in which it was changed.'),
3176
Option('uncommitted',
3177
help='Export the working tree contents rather than that of the '
2846
3180
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
3181
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2848
3183
from bzrlib.export import export
2850
3185
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
3186
branch_or_subdir = directory
3188
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3190
if tree is not None:
3191
self.add_cleanup(tree.lock_read().unlock)
3195
raise errors.BzrCommandError(
3196
gettext("--uncommitted requires a working tree"))
2855
b, subdir = Branch.open_containing(branch_or_subdir)
2858
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3199
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3201
export(export_tree, dest, format, root, subdir, filtered=filters,
2861
3202
per_file_timestamps=per_file_timestamps)
2862
3203
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3204
raise errors.BzrCommandError(
3205
gettext('Unsupported export format: %s') % e.format)
2866
3208
class cmd_cat(Command):
2885
3227
@display_command
2886
3228
def run(self, filename, revision=None, name_from_revision=False,
3229
filters=False, directory=None):
2888
3230
if revision is not None and len(revision) != 1:
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3231
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3232
" one revision specifier"))
2891
3233
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3234
_open_directory_or_containing_tree_or_branch(filename, directory)
3235
self.add_cleanup(branch.lock_read().unlock)
2895
3236
return self._run(tree, branch, relpath, filename, revision,
2896
3237
name_from_revision, filters)
2900
3241
if tree is None:
2901
3242
tree = b.basis_tree()
2902
3243
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3244
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3246
old_file_id = rev_tree.path2id(relpath)
3248
# TODO: Split out this code to something that generically finds the
3249
# best id for a path across one or more trees; it's like
3250
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3252
if name_from_revision:
2909
3253
# Try in revision if requested
2910
3254
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3255
raise errors.BzrCommandError(gettext(
3256
"{0!r} is not present in revision {1}").format(
2913
3257
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3259
actual_file_id = old_file_id
2917
3261
cur_file_id = tree.path2id(relpath)
2919
if cur_file_id is not None:
2920
# Then try with the actual file id
2922
content = rev_tree.get_file_text(cur_file_id)
2924
except errors.NoSuchId:
2925
# The actual file id didn't exist at that time
2927
if not found and old_file_id is not None:
2928
# Finally try with the old file id
2929
content = rev_tree.get_file_text(old_file_id)
2932
# Can't be found anywhere
2933
raise errors.BzrCommandError(
2934
"%r is not present in revision %s" % (
3262
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3263
actual_file_id = cur_file_id
3264
elif old_file_id is not None:
3265
actual_file_id = old_file_id
3267
raise errors.BzrCommandError(gettext(
3268
"{0!r} is not present in revision {1}").format(
2935
3269
filename, rev_tree.get_revision_id()))
2937
from bzrlib.filters import (
2938
ContentFilterContext,
2939
filtered_output_bytes,
2941
filters = rev_tree._content_filter_stack(relpath)
2942
chunks = content.splitlines(True)
2943
content = filtered_output_bytes(chunks, filters,
2944
ContentFilterContext(relpath, rev_tree))
2946
self.outf.writelines(content)
3271
from bzrlib.filter_tree import ContentFilterTree
3272
filter_tree = ContentFilterTree(rev_tree,
3273
rev_tree._content_filter_stack)
3274
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3276
content = rev_tree.get_file_text(actual_file_id)
3278
self.outf.write(content)
2952
3281
class cmd_local_time_offset(Command):
3013
3342
to trigger updates to external systems like bug trackers. The --fixes
3014
3343
option can be used to record the association between a revision and
3015
3344
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3034
# TODO: Run hooks on tree to-be-committed, and after commit.
3036
# TODO: Strict commit that fails if there are deleted files.
3037
# (what does "deleted files" mean ??)
3039
# TODO: Give better message for -s, --summary, used by tla people
3041
# XXX: verbose currently does nothing
3043
3347
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3348
takes_args = ['selected*']
3076
3380
Option('show-diff', short_name='p',
3077
3381
help='When no message is supplied, show the diff along'
3078
3382
' with the status summary in the message editor.'),
3384
help='When committing to a foreign version control '
3385
'system do not push data that can not be natively '
3080
3388
aliases = ['ci', 'checkin']
3082
3390
def _iter_bug_fix_urls(self, fixes, branch):
3391
default_bugtracker = None
3083
3392
# Configure the properties for bug fixing attributes.
3084
3393
for fixed_bug in fixes:
3085
3394
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3395
if len(tokens) == 1:
3396
if default_bugtracker is None:
3397
branch_config = branch.get_config()
3398
default_bugtracker = branch_config.get_user_option(
3400
if default_bugtracker is None:
3401
raise errors.BzrCommandError(gettext(
3402
"No tracker specified for bug %s. Use the form "
3403
"'tracker:id' or specify a default bug tracker "
3404
"using the `bugtracker` option.\nSee "
3405
"\"bzr help bugs\" for more information on this "
3406
"feature. Commit refused.") % fixed_bug)
3407
tag = default_bugtracker
3409
elif len(tokens) != 2:
3410
raise errors.BzrCommandError(gettext(
3088
3411
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
3412
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3413
"feature.\nCommit refused.") % fixed_bug)
3415
tag, bug_id = tokens
3093
3417
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
3418
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3419
raise errors.BzrCommandError(gettext(
3420
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3097
3421
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3422
raise errors.BzrCommandError(gettext(
3423
"%s\nCommit refused.") % (str(e),))
3101
3425
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3426
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3427
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3429
from bzrlib.errors import (
3105
3430
PointlessCommit,
3106
3431
ConflictsInTree,
3184
3507
# make_commit_message_template_encoded returns user encoding.
3185
3508
# We probably want to be using edit_commit_message instead to
3187
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3189
start_message=start_message)
3190
if my_message is None:
3191
raise errors.BzrCommandError("please specify a commit"
3192
" message with either --message or --file")
3193
if my_message == "":
3194
raise errors.BzrCommandError("empty commit message specified")
3510
my_message = set_commit_message(commit_obj)
3511
if my_message is None:
3512
start_message = generate_commit_message_template(commit_obj)
3513
my_message = edit_commit_message_encoded(text,
3514
start_message=start_message)
3515
if my_message is None:
3516
raise errors.BzrCommandError(gettext("please specify a commit"
3517
" message with either --message or --file"))
3518
if my_message == "":
3519
raise errors.BzrCommandError(gettext("Empty commit message specified."
3520
" Please specify a commit message with either"
3521
" --message or --file or leave a blank message"
3522
" with --message \"\"."))
3195
3523
return my_message
3197
3525
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3533
reporter=None, verbose=verbose, revprops=properties,
3206
3534
authors=author, timestamp=commit_stamp,
3207
3535
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3536
exclude=tree.safe_relpath_files(exclude),
3209
3538
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3539
raise errors.BzrCommandError(gettext("No changes to commit."
3540
" Please 'bzr add' the files you want to commit, or use"
3541
" --unchanged to force an empty commit."))
3212
3542
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3543
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3214
3544
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3216
3546
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3547
raise errors.BzrCommandError(gettext("Commit refused because there are"
3548
" unknown files in the working tree."))
3219
3549
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3550
e.extra_help = (gettext("\n"
3221
3551
'To commit to master branch, run update and then commit.\n'
3222
3552
'You can also pass --local to commit to continue working '
3297
3627
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
3300
The check command or bzr developers may sometimes advise you to run
3301
this command. When the default format has changed you may also be warned
3302
during other operations to upgrade.
3628
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3630
When the default format has changed after a major new release of
3631
Bazaar, you may be informed during certain operations that you
3632
should upgrade. Upgrading to a newer format may improve performance
3633
or make new features available. It may however limit interoperability
3634
with older repositories or with older versions of Bazaar.
3636
If you wish to upgrade to a particular format rather than the
3637
current default, that can be specified using the --format option.
3638
As a consequence, you can use the upgrade command this way to
3639
"downgrade" to an earlier format, though some conversions are
3640
a one way process (e.g. changing from the 1.x default to the
3641
2.x default) so downgrading is not always possible.
3643
A backup.bzr.~#~ directory is created at the start of the conversion
3644
process (where # is a number). By default, this is left there on
3645
completion. If the conversion fails, delete the new .bzr directory
3646
and rename this one back in its place. Use the --clean option to ask
3647
for the backup.bzr directory to be removed on successful conversion.
3648
Alternatively, you can delete it by hand if everything looks good
3651
If the location given is a shared repository, dependent branches
3652
are also converted provided the repository converts successfully.
3653
If the conversion of a branch fails, remaining branches are still
3656
For more information on upgrades, see the Bazaar Upgrade Guide,
3657
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3660
_see_also = ['check', 'reconcile', 'formats']
3306
3661
takes_args = ['url?']
3307
3662
takes_options = [
3308
RegistryOption('format',
3309
help='Upgrade to a specific format. See "bzr help'
3310
' formats" for details.',
3311
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3312
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3313
value_switches=True, title='Branch format'),
3663
RegistryOption('format',
3664
help='Upgrade to a specific format. See "bzr help'
3665
' formats" for details.',
3666
lazy_registry=('bzrlib.controldir', 'format_registry'),
3667
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3668
value_switches=True, title='Branch format'),
3670
help='Remove the backup.bzr directory if successful.'),
3672
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3675
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3676
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3677
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3679
if len(exceptions) == 1:
3680
# Compatibility with historical behavior
3321
3686
class cmd_whoami(Command):
3340
3706
encoding_type = 'replace'
3342
3708
@display_command
3343
def run(self, email=False, branch=False, name=None):
3709
def run(self, email=False, branch=False, name=None, directory=None):
3344
3710
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()
3711
if directory is None:
3712
# use branch if we're inside one; otherwise global config
3714
c = Branch.open_containing(u'.')[0].get_config_stack()
3715
except errors.NotBranchError:
3716
c = _mod_config.GlobalStack()
3718
c = Branch.open(directory).get_config_stack()
3719
identity = c.get('email')
3351
self.outf.write(c.user_email() + '\n')
3721
self.outf.write(_mod_config.extract_email_address(identity)
3353
self.outf.write(c.username() + '\n')
3724
self.outf.write(identity + '\n')
3728
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3731
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3733
_mod_config.extract_email_address(name)
3359
3734
except errors.NoEmailInUsername, e:
3360
3735
warning('"%s" does not seem to contain an email address. '
3361
3736
'This is allowed, but not recommended.', name)
3363
3738
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3740
if directory is None:
3741
c = Branch.open_containing(u'.')[0].get_config_stack()
3743
c = Branch.open(directory).get_config_stack()
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3745
c = _mod_config.GlobalStack()
3746
c.set('email', name)
3371
3749
class cmd_nick(Command):
3586
3969
def run(self, testspecs_list=None, verbose=False, one=False,
3587
3970
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
3972
first=False, list_only=False,
3590
3973
randomize=None, exclude=None, strict=False,
3591
3974
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
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)
3975
parallel=None, lsprof_tests=False,
3977
from bzrlib import tests
3602
3979
if testspecs_list is not None:
3603
3980
pattern = '|'.join(testspecs_list)
3608
3985
from bzrlib.tests import SubUnitBzrRunner
3609
3986
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3987
raise errors.BzrCommandError(gettext("subunit not available. subunit "
3988
"needs to be installed to use --subunit."))
3612
3989
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3990
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3991
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3992
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3993
# following code can be deleted when it's sufficiently deployed
3994
# -- vila/mgz 20100514
3995
if (sys.platform == "win32"
3996
and getattr(sys.stdout, 'fileno', None) is not None):
3617
3998
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
4000
self.additional_selftest_args.setdefault(
3620
4001
'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)
4003
raise errors.BzrCommandError(gettext(
4004
"--benchmark is no longer supported from bzr 2.2; "
4005
"use bzr-usertest instead"))
4006
test_suite_factory = None
4008
exclude_pattern = None
3629
test_suite_factory = None
4010
exclude_pattern = '(' + '|'.join(exclude) + ')'
4012
self._disable_fsync()
3631
4013
selftest_kwargs = {"verbose": verbose,
3632
4014
"pattern": pattern,
3633
4015
"stop_on_failure": one,
3635
4017
"test_suite_factory": test_suite_factory,
3636
4018
"lsprof_timed": lsprof_timed,
3637
4019
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
4020
"matching_tests_first": first,
3640
4021
"list_only": list_only,
3641
4022
"random_seed": randomize,
3642
"exclude_pattern": exclude,
4023
"exclude_pattern": exclude_pattern,
3643
4024
"strict": strict,
3644
4025
"load_list": load_list,
3645
4026
"debug_flags": debugflag,
3646
4027
"starting_with": starting_with
3648
4029
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
4031
# Make deprecation warnings visible, unless -Werror is set
4032
cleanup = symbol_versioning.activate_deprecation_warnings(
4035
result = tests.selftest(**selftest_kwargs)
3650
4038
return int(not result)
4040
def _disable_fsync(self):
4041
"""Change the 'os' functionality to not synchronize."""
4042
self._orig_fsync = getattr(os, 'fsync', None)
4043
if self._orig_fsync is not None:
4044
os.fsync = lambda filedes: None
4045
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4046
if self._orig_fdatasync is not None:
4047
os.fdatasync = lambda filedes: None
3653
4050
class cmd_version(Command):
3654
4051
__doc__ = """Show version of bzr."""
3709
4104
The source of the merge can be specified either in the form of a branch,
3710
4105
or in the form of a path to a file containing a merge directive generated
3711
4106
with bzr send. If neither is specified, the default is the upstream branch
3712
or the branch most recently merged using --remember.
3714
When merging a branch, by default the tip will be merged. To pick a different
3715
revision, pass --revision. If you specify two values, the first will be used as
3716
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3717
available revisions, like this is commonly referred to as "cherrypicking".
3719
Revision numbers are always relative to the branch being merged.
3721
By default, bzr will try to merge in all new work from the other
3722
branch, automatically determining an appropriate base. If this
3723
fails, you may need to give an explicit base.
4107
or the branch most recently merged using --remember. The source of the
4108
merge may also be specified in the form of a path to a file in another
4109
branch: in this case, only the modifications to that file are merged into
4110
the current working tree.
4112
When merging from a branch, by default bzr will try to merge in all new
4113
work from the other branch, automatically determining an appropriate base
4114
revision. If this fails, you may need to give an explicit base.
4116
To pick a different ending revision, pass "--revision OTHER". bzr will
4117
try to merge in all new work up to and including revision OTHER.
4119
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4120
through OTHER, excluding BASE but including OTHER, will be merged. If this
4121
causes some revisions to be skipped, i.e. if the destination branch does
4122
not already contain revision BASE, such a merge is commonly referred to as
4123
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4124
cherrypicks. The changes look like a normal commit, and the history of the
4125
changes from the other branch is not stored in the commit.
4127
Revision numbers are always relative to the source branch.
3725
4129
Merge will do its best to combine the changes in two branches, but there
3726
4130
are some kinds of problems only a human can fix. When it encounters those,
3730
4134
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3732
If there is no default branch set, the first merge will set it. After
3733
that, you can omit the branch to use the default. To change the
3734
default, use --remember. The value will only be saved if the remote
3735
location can be accessed.
4136
If there is no default branch set, the first merge will set it (use
4137
--no-remember to avoid setting it). After that, you can omit the branch
4138
to use the default. To change the default, use --remember. The value will
4139
only be saved if the remote location can be accessed.
3737
4141
The results of the merge are placed into the destination working
3738
4142
directory, where they can be reviewed (with bzr diff), tested, and then
3739
4143
committed to record the result of the merge.
3741
4145
merge refuses to run if there are any uncommitted changes, unless
3742
--force is given. The --force option can also be used to create a
4146
--force is given. If --force is given, then the changes from the source
4147
will be merged with the current working tree, including any uncommitted
4148
changes in the tree. The --force option can also be used to create a
3743
4149
merge revision which has more than two parents.
3745
4151
If one would like to merge changes from the working tree of the other
3847
4253
mergeable = None
3849
4255
if uncommitted:
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
4256
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4257
' with bundles or merge directives.'))
3853
4259
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
4260
raise errors.BzrCommandError(gettext(
4261
'Cannot use -r with merge directives or bundles'))
3856
4262
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3857
4263
mergeable, None)
3859
4265
if merger is None and uncommitted:
3860
4266
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
4267
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4268
' --revision at the same time.'))
3863
4269
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
4270
allow_pending = False
3873
4279
self.sanity_check_merger(merger)
3874
4280
if (merger.base_rev_id == merger.other_rev_id and
3875
4281
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4282
# check if location is a nonexistent file (and not a branch) to
4283
# disambiguate the 'Nothing to do'
4284
if merger.interesting_files:
4285
if not merger.other_tree.has_filename(
4286
merger.interesting_files[0]):
4287
note(gettext("merger: ") + str(merger))
4288
raise errors.PathsDoNotExist([location])
4289
note(gettext('Nothing to do.'))
4291
if pull and not preview:
3879
4292
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4293
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4294
if (merger.base_rev_id == tree.last_revision()):
3882
4295
result = tree.pull(merger.other_branch, False,
3883
4296
merger.other_rev_id)
3884
4297
result.report(self.outf)
3886
4299
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4300
raise errors.BzrCommandError(gettext(
3888
4301
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4302
" (perhaps you would prefer 'bzr pull')"))
3891
4304
return self._do_preview(merger)
3892
4305
elif interactive:
3988
4403
if other_revision_id is None:
3989
4404
other_revision_id = _mod_revision.ensure_null(
3990
4405
other_branch.last_revision())
3991
# Remember where we merge from
3992
if ((remember or tree.branch.get_submit_branch() is None) and
3993
user_location is not None):
4406
# Remember where we merge from. We need to remember if:
4407
# - user specify a location (and we don't merge from the parent
4409
# - user ask to remember or there is no previous location set to merge
4410
# from and user didn't ask to *not* remember
4411
if (user_location is not None
4413
or (remember is None
4414
and tree.branch.get_submit_branch() is None)))):
3994
4415
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4416
# Merge tags (but don't set them in the master branch yet, the user
4417
# might revert this merge). Commit will propagate them.
4418
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4419
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4420
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4421
if other_path != '':
4340
4765
theirs_only=False,
4341
4766
log_format=None, long=False, short=False, line=False,
4342
4767
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4768
include_merged=None, revision=None, my_revision=None,
4770
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4344
4771
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4772
def message(s):
4346
4773
if not is_quiet():
4347
4774
self.outf.write(s)
4776
if symbol_versioning.deprecated_passed(include_merges):
4777
ui.ui_factory.show_user_warning(
4778
'deprecated_command_option',
4779
deprecated_name='--include-merges',
4780
recommended_name='--include-merged',
4781
deprecated_in_version='2.5',
4782
command=self.invoked_as)
4783
if include_merged is None:
4784
include_merged = include_merges
4786
raise errors.BzrCommandError(gettext(
4787
'{0} and {1} are mutually exclusive').format(
4788
'--include-merges', '--include-merged'))
4789
if include_merged is None:
4790
include_merged = False
4350
4792
mine_only = this
4359
4801
elif theirs_only:
4360
4802
restrict = 'remote'
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4804
local_branch = Branch.open_containing(directory)[0]
4805
self.add_cleanup(local_branch.lock_read().unlock)
4366
4807
parent = local_branch.get_parent()
4367
4808
if other_branch is None:
4368
4809
other_branch = parent
4369
4810
if other_branch is None:
4370
raise errors.BzrCommandError("No peer location known"
4811
raise errors.BzrCommandError(gettext("No peer location known"
4372
4813
display_url = urlutils.unescape_for_display(parent,
4373
4814
self.outf.encoding)
4374
message("Using saved parent location: "
4375
+ display_url + "\n")
4815
message(gettext("Using saved parent location: {0}\n").format(
4377
4818
remote_branch = Branch.open(other_branch)
4378
4819
if remote_branch.base == local_branch.base:
4379
4820
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4822
self.add_cleanup(remote_branch.lock_read().unlock)
4384
4824
local_revid_range = _revision_range_to_revid_range(
4385
4825
_get_revision_range(my_revision, local_branch,
4430
4874
if mine_only and not local_extra:
4431
4875
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4876
message(gettext('This branch has no new revisions.\n'))
4433
4877
elif theirs_only and not remote_extra:
4434
4878
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4879
message(gettext('Other branch has no new revisions.\n'))
4436
4880
elif not (mine_only or theirs_only or local_extra or
4438
4882
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
4884
message(gettext("Branches are up to date.\n"))
4441
4885
self.cleanup_now()
4442
4886
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)
4887
self.add_cleanup(local_branch.lock_write().unlock)
4445
4888
# handle race conditions - a parent might be set while we run.
4446
4889
if local_branch.get_parent() is None:
4447
4890
local_branch.set_parent(remote_branch.base)
4507
4950
@display_command
4508
4951
def run(self, verbose=False):
4509
import bzrlib.plugin
4510
from inspect import getdoc
4512
for name, plugin in bzrlib.plugin.plugins().items():
4513
version = plugin.__version__
4514
if version == 'unknown':
4516
name_ver = '%s %s' % (name, version)
4517
d = getdoc(plugin.module)
4519
doc = d.split('\n')[0]
4521
doc = '(no description)'
4522
result.append((name_ver, doc, plugin.path()))
4523
for name_ver, doc, path in sorted(result):
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
4952
from bzrlib import plugin
4953
# Don't give writelines a generator as some codecs don't like that
4954
self.outf.writelines(
4955
list(plugin.describe_plugins(show_paths=verbose)))
4531
4958
class cmd_testament(Command):
4578
5004
Option('long', help='Show commit date in annotations.'),
4582
5009
encoding_type = 'exact'
4584
5011
@display_command
4585
5012
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5013
show_ids=False, directory=None):
5014
from bzrlib.annotate import (
4588
5017
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5018
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
5019
if wt is not None:
4592
self.add_cleanup(wt.unlock)
5020
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5022
self.add_cleanup(branch.lock_read().unlock)
4596
5023
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
5024
self.add_cleanup(tree.lock_read().unlock)
5025
if wt is not None and revision is None:
4600
5026
file_id = wt.path2id(relpath)
4602
5028
file_id = tree.path2id(relpath)
4603
5029
if file_id is None:
4604
5030
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
5031
if wt is not None and revision is None:
4607
5032
# If there is a tree and we're not annotating historical
4608
5033
# versions, annotate the working tree's content.
4609
5034
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
5035
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5037
annotate_file_tree(tree, file_id, self.outf, long, all,
5038
show_ids=show_ids, branch=branch)
4616
5041
class cmd_re_sign(Command):
4620
5045
hidden = True # is this right ?
4621
5046
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5047
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
5049
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5050
if revision_id_list is not None and revision is not None:
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5051
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5052
if revision_id_list is None and revision is None:
4628
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)
5053
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5054
b = WorkingTree.open_containing(directory)[0].branch
5055
self.add_cleanup(b.lock_write().unlock)
4632
5056
return self._run(b, revision_id_list, revision)
4634
5058
def _run(self, b, revision_id_list, revision):
4635
5059
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5060
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4637
5061
if revision_id_list is not None:
4638
5062
b.repository.start_write_group()
4694
5118
_see_also = ['checkouts', 'unbind']
4695
5119
takes_args = ['location?']
5120
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5122
def run(self, location=None, directory=u'.'):
5123
b, relpath = Branch.open_containing(directory)
4700
5124
if location is None:
4702
5126
location = b.get_old_bound_location()
4703
5127
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5128
raise errors.BzrCommandError(gettext('No location supplied. '
5129
'This format does not remember old locations.'))
4707
5131
if location is None:
4708
5132
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5133
raise errors.BzrCommandError(gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5135
raise errors.BzrCommandError(gettext('No location supplied '
5136
'and no previous location known'))
4713
5137
b_other = Branch.open(location)
4715
5139
b.bind(b_other)
4716
5140
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5141
raise errors.BzrCommandError(gettext('These branches have diverged.'
5142
' Try merging, and then bind again.'))
4719
5143
if b.get_config().has_explicit_nickname():
4720
5144
b.nick = b_other.nick
4784
5209
b = control.open_branch()
4786
5211
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5212
self.add_cleanup(tree.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5214
self.add_cleanup(b.lock_write().unlock)
5215
return self._run(b, tree, dry_run, verbose, revision, force,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5218
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4795
5220
from bzrlib.log import log_formatter, show_log
4796
5221
from bzrlib.uncommit import uncommit
4827
5252
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5255
self.outf.write(gettext('Dry-run, pretending to remove'
5256
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5258
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5261
if not ui.ui_factory.confirm_action(
5262
gettext(u'Uncommit these revisions'),
5263
'bzrlib.builtins.uncommit',
5265
self.outf.write(gettext('Canceled\n'))
4840
5268
mutter('Uncommitting from {%s} to {%s}',
4841
5269
last_rev_id, rev_id)
4842
5270
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
5271
revno=revno, local=local, keep_tags=keep_tags)
5272
self.outf.write(gettext('You can restore the old tip by running:\n'
5273
' bzr pull . -r revid:%s\n') % last_rev_id)
4848
5276
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5277
__doc__ = """Break a dead lock.
5279
This command breaks a lock on a repository, branch, working directory or
4851
5282
CAUTION: Locks should only be broken when you are sure that the process
4852
5283
holding the lock has been stopped.
4859
5290
bzr break-lock bzr+ssh://example.com/bzr/foo
5291
bzr break-lock --conf ~/.bazaar
4861
5294
takes_args = ['location?']
5297
help='LOCATION is the directory where the config lock is.'),
5299
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5302
def run(self, location=None, config=False, force=False):
4864
5303
if location is None:
4865
5304
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5306
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5308
{'bzrlib.lockdir.break': True})
5310
conf = _mod_config.LockableConfig(file_name=location)
5313
control, relpath = controldir.ControlDir.open_containing(location)
5315
control.break_lock()
5316
except NotImplementedError:
4873
5320
class cmd_wait_until_signalled(Command):
4936
5384
return host, port
4938
5386
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5387
protocol=None, client_timeout=None):
5388
from bzrlib import transport
4941
5389
if directory is None:
4942
5390
directory = os.getcwd()
4943
5391
if protocol is None:
4944
protocol = transport_server_registry.get()
5392
protocol = transport.transport_server_registry.get()
4945
5393
host, port = self.get_host_and_port(port)
4946
url = urlutils.local_path_to_url(directory)
5394
url = transport.location_to_url(directory)
4947
5395
if not allow_writes:
4948
5396
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5397
t = transport.get_transport_from_url(url)
5399
protocol(t, host, port, inet, client_timeout)
5400
except TypeError, e:
5401
# We use symbol_versioning.deprecated_in just so that people
5402
# grepping can find it here.
5403
# symbol_versioning.deprecated_in((2, 5, 0))
5404
symbol_versioning.warn(
5405
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5406
'Most likely it needs to be updated to support a'
5407
' "timeout" parameter (added in bzr 2.5.0)'
5408
% (e, protocol.__module__, protocol),
5410
protocol(t, host, port, inet)
4953
5413
class cmd_join(Command):
5359
5824
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5825
self.add_cleanup(branch.lock_write().unlock)
5363
5827
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5828
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5829
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5830
note(gettext('Deleted tag %s.') % tag_name)
5369
5833
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5834
raise errors.BzrCommandError(gettext(
5371
5835
"Tags can only be placed on a single revision, "
5373
5837
revision_id = revision[0].as_revision_id(branch)
5375
5839
revision_id = branch.last_revision()
5376
5840
if tag_name is None:
5377
5841
tag_name = branch.automatic_tag_name(revision_id)
5378
5842
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5843
raise errors.BzrCommandError(gettext(
5844
"Please specify a tag name."))
5846
existing_target = branch.tags.lookup_tag(tag_name)
5847
except errors.NoSuchTag:
5848
existing_target = None
5849
if not force and existing_target not in (None, revision_id):
5382
5850
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5851
if existing_target == revision_id:
5852
note(gettext('Tag %s already exists for that revision.') % tag_name)
5854
branch.tags.set_tag(tag_name, revision_id)
5855
if existing_target is None:
5856
note(gettext('Created tag %s.') % tag_name)
5858
note(gettext('Updated tag %s.') % tag_name)
5387
5861
class cmd_tags(Command):
5393
5867
_see_also = ['tag']
5394
5868
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5869
custom_help('directory',
5870
help='Branch whose tags should be displayed.'),
5871
RegistryOption('sort',
5401
5872
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5873
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
5879
@display_command
5880
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5881
from bzrlib.tag import tag_sort_methods
5416
5882
branch, relpath = Branch.open_containing(directory)
5418
5884
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
5888
self.add_cleanup(branch.lock_read().unlock)
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
5433
elif sort == 'time':
5435
for tag, revid in tags:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
5890
# Restrict to the specified range
5891
tags = self._tags_for_range(branch, revision)
5893
sort = tag_sort_methods.get()
5444
5895
if not show_ids:
5445
5896
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
5897
for index, (tag, revid) in enumerate(tags):
5457
5910
for tag, revspec in tags:
5458
5911
self.outf.write('%-20s %s\n' % (tag, revspec))
5913
def _tags_for_range(self, branch, revision):
5915
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5916
revid1, revid2 = rev1.rev_id, rev2.rev_id
5917
# _get_revision_range will always set revid2 if it's not specified.
5918
# If revid1 is None, it means we want to start from the branch
5919
# origin which is always a valid ancestor. If revid1 == revid2, the
5920
# ancestry check is useless.
5921
if revid1 and revid1 != revid2:
5922
# FIXME: We really want to use the same graph than
5923
# branch.iter_merge_sorted_revisions below, but this is not
5924
# easily available -- vila 2011-09-23
5925
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5926
# We don't want to output anything in this case...
5928
# only show revisions between revid1 and revid2 (inclusive)
5929
tagged_revids = branch.tags.get_reverse_tag_dict()
5931
for r in branch.iter_merge_sorted_revisions(
5932
start_revision_id=revid2, stop_revision_id=revid1,
5933
stop_rule='include'):
5934
revid_tags = tagged_revids.get(r[0], None)
5936
found.extend([(tag, r[0]) for tag in revid_tags])
5461
5940
class cmd_reconfigure(Command):
5462
5941
__doc__ = """Reconfigure the type of a bzr directory.
5476
5955
takes_args = ['location?']
5477
5956
takes_options = [
5478
5957
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
5960
help='The relation between branch and tree.',
5482
5961
value_switches=True, enum_switch=False,
5483
5962
branch='Reconfigure to be an unbound branch with no working tree.',
5484
5963
tree='Reconfigure to be an unbound branch with a working tree.',
5485
5964
checkout='Reconfigure to be a bound branch with a working tree.',
5486
5965
lightweight_checkout='Reconfigure to be a lightweight'
5487
5966
' checkout (with no local history).',
5968
RegistryOption.from_kwargs(
5970
title='Repository type',
5971
help='Location fo the repository.',
5972
value_switches=True, enum_switch=False,
5488
5973
standalone='Reconfigure to be a standalone branch '
5489
5974
'(i.e. stop using shared repository).',
5490
5975
use_shared='Reconfigure to use a shared repository.',
5977
RegistryOption.from_kwargs(
5979
title='Trees in Repository',
5980
help='Whether new branches in the repository have trees.',
5981
value_switches=True, enum_switch=False,
5491
5982
with_trees='Reconfigure repository to create '
5492
5983
'working trees on branches by default.',
5493
5984
with_no_trees='Reconfigure repository to not create '
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5513
directory = bzrdir.BzrDir.open(location)
6001
def run(self, location=None, bind_to=None, force=False,
6002
tree_type=None, repository_type=None, repository_trees=None,
6003
stacked_on=None, unstacked=None):
6004
directory = controldir.ControlDir.open(location)
5514
6005
if stacked_on and unstacked:
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
6006
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5516
6007
elif stacked_on is not None:
5517
6008
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5518
6009
elif unstacked:
5520
6011
# At the moment you can use --stacked-on and a different
5521
6012
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
6014
if (tree_type is None and
6015
repository_type is None and
6016
repository_trees is None):
5524
6017
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6020
raise errors.BzrCommandError(gettext('No target configuration '
6022
reconfiguration = None
6023
if tree_type == 'branch':
5530
6024
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
6025
elif tree_type == 'tree':
5532
6026
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
6027
elif tree_type == 'checkout':
5534
6028
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
6029
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
6030
elif tree_type == 'lightweight-checkout':
5537
6031
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
6032
directory, bind_to)
5539
elif target_type == 'use-shared':
6034
reconfiguration.apply(force)
6035
reconfiguration = None
6036
if repository_type == 'use-shared':
5540
6037
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
6038
elif repository_type == 'standalone':
5542
6039
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
6041
reconfiguration.apply(force)
6042
reconfiguration = None
6043
if repository_trees == 'with-trees':
5544
6044
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6045
directory, True)
5546
elif target_type == 'with-no-trees':
6046
elif repository_trees == 'with-no-trees':
5547
6047
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6048
directory, False)
5549
reconfiguration.apply(force)
6050
reconfiguration.apply(force)
6051
reconfiguration = None
5552
6054
class cmd_switch(Command):
5600
6103
had_explicit_nick = False
5601
6104
if create_branch:
5602
6105
if branch is None:
5603
raise errors.BzrCommandError('cannot create branch without'
6106
raise errors.BzrCommandError(gettext('cannot create branch without'
5605
6108
to_location = directory_service.directories.dereference(
5607
6110
if '/' not in to_location and '\\' not in to_location:
5608
6111
# This path is meant to be relative to the existing branch
5609
6112
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
6113
# Perhaps the target control dir supports colocated branches?
6115
root = controldir.ControlDir.open(this_url,
6116
possible_transports=[control_dir.user_transport])
6117
except errors.NotBranchError:
6120
colocated = root._format.colocated_branches
6122
to_location = urlutils.join_segment_parameters(this_url,
6123
{"branch": urlutils.escape(to_location)})
6125
to_location = urlutils.join(
6126
this_url, '..', urlutils.escape(to_location))
5611
6127
to_branch = branch.bzrdir.sprout(to_location,
5612
6128
possible_transports=[branch.bzrdir.root_transport],
5613
6129
source_branch=branch).open_branch()
6131
# Perhaps it's a colocated branch?
5616
to_branch = Branch.open(to_location)
5617
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
6133
to_branch = control_dir.open_branch(to_location)
6134
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
6136
to_branch = Branch.open(to_location)
6137
except errors.NotBranchError:
6138
this_url = self._get_branch_location(control_dir)
6139
to_branch = Branch.open(
6141
this_url, '..', urlutils.escape(to_location)))
5621
6142
if revision is not None:
5622
6143
revision = revision.as_revision_id(to_branch)
5623
6144
switch.switch(control_dir, to_branch, force, revision_id=revision)
5624
6145
if had_explicit_nick:
5625
6146
branch = control_dir.open_branch() #get the new branch!
5626
6147
branch.nick = to_branch.nick
5627
note('Switched to branch: %s',
6148
note(gettext('Switched to branch: %s'),
5628
6149
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
6151
def _get_branch_location(self, control_dir):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6256
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6258
current_view, view_dict = tree.views.get_view_info()
5737
6259
if name is None:
5738
6260
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6263
raise errors.BzrCommandError(gettext(
6264
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6266
raise errors.BzrCommandError(gettext(
6267
"Both --delete and --switch specified"))
5747
6269
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6270
self.outf.write(gettext("Deleted all views.\n"))
5749
6271
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6272
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6274
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6275
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6278
raise errors.BzrCommandError(gettext(
6279
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6281
raise errors.BzrCommandError(gettext(
6282
"Both --switch and --all specified"))
5761
6283
elif switch == 'off':
5762
6284
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6285
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6286
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6287
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6289
tree.views.set_view_info(switch, view_dict)
5768
6290
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6291
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6294
self.outf.write(gettext('Views defined:\n'))
5773
6295
for view in sorted(view_dict):
5774
6296
if view == current_view:
5778
6300
view_str = views.view_display_str(view_dict[view])
5779
6301
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6303
self.outf.write(gettext('No views defined.\n'))
5782
6304
elif file_list:
5783
6305
if name is None:
5784
6306
# No name given and no current view set
5786
6308
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6309
raise errors.BzrCommandError(gettext(
6310
"Cannot change the 'off' pseudo view"))
5789
6311
tree.views.set_view(name, sorted(file_list))
5790
6312
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6313
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6315
# list the files
5794
6316
if name is None:
5795
6317
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6318
self.outf.write(gettext('No current view.\n'))
5798
6320
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6321
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6324
class cmd_hooks(Command):
5883
6418
Option('destroy',
5884
6419
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6421
_see_also = ['unshelve', 'configuration']
5888
6423
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6424
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6426
return self.run_for_list(directory=directory)
5892
6427
from bzrlib.shelf_ui import Shelver
5893
6428
if writer is None:
5894
6429
writer = bzrlib.option.diff_writer_registry.get()
5896
6431
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6432
file_list, message, destroy=destroy, directory=directory)
5975
6513
' deleting them.'),
5976
6514
Option('force', help='Do not prompt before deleting.')]
5977
6515
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6516
force=False, directory=u'.'):
5979
6517
from bzrlib.clean_tree import clean_tree
5980
6518
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6522
clean_tree(directory, unknown=unknown, ignored=ignored,
6523
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6526
class cmd_reference(Command):
6032
6570
self.outf.write('%s %s\n' % (path, location))
6573
class cmd_export_pot(Command):
6574
__doc__ = """Export command helps and error messages in po format."""
6577
takes_options = [Option('plugin',
6578
help='Export help text from named command '\
6579
'(defaults to all built in commands).',
6581
Option('include-duplicates',
6582
help='Output multiple copies of the same msgid '
6583
'string if it appears more than once.'),
6586
def run(self, plugin=None, include_duplicates=False):
6587
from bzrlib.export_pot import export_pot
6588
export_pot(self.outf, plugin, include_duplicates)
6035
6591
def _register_lazy_builtins():
6036
6592
# register lazy builtins from other modules; called at startup and should
6037
6593
# be only called once.
6038
6594
for (name, aliases, module_name) in [
6039
6595
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6596
('cmd_config', [], 'bzrlib.config'),
6040
6597
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6598
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6599
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6600
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6601
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6602
('cmd_verify_signatures', [],
6603
'bzrlib.commit_signature_commands'),
6604
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6606
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
