172
180
: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)
182
return WorkingTree.open_containing_paths(
183
file_list, default_directory='.',
223
188
def _get_view_info_for_change_reporter(tree):
310
291
def run(self, show_ids=False, file_list=None, revision=None, short=False,
311
versioned=False, no_pending=False, verbose=False):
292
versioned=False, no_pending=False, verbose=False,
312
294
from bzrlib.status import show_tree_status
314
296
if revision and len(revision) > 2:
315
raise errors.BzrCommandError('bzr status --revision takes exactly'
316
' one or two revision specifiers')
297
raise errors.BzrCommandError(gettext('bzr status --revision takes exactly'
298
' one or two revision specifiers'))
318
tree, relfile_list = tree_files(file_list)
300
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
319
301
# Avoid asking for specific files when that is not needed.
320
302
if relfile_list == ['']:
321
303
relfile_list = None
353
336
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
339
def run(self, revision_id=None, revision=None, directory=u'.'):
357
340
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')
341
raise errors.BzrCommandError(gettext('You can only supply one of'
342
' revision_id or --revision'))
360
343
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
344
raise errors.BzrCommandError(gettext('You must supply either'
345
' --revision or a revision_id'))
347
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
349
revisions = b.repository.revisions
366
350
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
351
raise errors.BzrCommandError(gettext('Repository %r does not support '
352
'access to raw revision texts'))
370
354
b.repository.lock_read()
491
478
location_list=['.']
493
480
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
481
d = controldir.ControlDir.open(location)
497
484
working = d.open_workingtree()
498
485
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
486
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
487
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
488
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
489
" of a remote path"))
504
491
if (working.has_changes()):
505
492
raise errors.UncommittedChanges(working)
493
if working.get_shelf_manager().last_shelf() is not None:
494
raise errors.ShelvedChanges(working)
507
496
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
497
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
498
" from a lightweight checkout"))
511
500
d.destroy_workingtree()
503
class cmd_repair_workingtree(Command):
504
__doc__ = """Reset the working tree state file.
506
This is not meant to be used normally, but more as a way to recover from
507
filesystem corruption, etc. This rebuilds the working inventory back to a
508
'known good' state. Any new modifications (adding a file, renaming, etc)
509
will be lost, though modified files will still be detected as such.
511
Most users will want something more like "bzr revert" or "bzr update"
512
unless the state file has become corrupted.
514
By default this attempts to recover the current state by looking at the
515
headers of the state file. If the state file is too corrupted to even do
516
that, you can supply --revision to force the state of the tree.
519
takes_options = ['revision', 'directory',
521
help='Reset the tree even if it doesn\'t appear to be'
526
def run(self, revision=None, directory='.', force=False):
527
tree, _ = WorkingTree.open_containing(directory)
528
self.add_cleanup(tree.lock_tree_write().unlock)
532
except errors.BzrError:
533
pass # There seems to be a real error here, so we'll reset
536
raise errors.BzrCommandError(gettext(
537
'The tree does not appear to be corrupt. You probably'
538
' want "bzr revert" instead. Use "--force" if you are'
539
' sure you want to reset the working tree.'))
543
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
545
tree.reset_state(revision_ids)
546
except errors.BzrError, e:
547
if revision_ids is None:
548
extra = (gettext(', the header appears corrupt, try passing -r -1'
549
' to set the state to the last commit'))
552
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
555
class cmd_revno(Command):
515
556
__doc__ = """Show current revision number.
520
561
_see_also = ['info']
521
562
takes_args = ['location?']
522
563
takes_options = [
523
Option('tree', help='Show revno of working tree'),
564
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
569
def run(self, tree=False, location=u'.', revision=None):
570
if revision is not None and tree:
571
raise errors.BzrCommandError(gettext("--tree and --revision can "
572
"not be used together"))
530
576
wt = WorkingTree.open_containing(location)[0]
577
self.add_cleanup(wt.lock_read().unlock)
532
578
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
579
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
581
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
583
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
584
self.add_cleanup(b.lock_read().unlock)
586
if len(revision) != 1:
587
raise errors.BzrCommandError(gettext(
588
"Tags can only be placed on a single revision, "
590
revid = revision[0].as_revision_id(b)
592
revid = b.last_revision()
594
revno_t = b.revision_id_to_dotted_revno(revid)
595
except errors.NoSuchRevision:
597
revno = ".".join(str(n) for n in revno_t)
546
598
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
599
self.outf.write(revno + '\n')
550
602
class cmd_revision_info(Command):
704
758
takes_args = ['dir+']
762
help='No error if existing, make parent directories as needed.',
705
766
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)
769
def add_file_with_parents(cls, wt, relpath):
770
if wt.path2id(relpath) is not None:
772
cls.add_file_with_parents(wt, osutils.dirname(relpath))
776
def add_file_single(cls, wt, relpath):
779
def run(self, dir_list, parents=False):
781
add_file = self.add_file_with_parents
783
add_file = self.add_file_single
785
wt, relpath = WorkingTree.open_containing(dir)
790
if e.errno != errno.EEXIST:
717
raise errors.NotVersionedError(path=base)
794
add_file(wt, relpath)
796
self.outf.write(gettext('added %s\n') % dir)
720
799
class cmd_relpath(Command):
757
836
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
758
837
if kind and kind not in ['file', 'directory', 'symlink']:
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
838
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
761
840
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)
841
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
842
self.add_cleanup(work_tree.lock_read().unlock)
765
843
if revision is not None:
766
844
tree = revision.as_tree(work_tree.branch)
768
846
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
847
self.add_cleanup(tree.lock_read().unlock)
828
906
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
908
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
909
if names_list is None:
833
911
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)
912
raise errors.BzrCommandError(gettext("missing file argument"))
913
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
914
for file_name in rel_names[0:-1]:
916
raise errors.BzrCommandError(gettext("can not move root of branch"))
917
self.add_cleanup(tree.lock_tree_write().unlock)
838
918
self._run(tree, names_list, rel_names, after)
840
920
def run_auto(self, names_list, after, dry_run):
841
921
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
922
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)
925
raise errors.BzrCommandError(gettext('--after cannot be specified with'
927
work_tree, file_list = WorkingTree.open_containing_paths(
928
names_list, default_directory='.')
929
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
930
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
932
def _run(self, tree, names_list, rel_names, after):
946
1026
match the remote one, use pull --overwrite. This will work even if the two
947
1027
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.
1029
If there is no default location set, the first pull will set it (use
1030
--no-remember to avoid setting it). After that, you can omit the
1031
location to use the default. To change the default, use --remember. The
1032
value will only be saved if the remote location can be accessed.
1034
The --verbose option will display the revisions pulled using the log_format
1035
configuration option. You can use a different format by overriding it with
1036
-Olog_format=<other_format>.
954
1038
Note: The location can be specified either in the form of a branch,
955
1039
or in the form of a path to a file containing a merge directive generated
960
1044
takes_options = ['remember', 'overwrite', 'revision',
961
1045
custom_help('verbose',
962
1046
help='Show logs of pulled revisions.'),
1047
custom_help('directory',
964
1048
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
1049
'rather than the one containing the working directory.'),
970
1051
help="Perform a local pull in a bound "
971
1052
"branch. Local pulls are not applied to "
972
1053
"the master branch."
1056
help="Show base revision text in conflicts.")
975
1058
takes_args = ['location?']
976
1059
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1061
def run(self, location=None, remember=None, overwrite=False,
979
1062
revision=None, verbose=False,
980
directory=None, local=False):
1063
directory=None, local=False,
981
1065
# FIXME: too much stuff is in the command class
982
1066
revision_id = None
983
1067
mergeable = None
1077
1166
do a merge (see bzr help merge) from the other branch, and commit that.
1078
1167
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.
1169
If there is no default push location set, the first push will set it (use
1170
--no-remember to avoid setting it). After that, you can omit the
1171
location to use the default. To change the default, use --remember. The
1172
value will only be saved if the remote location can be accessed.
1174
The --verbose option will display the revisions pushed using the log_format
1175
configuration option. You can use a different format by overriding it with
1176
-Olog_format=<other_format>.
1086
1179
_see_also = ['pull', 'update', 'working-trees']
1110
1200
Option('strict',
1111
1201
help='Refuse to push if there are uncommitted changes in'
1112
1202
' the working tree, --no-strict disables the check.'),
1204
help="Don't populate the working tree, even for protocols"
1205
" that support it."),
1114
1207
takes_args = ['location?']
1115
1208
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1210
def run(self, location=None, remember=None, overwrite=False,
1118
1211
create_prefix=False, verbose=False, revision=None,
1119
1212
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1213
stacked=False, strict=None, no_tree=False):
1121
1214
from bzrlib.push import _show_push_branch
1123
1216
if directory is None:
1124
1217
directory = '.'
1125
1218
# Get the source branch
1126
1219
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1220
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1128
1221
# Get the tip's revision_id
1129
1222
revision = _get_one_revision('push', revision)
1130
1223
if revision is not None:
1151
1244
# error by the feedback given to them. RBC 20080227.
1152
1245
stacked_on = parent_url
1153
1246
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1247
raise errors.BzrCommandError(gettext(
1248
"Could not determine branch to refer to."))
1157
1250
# Get the destination location
1158
1251
if location is None:
1159
1252
stored_loc = br_from.get_push_location()
1160
1253
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1254
raise errors.BzrCommandError(gettext(
1255
"No push location known or specified."))
1164
1257
display_url = urlutils.unescape_for_display(stored_loc,
1165
1258
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1259
note(gettext("Using saved push location: %s") % display_url)
1167
1260
location = stored_loc
1169
1262
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1263
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1264
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1265
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1268
class cmd_branch(Command):
1214
1311
def run(self, from_location, to_location=None, revision=None,
1215
1312
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1313
use_existing_dir=False, switch=False, bind=False,
1217
1315
from bzrlib import switch as _mod_switch
1218
1316
from bzrlib.tag import _merge_tags_if_possible
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1317
if self.invoked_as in ['get', 'clone']:
1318
ui.ui_factory.show_user_warning(
1319
'deprecated_command',
1320
deprecated_name=self.invoked_as,
1321
recommended_name='branch',
1322
deprecated_in_version='2.4')
1323
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1325
if not (hardlink or files_from):
1326
# accelerator_tree is usually slower because you have to read N
1327
# files (no readahead, lots of seeks, etc), but allow the user to
1328
# explicitly request it
1329
accelerator_tree = None
1330
if files_from is not None and files_from != from_location:
1331
accelerator_tree = WorkingTree.open(files_from)
1221
1332
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1333
self.add_cleanup(br_from.lock_read().unlock)
1224
1334
if revision is not None:
1225
1335
revision_id = revision.as_revision_id(br_from)
1230
1340
revision_id = br_from.last_revision()
1231
1341
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1342
to_location = getattr(br_from, "name", None)
1343
if to_location is None:
1344
to_location = urlutils.derive_to_location(from_location)
1233
1345
to_transport = transport.get_transport(to_location)
1235
1347
to_transport.mkdir('.')
1236
1348
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1350
to_dir = controldir.ControlDir.open_from_transport(
1352
except errors.NotBranchError:
1353
if not use_existing_dir:
1354
raise errors.BzrCommandError(gettext('Target directory "%s" '
1355
'already exists.') % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1360
to_dir.open_branch()
1243
1361
except errors.NotBranchError:
1246
1364
raise errors.AlreadyBranchError(to_location)
1247
1365
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1366
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)
1372
# preserve whatever source format we have.
1373
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1374
possible_transports=[to_transport],
1375
accelerator_tree=accelerator_tree,
1376
hardlink=hardlink, stacked=stacked,
1377
force_new_repo=standalone,
1378
create_tree_if_local=not no_tree,
1379
source_branch=br_from)
1380
branch = to_dir.open_branch(
1381
possible_transports=[
1382
br_from.bzrdir.root_transport, to_transport])
1383
except errors.NoSuchRevision:
1384
to_transport.delete_tree('.')
1385
msg = gettext("The branch {0} has no revision {1}.").format(
1386
from_location, revision)
1387
raise errors.BzrCommandError(msg)
1389
branch = br_from.sprout(to_dir, revision_id=revision_id)
1265
1390
_merge_tags_if_possible(br_from, branch)
1266
1391
# If the source branch is stacked, the new branch may
1267
1392
# be stacked whether we asked for that explicitly or not.
1268
1393
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1395
note(gettext('Created new stacked branch referring to %s.') %
1271
1396
branch.get_stacked_on_url())
1272
1397
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
1398
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1399
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1401
# Bind to the parent
1277
1402
parent_branch = Branch.open(from_location)
1278
1403
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1404
note(gettext('New branch bound to %s') % from_location)
1281
1406
# Switch to the new branch
1282
1407
wt, _ = WorkingTree.open_containing('.')
1283
1408
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1409
note(gettext('Switched to branch: %s'),
1285
1410
urlutils.unescape_for_display(branch.base, 'utf-8'))
1413
class cmd_branches(Command):
1414
__doc__ = """List the branches available at the current location.
1416
This command will print the names of all the branches at the current
1420
takes_args = ['location?']
1422
Option('recursive', short_name='R',
1423
help='Recursively scan for branches rather than '
1424
'just looking in the specified location.')]
1426
def run(self, location=".", recursive=False):
1428
t = transport.get_transport(location)
1429
if not t.listable():
1430
raise errors.BzrCommandError(
1431
"Can't scan this type of location.")
1432
for b in controldir.ControlDir.find_branches(t):
1433
self.outf.write("%s\n" % urlutils.unescape_for_display(
1434
urlutils.relative_url(t.base, b.base),
1435
self.outf.encoding).rstrip("/"))
1437
dir = controldir.ControlDir.open_containing(location)[0]
1438
for branch in dir.list_branches():
1439
if branch.name is None:
1440
self.outf.write(gettext(" (default)\n"))
1442
self.outf.write(" %s\n" % branch.name.encode(
1443
self.outf.encoding))
1288
1446
class cmd_checkout(Command):
1289
1447
__doc__ = """Create a new checkout of an existing branch.
1389
1550
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
1551
__doc__ = """Update a working tree to a new revision.
1553
This will perform a merge of the destination revision (the tip of the
1554
branch, or the specified revision) into the working tree, and then make
1555
that revision the basis revision for the working tree.
1557
You can use this to visit an older revision, or to update a working tree
1558
that is out of date from its branch.
1560
If there are any uncommitted changes in the tree, they will be carried
1561
across and remain as uncommitted changes after the update. To discard
1562
these changes, use 'bzr revert'. The uncommitted changes may conflict
1563
with the changes brought in by the change in basis revision.
1565
If the tree's branch is bound to a master branch, bzr will also update
1400
1566
the branch from the master.
1568
You cannot update just a single file or directory, because each Bazaar
1569
working tree has just a single basis revision. If you want to restore a
1570
file that has been removed locally, use 'bzr revert' instead of 'bzr
1571
update'. If you want to restore a file to its state in a previous
1572
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1573
out the old content of that file to a new location.
1575
The 'dir' argument, if given, must be the location of the root of a
1576
working tree to update. By default, the working tree that contains the
1577
current working directory is used.
1403
1580
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1581
takes_args = ['dir?']
1405
takes_options = ['revision']
1582
takes_options = ['revision',
1584
help="Show base revision text in conflicts."),
1406
1586
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1588
def run(self, dir=None, revision=None, show_base=None):
1409
1589
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]
1590
raise errors.BzrCommandError(gettext(
1591
"bzr update --revision takes exactly one revision"))
1593
tree = WorkingTree.open_containing('.')[0]
1595
tree, relpath = WorkingTree.open_containing(dir)
1598
raise errors.BzrCommandError(gettext(
1599
"bzr update can only update a whole tree, "
1600
"not a file or subdirectory"))
1413
1601
branch = tree.branch
1414
1602
possible_transports = []
1415
1603
master = branch.get_master_branch(
1416
1604
possible_transports=possible_transports)
1417
1605
if master is not None:
1419
1606
branch_location = master.base
1609
branch_location = tree.branch.base
1421
1610
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1611
self.add_cleanup(tree.unlock)
1424
1612
# get rid of the final '/' and be ready for display
1425
1613
branch_location = urlutils.unescape_for_display(
1451
1639
change_reporter,
1452
1640
possible_transports=possible_transports,
1453
1641
revision=revision_id,
1643
show_base=show_base)
1455
1644
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1645
raise errors.BzrCommandError(gettext(
1457
1646
"branch has no revision %s\n"
1458
1647
"bzr update --revision only works"
1459
" for a revision in the branch history"
1648
" for a revision in the branch history")
1460
1649
% (e.revision))
1461
1650
revno = tree.branch.revision_id_to_dotted_revno(
1462
1651
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1652
note(gettext('Updated to revision {0} of branch {1}').format(
1653
'.'.join(map(str, revno)), branch_location))
1465
1654
parent_ids = tree.get_parent_ids()
1466
1655
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'.")
1656
note(gettext('Your local commits will now show as pending merges with '
1657
"'bzr status', and can be committed with 'bzr commit'."))
1469
1658
if conflicts != 0:
1513
1702
noise_level = 0
1514
1703
from bzrlib.info import show_bzrdir_info
1515
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1704
show_bzrdir_info(controldir.ControlDir.open_containing(location)[0],
1516
1705
verbose=noise_level, outfile=self.outf)
1519
1708
class cmd_remove(Command):
1520
1709
__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.
1711
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1712
delete them if they can easily be recovered using revert otherwise they
1713
will be backed up (adding an extention of the form .~#~). If no options or
1714
parameters are given Bazaar will scan for files that are being tracked by
1715
Bazaar but missing in your tree and stop tracking them for you.
1527
1717
takes_args = ['file*']
1528
1718
takes_options = ['verbose',
1530
1720
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1721
'The file deletion mode to be used.',
1532
1722
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1723
safe='Backup changed files (default).',
1535
1724
keep='Delete from bzr but leave the working copy.',
1725
no_backup='Don\'t backup changed files.',
1536
1726
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1727
'recovered and even if they are non-empty directories. '
1728
'(deprecated, use no-backup)')]
1538
1729
aliases = ['rm', 'del']
1539
1730
encoding_type = 'replace'
1541
1732
def run(self, file_list, verbose=False, new=False,
1542
1733
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1734
if file_deletion_strategy == 'force':
1735
note(gettext("(The --force option is deprecated, rather use --no-backup "
1737
file_deletion_strategy = 'no-backup'
1739
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1741
if file_list is not None:
1546
1742
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1744
self.add_cleanup(tree.lock_write().unlock)
1550
1745
# Heuristics should probably all move into tree.remove_smart or
1716
1925
help='Specify a format for this branch. '
1717
1926
'See "help formats".',
1718
1927
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1719
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1928
converter=lambda name: controldir.format_registry.make_bzrdir(name),
1720
1929
value_switches=True,
1721
1930
title="Branch format",
1723
1932
Option('append-revisions-only',
1724
1933
help='Never change revnos or the existing log.'
1725
' Append revisions to it only.')
1934
' Append revisions to it only.'),
1936
'Create a branch without a working tree.')
1727
1938
def run(self, location=None, format=None, append_revisions_only=False,
1728
create_prefix=False):
1939
create_prefix=False, no_tree=False):
1729
1940
if format is None:
1730
format = bzrdir.format_registry.make_bzrdir('default')
1941
format = controldir.format_registry.make_bzrdir('default')
1731
1942
if location is None:
1732
1943
location = u'.'
1742
1953
to_transport.ensure_base()
1743
1954
except errors.NoSuchFile:
1744
1955
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
1956
raise errors.BzrCommandError(gettext("Parent directory of %s"
1746
1957
" does not exist."
1747
1958
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
1959
" leading parent directories.")
1750
1961
to_transport.create_prefix()
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1964
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1754
1965
except errors.NotBranchError:
1755
1966
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
1967
create_branch = controldir.ControlDir.create_branch_convenience
1969
force_new_tree = False
1971
force_new_tree = None
1757
1972
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
1973
possible_transports=[to_transport],
1974
force_new_tree=force_new_tree)
1759
1975
a_bzrdir = branch.bzrdir
1761
1977
from bzrlib.transport.local import LocalTransport
1969
2204
elif ':' in prefix:
1970
2205
old_label, new_label = prefix.split(":")
1972
raise errors.BzrCommandError(
2207
raise errors.BzrCommandError(gettext(
1973
2208
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2209
' (eg "old/:new/")'))
1976
2211
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2212
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2213
' one or two revision specifiers'))
1980
2215
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2216
raise errors.BzrCommandError(gettext(
2217
'{0} and {1} are mutually exclusive').format(
2218
'--using', '--format'))
1984
2220
(old_tree, new_tree,
1985
2221
old_branch, new_branch,
1986
2222
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2223
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2224
# GNU diff on Windows uses ANSI encoding for filenames
2225
path_encoding = osutils.get_diff_header_encoding()
1988
2226
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2227
specific_files=specific_files,
1990
2228
external_diff_options=diff_options,
1991
2229
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2230
extra_trees=extra_trees,
2231
path_encoding=path_encoding,
1993
2233
format_cls=format)
2003
2243
# level of effort but possibly much less IO. (Or possibly not,
2004
2244
# if the directories are very large...)
2005
2245
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
2246
takes_options = ['directory', 'show-ids']
2008
2248
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2249
def run(self, show_ids=False, directory=u'.'):
2250
tree = WorkingTree.open_containing(directory)[0]
2251
self.add_cleanup(tree.lock_read().unlock)
2013
2252
old = tree.basis_tree()
2015
self.add_cleanup(old.unlock)
2253
self.add_cleanup(old.lock_read().unlock)
2016
2254
for path, ie in old.inventory.iter_entries():
2017
2255
if not tree.has_id(ie.file_id):
2018
2256
self.outf.write(path)
2053
2289
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2290
takes_options = ['directory', 'null']
2060
2292
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2293
def run(self, null=False, directory=u'.'):
2294
wt = WorkingTree.open_containing(directory)[0]
2295
self.add_cleanup(wt.lock_read().unlock)
2065
2296
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2297
self.add_cleanup(basis.lock_read().unlock)
2068
2298
basis_inv = basis.inventory
2069
2299
inv = wt.inventory
2070
2300
for file_id in inv:
2071
if file_id in basis_inv:
2301
if basis_inv.has_id(file_id):
2073
2303
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2305
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2306
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2309
self.outf.write(path + '\0')
2297
2535
Option('show-diff',
2298
2536
short_name='p',
2299
2537
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2538
Option('include-merged',
2301
2539
help='Show merged revisions like --levels 0 does.'),
2540
Option('include-merges', hidden=True,
2541
help='Historical alias for --include-merged.'),
2542
Option('omit-merges',
2543
help='Do not report commits with more than one parent.'),
2302
2544
Option('exclude-common-ancestry',
2303
2545
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2546
' of both ancestries (require -rX..Y).'
2548
Option('signatures',
2549
help='Show digital signature validity.'),
2552
help='Show revisions whose properties match this '
2555
ListOption('match-message',
2556
help='Show revisions whose message matches this '
2559
ListOption('match-committer',
2560
help='Show revisions whose committer matches this '
2563
ListOption('match-author',
2564
help='Show revisions whose authors match this '
2567
ListOption('match-bugs',
2568
help='Show revisions whose bugs match this '
2307
2572
encoding_type = 'replace'
2327
2601
_get_info_for_log_files,
2329
2603
direction = (forward and 'forward') or 'reverse'
2604
if symbol_versioning.deprecated_passed(include_merges):
2605
ui.ui_factory.show_user_warning(
2606
'deprecated_command_option',
2607
deprecated_name='--include-merges',
2608
recommended_name='--include-merged',
2609
deprecated_in_version='2.5',
2610
command=self.invoked_as)
2611
if include_merged is None:
2612
include_merged = include_merges
2614
raise errors.BzrCommandError(gettext(
2615
'{0} and {1} are mutually exclusive').format(
2616
'--include-merges', '--include-merged'))
2617
if include_merged is None:
2618
include_merged = False
2330
2619
if (exclude_common_ancestry
2331
2620
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2621
raise errors.BzrCommandError(gettext(
2622
'--exclude-common-ancestry requires -r with two revisions'))
2335
2624
if levels is None:
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2627
raise errors.BzrCommandError(gettext(
2628
'{0} and {1} are mutually exclusive').format(
2629
'--levels', '--include-merged'))
2341
2631
if change is not None:
2342
2632
if len(change) > 1:
2343
2633
raise errors.RangeInChangeOption()
2344
2634
if revision is not None:
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2635
raise errors.BzrCommandError(gettext(
2636
'{0} and {1} are mutually exclusive').format(
2637
'--revision', '--change'))
2348
2639
revision = change
2528
2837
help='Recurse into subdirectories.'),
2529
2838
Option('from-root',
2530
2839
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2840
Option('unknown', short_name='u',
2841
help='Print unknown files.'),
2532
2842
Option('versioned', help='Print versioned files.',
2533
2843
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.'),
2844
Option('ignored', short_name='i',
2845
help='Print ignored files.'),
2846
Option('kind', short_name='k',
2539
2847
help='List entries of a particular kind: file, directory, symlink.',
2543
2853
@display_command
2544
2854
def run(self, revision=None, verbose=False,
2545
2855
recursive=False, from_root=False,
2546
2856
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2857
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2859
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2860
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
2862
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2863
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
2864
all = not (unknown or versioned or ignored)
2556
2866
selection = {'I':ignored, '?':unknown, 'V':versioned}
2725
3045
self.outf.write("%s\n" % pattern)
2727
3047
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3048
raise errors.BzrCommandError(gettext("ignore requires at least one "
3049
"NAME_PATTERN or --default-rules."))
2730
3050
name_pattern_list = [globbing.normalize_pattern(p)
2731
3051
for p in name_pattern_list]
3053
bad_patterns_count = 0
3054
for p in name_pattern_list:
3055
if not globbing.Globster.is_pattern_valid(p):
3056
bad_patterns_count += 1
3057
bad_patterns += ('\n %s' % p)
3059
msg = (ngettext('Invalid ignore pattern found. %s',
3060
'Invalid ignore patterns found. %s',
3061
bad_patterns_count) % bad_patterns)
3062
ui.ui_factory.show_error(msg)
3063
raise errors.InvalidPattern('')
2732
3064
for name_pattern in name_pattern_list:
2733
3065
if (name_pattern[0] == '/' or
2734
3066
(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'.')
3067
raise errors.BzrCommandError(gettext(
3068
"NAME_PATTERN should not be an absolute path"))
3069
tree, relpath = WorkingTree.open_containing(directory)
2738
3070
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3071
ignored = globbing.Globster(name_pattern_list)
3073
self.add_cleanup(tree.lock_read().unlock)
2742
3074
for entry in tree.list_files():
2744
3076
if id is not None:
2745
3077
filename = entry[0]
2746
3078
if ignored.match(filename):
2747
3079
matches.append(filename)
2749
3080
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3081
self.outf.write(gettext("Warning: the following files are version "
3082
"controlled and match your ignore pattern:\n%s"
2752
3083
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3084
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2756
3087
class cmd_ignored(Command):
2842
3175
Option('per-file-timestamps',
2843
3176
help='Set modification time of files to that of the last '
2844
3177
'revision in which it was changed.'),
3178
Option('uncommitted',
3179
help='Export the working tree contents rather than that of the '
2846
3182
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
3183
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2848
3185
from bzrlib.export import export
2850
3187
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
3188
branch_or_subdir = directory
3190
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3192
if tree is not None:
3193
self.add_cleanup(tree.lock_read().unlock)
3197
raise errors.BzrCommandError(
3198
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)
3201
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3203
export(export_tree, dest, format, root, subdir, filtered=filters,
2861
3204
per_file_timestamps=per_file_timestamps)
2862
3205
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3206
raise errors.BzrCommandError(
3207
gettext('Unsupported export format: %s') % e.format)
2866
3210
class cmd_cat(Command):
2885
3229
@display_command
2886
3230
def run(self, filename, revision=None, name_from_revision=False,
3231
filters=False, directory=None):
2888
3232
if revision is not None and len(revision) != 1:
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3233
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3234
" one revision specifier"))
2891
3235
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3236
_open_directory_or_containing_tree_or_branch(filename, directory)
3237
self.add_cleanup(branch.lock_read().unlock)
2895
3238
return self._run(tree, branch, relpath, filename, revision,
2896
3239
name_from_revision, filters)
2900
3243
if tree is None:
2901
3244
tree = b.basis_tree()
2902
3245
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3246
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3248
old_file_id = rev_tree.path2id(relpath)
3250
# TODO: Split out this code to something that generically finds the
3251
# best id for a path across one or more trees; it's like
3252
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3254
if name_from_revision:
2909
3255
# Try in revision if requested
2910
3256
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3257
raise errors.BzrCommandError(gettext(
3258
"{0!r} is not present in revision {1}").format(
2913
3259
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3261
actual_file_id = old_file_id
2917
3263
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" % (
3264
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3265
actual_file_id = cur_file_id
3266
elif old_file_id is not None:
3267
actual_file_id = old_file_id
3269
raise errors.BzrCommandError(gettext(
3270
"{0!r} is not present in revision {1}").format(
2935
3271
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)
3273
from bzrlib.filter_tree import ContentFilterTree
3274
filter_tree = ContentFilterTree(rev_tree,
3275
rev_tree._content_filter_stack)
3276
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3278
content = rev_tree.get_file_text(actual_file_id)
3280
self.outf.write(content)
2952
3283
class cmd_local_time_offset(Command):
3013
3344
to trigger updates to external systems like bug trackers. The --fixes
3014
3345
option can be used to record the association between a revision and
3015
3346
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
3349
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3350
takes_args = ['selected*']
3076
3382
Option('show-diff', short_name='p',
3077
3383
help='When no message is supplied, show the diff along'
3078
3384
' with the status summary in the message editor.'),
3386
help='When committing to a foreign version control '
3387
'system do not push data that can not be natively '
3080
3390
aliases = ['ci', 'checkin']
3082
3392
def _iter_bug_fix_urls(self, fixes, branch):
3393
default_bugtracker = None
3083
3394
# Configure the properties for bug fixing attributes.
3084
3395
for fixed_bug in fixes:
3085
3396
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3397
if len(tokens) == 1:
3398
if default_bugtracker is None:
3399
branch_config = branch.get_config()
3400
default_bugtracker = branch_config.get_user_option(
3402
if default_bugtracker is None:
3403
raise errors.BzrCommandError(gettext(
3404
"No tracker specified for bug %s. Use the form "
3405
"'tracker:id' or specify a default bug tracker "
3406
"using the `bugtracker` option.\nSee "
3407
"\"bzr help bugs\" for more information on this "
3408
"feature. Commit refused.") % fixed_bug)
3409
tag = default_bugtracker
3411
elif len(tokens) != 2:
3412
raise errors.BzrCommandError(gettext(
3088
3413
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
3414
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3415
"feature.\nCommit refused.") % fixed_bug)
3417
tag, bug_id = tokens
3093
3419
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
3420
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3421
raise errors.BzrCommandError(gettext(
3422
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3097
3423
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3424
raise errors.BzrCommandError(gettext(
3425
"%s\nCommit refused.") % (str(e),))
3101
3427
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3428
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3429
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3431
from bzrlib.errors import (
3105
3432
PointlessCommit,
3106
3433
ConflictsInTree,
3184
3509
# make_commit_message_template_encoded returns user encoding.
3185
3510
# 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")
3512
my_message = set_commit_message(commit_obj)
3513
if my_message is None:
3514
start_message = generate_commit_message_template(commit_obj)
3515
my_message = edit_commit_message_encoded(text,
3516
start_message=start_message)
3517
if my_message is None:
3518
raise errors.BzrCommandError(gettext("please specify a commit"
3519
" message with either --message or --file"))
3520
if my_message == "":
3521
raise errors.BzrCommandError(gettext("Empty commit message specified."
3522
" Please specify a commit message with either"
3523
" --message or --file or leave a blank message"
3524
" with --message \"\"."))
3195
3525
return my_message
3197
3527
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3535
reporter=None, verbose=verbose, revprops=properties,
3206
3536
authors=author, timestamp=commit_stamp,
3207
3537
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3538
exclude=tree.safe_relpath_files(exclude),
3209
3540
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3541
raise errors.BzrCommandError(gettext("No changes to commit."
3542
" Please 'bzr add' the files you want to commit, or use"
3543
" --unchanged to force an empty commit."))
3212
3544
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3545
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3214
3546
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3216
3548
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3549
raise errors.BzrCommandError(gettext("Commit refused because there are"
3550
" unknown files in the working tree."))
3219
3551
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3552
e.extra_help = (gettext("\n"
3221
3553
'To commit to master branch, run update and then commit.\n'
3222
3554
'You can also pass --local to commit to continue working '
3297
3629
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.
3630
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3632
When the default format has changed after a major new release of
3633
Bazaar, you may be informed during certain operations that you
3634
should upgrade. Upgrading to a newer format may improve performance
3635
or make new features available. It may however limit interoperability
3636
with older repositories or with older versions of Bazaar.
3638
If you wish to upgrade to a particular format rather than the
3639
current default, that can be specified using the --format option.
3640
As a consequence, you can use the upgrade command this way to
3641
"downgrade" to an earlier format, though some conversions are
3642
a one way process (e.g. changing from the 1.x default to the
3643
2.x default) so downgrading is not always possible.
3645
A backup.bzr.~#~ directory is created at the start of the conversion
3646
process (where # is a number). By default, this is left there on
3647
completion. If the conversion fails, delete the new .bzr directory
3648
and rename this one back in its place. Use the --clean option to ask
3649
for the backup.bzr directory to be removed on successful conversion.
3650
Alternatively, you can delete it by hand if everything looks good
3653
If the location given is a shared repository, dependent branches
3654
are also converted provided the repository converts successfully.
3655
If the conversion of a branch fails, remaining branches are still
3658
For more information on upgrades, see the Bazaar Upgrade Guide,
3659
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3662
_see_also = ['check', 'reconcile', 'formats']
3306
3663
takes_args = ['url?']
3307
3664
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'),
3665
RegistryOption('format',
3666
help='Upgrade to a specific format. See "bzr help'
3667
' formats" for details.',
3668
lazy_registry=('bzrlib.controldir', 'format_registry'),
3669
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3670
value_switches=True, title='Branch format'),
3672
help='Remove the backup.bzr directory if successful.'),
3674
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3677
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3678
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3679
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3681
if len(exceptions) == 1:
3682
# Compatibility with historical behavior
3321
3688
class cmd_whoami(Command):
3340
3708
encoding_type = 'replace'
3342
3710
@display_command
3343
def run(self, email=False, branch=False, name=None):
3711
def run(self, email=False, branch=False, name=None, directory=None):
3344
3712
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()
3713
if directory is None:
3714
# use branch if we're inside one; otherwise global config
3716
c = Branch.open_containing(u'.')[0].get_config_stack()
3717
except errors.NotBranchError:
3718
c = _mod_config.GlobalStack()
3720
c = Branch.open(directory).get_config_stack()
3721
identity = c.get('email')
3351
self.outf.write(c.user_email() + '\n')
3723
self.outf.write(_mod_config.extract_email_address(identity)
3353
self.outf.write(c.username() + '\n')
3726
self.outf.write(identity + '\n')
3730
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3733
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3735
_mod_config.extract_email_address(name)
3359
3736
except errors.NoEmailInUsername, e:
3360
3737
warning('"%s" does not seem to contain an email address. '
3361
3738
'This is allowed, but not recommended.', name)
3363
3740
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3742
if directory is None:
3743
c = Branch.open_containing(u'.')[0].get_config_stack()
3745
c = Branch.open(directory).get_config_stack()
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3747
c = _mod_config.GlobalStack()
3748
c.set('email', name)
3371
3751
class cmd_nick(Command):
3586
3971
def run(self, testspecs_list=None, verbose=False, one=False,
3587
3972
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
3974
first=False, list_only=False,
3590
3975
randomize=None, exclude=None, strict=False,
3591
3976
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)
3977
parallel=None, lsprof_tests=False,
3979
from bzrlib import tests
3602
3981
if testspecs_list is not None:
3603
3982
pattern = '|'.join(testspecs_list)
3608
3987
from bzrlib.tests import SubUnitBzrRunner
3609
3988
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3989
raise errors.BzrCommandError(gettext("subunit not available. subunit "
3990
"needs to be installed to use --subunit."))
3612
3991
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3992
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3993
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3994
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3995
# following code can be deleted when it's sufficiently deployed
3996
# -- vila/mgz 20100514
3997
if (sys.platform == "win32"
3998
and getattr(sys.stdout, 'fileno', None) is not None):
3617
4000
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
4002
self.additional_selftest_args.setdefault(
3620
4003
'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)
4005
raise errors.BzrCommandError(gettext(
4006
"--benchmark is no longer supported from bzr 2.2; "
4007
"use bzr-usertest instead"))
4008
test_suite_factory = None
4010
exclude_pattern = None
3629
test_suite_factory = None
4012
exclude_pattern = '(' + '|'.join(exclude) + ')'
4014
self._disable_fsync()
3631
4015
selftest_kwargs = {"verbose": verbose,
3632
4016
"pattern": pattern,
3633
4017
"stop_on_failure": one,
3635
4019
"test_suite_factory": test_suite_factory,
3636
4020
"lsprof_timed": lsprof_timed,
3637
4021
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
4022
"matching_tests_first": first,
3640
4023
"list_only": list_only,
3641
4024
"random_seed": randomize,
3642
"exclude_pattern": exclude,
4025
"exclude_pattern": exclude_pattern,
3643
4026
"strict": strict,
3644
4027
"load_list": load_list,
3645
4028
"debug_flags": debugflag,
3646
4029
"starting_with": starting_with
3648
4031
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
4033
# Make deprecation warnings visible, unless -Werror is set
4034
cleanup = symbol_versioning.activate_deprecation_warnings(
4037
result = tests.selftest(**selftest_kwargs)
3650
4040
return int(not result)
4042
def _disable_fsync(self):
4043
"""Change the 'os' functionality to not synchronize."""
4044
self._orig_fsync = getattr(os, 'fsync', None)
4045
if self._orig_fsync is not None:
4046
os.fsync = lambda filedes: None
4047
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4048
if self._orig_fdatasync is not None:
4049
os.fdatasync = lambda filedes: None
3653
4052
class cmd_version(Command):
3654
4053
__doc__ = """Show version of bzr."""
3709
4106
The source of the merge can be specified either in the form of a branch,
3710
4107
or in the form of a path to a file containing a merge directive generated
3711
4108
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.
4109
or the branch most recently merged using --remember. The source of the
4110
merge may also be specified in the form of a path to a file in another
4111
branch: in this case, only the modifications to that file are merged into
4112
the current working tree.
4114
When merging from a branch, by default bzr will try to merge in all new
4115
work from the other branch, automatically determining an appropriate base
4116
revision. If this fails, you may need to give an explicit base.
4118
To pick a different ending revision, pass "--revision OTHER". bzr will
4119
try to merge in all new work up to and including revision OTHER.
4121
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4122
through OTHER, excluding BASE but including OTHER, will be merged. If this
4123
causes some revisions to be skipped, i.e. if the destination branch does
4124
not already contain revision BASE, such a merge is commonly referred to as
4125
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4126
cherrypicks. The changes look like a normal commit, and the history of the
4127
changes from the other branch is not stored in the commit.
4129
Revision numbers are always relative to the source branch.
3725
4131
Merge will do its best to combine the changes in two branches, but there
3726
4132
are some kinds of problems only a human can fix. When it encounters those,
3730
4136
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.
4138
If there is no default branch set, the first merge will set it (use
4139
--no-remember to avoid setting it). After that, you can omit the branch
4140
to use the default. To change the default, use --remember. The value will
4141
only be saved if the remote location can be accessed.
3737
4143
The results of the merge are placed into the destination working
3738
4144
directory, where they can be reviewed (with bzr diff), tested, and then
3739
4145
committed to record the result of the merge.
3741
4147
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
4148
--force is given. If --force is given, then the changes from the source
4149
will be merged with the current working tree, including any uncommitted
4150
changes in the tree. The --force option can also be used to create a
3743
4151
merge revision which has more than two parents.
3745
4153
If one would like to merge changes from the working tree of the other
3847
4255
mergeable = None
3849
4257
if uncommitted:
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
4258
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4259
' with bundles or merge directives.'))
3853
4261
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
4262
raise errors.BzrCommandError(gettext(
4263
'Cannot use -r with merge directives or bundles'))
3856
4264
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3857
4265
mergeable, None)
3859
4267
if merger is None and uncommitted:
3860
4268
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
4269
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4270
' --revision at the same time.'))
3863
4271
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
4272
allow_pending = False
3873
4281
self.sanity_check_merger(merger)
3874
4282
if (merger.base_rev_id == merger.other_rev_id and
3875
4283
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4284
# check if location is a nonexistent file (and not a branch) to
4285
# disambiguate the 'Nothing to do'
4286
if merger.interesting_files:
4287
if not merger.other_tree.has_filename(
4288
merger.interesting_files[0]):
4289
note(gettext("merger: ") + str(merger))
4290
raise errors.PathsDoNotExist([location])
4291
note(gettext('Nothing to do.'))
4293
if pull and not preview:
3879
4294
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4295
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4296
if (merger.base_rev_id == tree.last_revision()):
3882
4297
result = tree.pull(merger.other_branch, False,
3883
4298
merger.other_rev_id)
3884
4299
result.report(self.outf)
3886
4301
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4302
raise errors.BzrCommandError(gettext(
3888
4303
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4304
" (perhaps you would prefer 'bzr pull')"))
3891
4306
return self._do_preview(merger)
3892
4307
elif interactive:
3988
4405
if other_revision_id is None:
3989
4406
other_revision_id = _mod_revision.ensure_null(
3990
4407
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):
4408
# Remember where we merge from. We need to remember if:
4409
# - user specify a location (and we don't merge from the parent
4411
# - user ask to remember or there is no previous location set to merge
4412
# from and user didn't ask to *not* remember
4413
if (user_location is not None
4415
or (remember is None
4416
and tree.branch.get_submit_branch() is None)))):
3994
4417
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4418
# Merge tags (but don't set them in the master branch yet, the user
4419
# might revert this merge). Commit will propagate them.
4420
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4421
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4422
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4423
if other_path != '':
4340
4767
theirs_only=False,
4341
4768
log_format=None, long=False, short=False, line=False,
4342
4769
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4770
include_merged=None, revision=None, my_revision=None,
4772
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4344
4773
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4774
def message(s):
4346
4775
if not is_quiet():
4347
4776
self.outf.write(s)
4778
if symbol_versioning.deprecated_passed(include_merges):
4779
ui.ui_factory.show_user_warning(
4780
'deprecated_command_option',
4781
deprecated_name='--include-merges',
4782
recommended_name='--include-merged',
4783
deprecated_in_version='2.5',
4784
command=self.invoked_as)
4785
if include_merged is None:
4786
include_merged = include_merges
4788
raise errors.BzrCommandError(gettext(
4789
'{0} and {1} are mutually exclusive').format(
4790
'--include-merges', '--include-merged'))
4791
if include_merged is None:
4792
include_merged = False
4350
4794
mine_only = this
4359
4803
elif theirs_only:
4360
4804
restrict = 'remote'
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4806
local_branch = Branch.open_containing(directory)[0]
4807
self.add_cleanup(local_branch.lock_read().unlock)
4366
4809
parent = local_branch.get_parent()
4367
4810
if other_branch is None:
4368
4811
other_branch = parent
4369
4812
if other_branch is None:
4370
raise errors.BzrCommandError("No peer location known"
4813
raise errors.BzrCommandError(gettext("No peer location known"
4372
4815
display_url = urlutils.unescape_for_display(parent,
4373
4816
self.outf.encoding)
4374
message("Using saved parent location: "
4375
+ display_url + "\n")
4817
message(gettext("Using saved parent location: {0}\n").format(
4377
4820
remote_branch = Branch.open(other_branch)
4378
4821
if remote_branch.base == local_branch.base:
4379
4822
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4824
self.add_cleanup(remote_branch.lock_read().unlock)
4384
4826
local_revid_range = _revision_range_to_revid_range(
4385
4827
_get_revision_range(my_revision, local_branch,
4430
4876
if mine_only and not local_extra:
4431
4877
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4878
message(gettext('This branch has no new revisions.\n'))
4433
4879
elif theirs_only and not remote_extra:
4434
4880
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4881
message(gettext('Other branch has no new revisions.\n'))
4436
4882
elif not (mine_only or theirs_only or local_extra or
4438
4884
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
4886
message(gettext("Branches are up to date.\n"))
4441
4887
self.cleanup_now()
4442
4888
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)
4889
self.add_cleanup(local_branch.lock_write().unlock)
4445
4890
# handle race conditions - a parent might be set while we run.
4446
4891
if local_branch.get_parent() is None:
4447
4892
local_branch.set_parent(remote_branch.base)
4507
4952
@display_command
4508
4953
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")
4954
from bzrlib import plugin
4955
# Don't give writelines a generator as some codecs don't like that
4956
self.outf.writelines(
4957
list(plugin.describe_plugins(show_paths=verbose)))
4531
4960
class cmd_testament(Command):
4578
5006
Option('long', help='Show commit date in annotations.'),
4582
5011
encoding_type = 'exact'
4584
5013
@display_command
4585
5014
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5015
show_ids=False, directory=None):
5016
from bzrlib.annotate import (
4588
5019
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5020
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
5021
if wt is not None:
4592
self.add_cleanup(wt.unlock)
5022
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5024
self.add_cleanup(branch.lock_read().unlock)
4596
5025
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
5026
self.add_cleanup(tree.lock_read().unlock)
5027
if wt is not None and revision is None:
4600
5028
file_id = wt.path2id(relpath)
4602
5030
file_id = tree.path2id(relpath)
4603
5031
if file_id is None:
4604
5032
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
5033
if wt is not None and revision is None:
4607
5034
# If there is a tree and we're not annotating historical
4608
5035
# versions, annotate the working tree's content.
4609
5036
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
5037
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5039
annotate_file_tree(tree, file_id, self.outf, long, all,
5040
show_ids=show_ids, branch=branch)
4616
5043
class cmd_re_sign(Command):
4620
5047
hidden = True # is this right ?
4621
5048
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5049
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
5051
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5052
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')
5053
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5054
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)
5055
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5056
b = WorkingTree.open_containing(directory)[0].branch
5057
self.add_cleanup(b.lock_write().unlock)
4632
5058
return self._run(b, revision_id_list, revision)
4634
5060
def _run(self, b, revision_id_list, revision):
4635
5061
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5062
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4637
5063
if revision_id_list is not None:
4638
5064
b.repository.start_write_group()
4694
5120
_see_also = ['checkouts', 'unbind']
4695
5121
takes_args = ['location?']
5122
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5124
def run(self, location=None, directory=u'.'):
5125
b, relpath = Branch.open_containing(directory)
4700
5126
if location is None:
4702
5128
location = b.get_old_bound_location()
4703
5129
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5130
raise errors.BzrCommandError(gettext('No location supplied. '
5131
'This format does not remember old locations.'))
4707
5133
if location is None:
4708
5134
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5135
raise errors.BzrCommandError(gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5137
raise errors.BzrCommandError(gettext('No location supplied '
5138
'and no previous location known'))
4713
5139
b_other = Branch.open(location)
4715
5141
b.bind(b_other)
4716
5142
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5143
raise errors.BzrCommandError(gettext('These branches have diverged.'
5144
' Try merging, and then bind again.'))
4719
5145
if b.get_config().has_explicit_nickname():
4720
5146
b.nick = b_other.nick
4784
5211
b = control.open_branch()
4786
5213
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5214
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)
5216
self.add_cleanup(b.lock_write().unlock)
5217
return self._run(b, tree, dry_run, verbose, revision, force,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5220
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4795
5222
from bzrlib.log import log_formatter, show_log
4796
5223
from bzrlib.uncommit import uncommit
4827
5254
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5257
self.outf.write(gettext('Dry-run, pretending to remove'
5258
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5260
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')
5263
if not ui.ui_factory.confirm_action(
5264
gettext(u'Uncommit these revisions'),
5265
'bzrlib.builtins.uncommit',
5267
self.outf.write(gettext('Canceled\n'))
4840
5270
mutter('Uncommitting from {%s} to {%s}',
4841
5271
last_rev_id, rev_id)
4842
5272
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)
5273
revno=revno, local=local, keep_tags=keep_tags)
5274
self.outf.write(gettext('You can restore the old tip by running:\n'
5275
' bzr pull . -r revid:%s\n') % last_rev_id)
4848
5278
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5279
__doc__ = """Break a dead lock.
5281
This command breaks a lock on a repository, branch, working directory or
4851
5284
CAUTION: Locks should only be broken when you are sure that the process
4852
5285
holding the lock has been stopped.
4859
5292
bzr break-lock bzr+ssh://example.com/bzr/foo
5293
bzr break-lock --conf ~/.bazaar
4861
5296
takes_args = ['location?']
5299
help='LOCATION is the directory where the config lock is.'),
5301
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5304
def run(self, location=None, config=False, force=False):
4864
5305
if location is None:
4865
5306
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5308
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5310
{'bzrlib.lockdir.break': True})
5312
conf = _mod_config.LockableConfig(file_name=location)
5315
control, relpath = controldir.ControlDir.open_containing(location)
5317
control.break_lock()
5318
except NotImplementedError:
4873
5322
class cmd_wait_until_signalled(Command):
4936
5386
return host, port
4938
5388
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5389
protocol=None, client_timeout=None):
5390
from bzrlib import transport
4941
5391
if directory is None:
4942
5392
directory = os.getcwd()
4943
5393
if protocol is None:
4944
protocol = transport_server_registry.get()
5394
protocol = transport.transport_server_registry.get()
4945
5395
host, port = self.get_host_and_port(port)
4946
url = urlutils.local_path_to_url(directory)
5396
url = transport.location_to_url(directory)
4947
5397
if not allow_writes:
4948
5398
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5399
t = transport.get_transport_from_url(url)
5401
protocol(t, host, port, inet, client_timeout)
5402
except TypeError, e:
5403
# We use symbol_versioning.deprecated_in just so that people
5404
# grepping can find it here.
5405
# symbol_versioning.deprecated_in((2, 5, 0))
5406
symbol_versioning.warn(
5407
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5408
'Most likely it needs to be updated to support a'
5409
' "timeout" parameter (added in bzr 2.5.0)'
5410
% (e, protocol.__module__, protocol),
5412
protocol(t, host, port, inet)
4953
5415
class cmd_join(Command):
5359
5826
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5827
self.add_cleanup(branch.lock_write().unlock)
5363
5829
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5830
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5831
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5832
note(gettext('Deleted tag %s.') % tag_name)
5369
5835
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5836
raise errors.BzrCommandError(gettext(
5371
5837
"Tags can only be placed on a single revision, "
5373
5839
revision_id = revision[0].as_revision_id(branch)
5375
5841
revision_id = branch.last_revision()
5376
5842
if tag_name is None:
5377
5843
tag_name = branch.automatic_tag_name(revision_id)
5378
5844
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):
5845
raise errors.BzrCommandError(gettext(
5846
"Please specify a tag name."))
5848
existing_target = branch.tags.lookup_tag(tag_name)
5849
except errors.NoSuchTag:
5850
existing_target = None
5851
if not force and existing_target not in (None, revision_id):
5382
5852
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5853
if existing_target == revision_id:
5854
note(gettext('Tag %s already exists for that revision.') % tag_name)
5856
branch.tags.set_tag(tag_name, revision_id)
5857
if existing_target is None:
5858
note(gettext('Created tag %s.') % tag_name)
5860
note(gettext('Updated tag %s.') % tag_name)
5387
5863
class cmd_tags(Command):
5393
5869
_see_also = ['tag']
5394
5870
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5871
custom_help('directory',
5872
help='Branch whose tags should be displayed.'),
5873
RegistryOption('sort',
5401
5874
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5875
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
5881
@display_command
5882
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5883
from bzrlib.tag import tag_sort_methods
5416
5884
branch, relpath = Branch.open_containing(directory)
5418
5886
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
5890
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]])
5892
# Restrict to the specified range
5893
tags = self._tags_for_range(branch, revision)
5895
sort = tag_sort_methods.get()
5444
5897
if not show_ids:
5445
5898
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
5899
for index, (tag, revid) in enumerate(tags):
5457
5912
for tag, revspec in tags:
5458
5913
self.outf.write('%-20s %s\n' % (tag, revspec))
5915
def _tags_for_range(self, branch, revision):
5917
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5918
revid1, revid2 = rev1.rev_id, rev2.rev_id
5919
# _get_revision_range will always set revid2 if it's not specified.
5920
# If revid1 is None, it means we want to start from the branch
5921
# origin which is always a valid ancestor. If revid1 == revid2, the
5922
# ancestry check is useless.
5923
if revid1 and revid1 != revid2:
5924
# FIXME: We really want to use the same graph than
5925
# branch.iter_merge_sorted_revisions below, but this is not
5926
# easily available -- vila 2011-09-23
5927
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5928
# We don't want to output anything in this case...
5930
# only show revisions between revid1 and revid2 (inclusive)
5931
tagged_revids = branch.tags.get_reverse_tag_dict()
5933
for r in branch.iter_merge_sorted_revisions(
5934
start_revision_id=revid2, stop_revision_id=revid1,
5935
stop_rule='include'):
5936
revid_tags = tagged_revids.get(r[0], None)
5938
found.extend([(tag, r[0]) for tag in revid_tags])
5461
5942
class cmd_reconfigure(Command):
5462
5943
__doc__ = """Reconfigure the type of a bzr directory.
5476
5957
takes_args = ['location?']
5477
5958
takes_options = [
5478
5959
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
5962
help='The relation between branch and tree.',
5482
5963
value_switches=True, enum_switch=False,
5483
5964
branch='Reconfigure to be an unbound branch with no working tree.',
5484
5965
tree='Reconfigure to be an unbound branch with a working tree.',
5485
5966
checkout='Reconfigure to be a bound branch with a working tree.',
5486
5967
lightweight_checkout='Reconfigure to be a lightweight'
5487
5968
' checkout (with no local history).',
5970
RegistryOption.from_kwargs(
5972
title='Repository type',
5973
help='Location fo the repository.',
5974
value_switches=True, enum_switch=False,
5488
5975
standalone='Reconfigure to be a standalone branch '
5489
5976
'(i.e. stop using shared repository).',
5490
5977
use_shared='Reconfigure to use a shared repository.',
5979
RegistryOption.from_kwargs(
5981
title='Trees in Repository',
5982
help='Whether new branches in the repository have trees.',
5983
value_switches=True, enum_switch=False,
5491
5984
with_trees='Reconfigure repository to create '
5492
5985
'working trees on branches by default.',
5493
5986
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)
6003
def run(self, location=None, bind_to=None, force=False,
6004
tree_type=None, repository_type=None, repository_trees=None,
6005
stacked_on=None, unstacked=None):
6006
directory = controldir.ControlDir.open(location)
5514
6007
if stacked_on and unstacked:
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
6008
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5516
6009
elif stacked_on is not None:
5517
6010
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5518
6011
elif unstacked:
5520
6013
# At the moment you can use --stacked-on and a different
5521
6014
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
6016
if (tree_type is None and
6017
repository_type is None and
6018
repository_trees is None):
5524
6019
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6022
raise errors.BzrCommandError(gettext('No target configuration '
6024
reconfiguration = None
6025
if tree_type == 'branch':
5530
6026
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
6027
elif tree_type == 'tree':
5532
6028
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
6029
elif tree_type == 'checkout':
5534
6030
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
6031
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
6032
elif tree_type == 'lightweight-checkout':
5537
6033
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
6034
directory, bind_to)
5539
elif target_type == 'use-shared':
6036
reconfiguration.apply(force)
6037
reconfiguration = None
6038
if repository_type == 'use-shared':
5540
6039
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
6040
elif repository_type == 'standalone':
5542
6041
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
6043
reconfiguration.apply(force)
6044
reconfiguration = None
6045
if repository_trees == 'with-trees':
5544
6046
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6047
directory, True)
5546
elif target_type == 'with-no-trees':
6048
elif repository_trees == 'with-no-trees':
5547
6049
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6050
directory, False)
5549
reconfiguration.apply(force)
6052
reconfiguration.apply(force)
6053
reconfiguration = None
5552
6056
class cmd_switch(Command):
5600
6105
had_explicit_nick = False
5601
6106
if create_branch:
5602
6107
if branch is None:
5603
raise errors.BzrCommandError('cannot create branch without'
6108
raise errors.BzrCommandError(gettext('cannot create branch without'
5605
6110
to_location = directory_service.directories.dereference(
5607
6112
if '/' not in to_location and '\\' not in to_location:
5608
6113
# This path is meant to be relative to the existing branch
5609
6114
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
6115
# Perhaps the target control dir supports colocated branches?
6117
root = controldir.ControlDir.open(this_url,
6118
possible_transports=[control_dir.user_transport])
6119
except errors.NotBranchError:
6122
colocated = root._format.colocated_branches
6124
to_location = urlutils.join_segment_parameters(this_url,
6125
{"branch": urlutils.escape(to_location)})
6127
to_location = urlutils.join(
6128
this_url, '..', urlutils.escape(to_location))
5611
6129
to_branch = branch.bzrdir.sprout(to_location,
5612
6130
possible_transports=[branch.bzrdir.root_transport],
5613
6131
source_branch=branch).open_branch()
6133
# 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))
6135
to_branch = control_dir.open_branch(to_location)
6136
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
6138
to_branch = Branch.open(to_location)
6139
except errors.NotBranchError:
6140
this_url = self._get_branch_location(control_dir)
6141
to_branch = Branch.open(
6143
this_url, '..', urlutils.escape(to_location)))
5621
6144
if revision is not None:
5622
6145
revision = revision.as_revision_id(to_branch)
5623
6146
switch.switch(control_dir, to_branch, force, revision_id=revision)
5624
6147
if had_explicit_nick:
5625
6148
branch = control_dir.open_branch() #get the new branch!
5626
6149
branch.nick = to_branch.nick
5627
note('Switched to branch: %s',
6150
note(gettext('Switched to branch: %s'),
5628
6151
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
6153
def _get_branch_location(self, control_dir):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6258
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6260
current_view, view_dict = tree.views.get_view_info()
5737
6261
if name is None:
5738
6262
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6265
raise errors.BzrCommandError(gettext(
6266
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6268
raise errors.BzrCommandError(gettext(
6269
"Both --delete and --switch specified"))
5747
6271
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6272
self.outf.write(gettext("Deleted all views.\n"))
5749
6273
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6274
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6276
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6277
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6280
raise errors.BzrCommandError(gettext(
6281
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6283
raise errors.BzrCommandError(gettext(
6284
"Both --switch and --all specified"))
5761
6285
elif switch == 'off':
5762
6286
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6287
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6288
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6289
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6291
tree.views.set_view_info(switch, view_dict)
5768
6292
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6293
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6296
self.outf.write(gettext('Views defined:\n'))
5773
6297
for view in sorted(view_dict):
5774
6298
if view == current_view:
5778
6302
view_str = views.view_display_str(view_dict[view])
5779
6303
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6305
self.outf.write(gettext('No views defined.\n'))
5782
6306
elif file_list:
5783
6307
if name is None:
5784
6308
# No name given and no current view set
5786
6310
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6311
raise errors.BzrCommandError(gettext(
6312
"Cannot change the 'off' pseudo view"))
5789
6313
tree.views.set_view(name, sorted(file_list))
5790
6314
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6315
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6317
# list the files
5794
6318
if name is None:
5795
6319
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6320
self.outf.write(gettext('No current view.\n'))
5798
6322
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6323
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6326
class cmd_hooks(Command):
5883
6420
Option('destroy',
5884
6421
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6423
_see_also = ['unshelve', 'configuration']
5888
6425
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6426
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6428
return self.run_for_list(directory=directory)
5892
6429
from bzrlib.shelf_ui import Shelver
5893
6430
if writer is None:
5894
6431
writer = bzrlib.option.diff_writer_registry.get()
5896
6433
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6434
file_list, message, destroy=destroy, directory=directory)
5975
6515
' deleting them.'),
5976
6516
Option('force', help='Do not prompt before deleting.')]
5977
6517
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6518
force=False, directory=u'.'):
5979
6519
from bzrlib.clean_tree import clean_tree
5980
6520
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6524
clean_tree(directory, unknown=unknown, ignored=ignored,
6525
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6528
class cmd_reference(Command):
6032
6572
self.outf.write('%s %s\n' % (path, location))
6575
class cmd_export_pot(Command):
6576
__doc__ = """Export command helps and error messages in po format."""
6579
takes_options = [Option('plugin',
6580
help='Export help text from named command '\
6581
'(defaults to all built in commands).',
6583
Option('include-duplicates',
6584
help='Output multiple copies of the same msgid '
6585
'string if it appears more than once.'),
6588
def run(self, plugin=None, include_duplicates=False):
6589
from bzrlib.export_pot import export_pot
6590
export_pot(self.outf, plugin, include_duplicates)
6035
6593
def _register_lazy_builtins():
6036
6594
# register lazy builtins from other modules; called at startup and should
6037
6595
# be only called once.
6038
6596
for (name, aliases, module_name) in [
6039
6597
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6598
('cmd_config', [], 'bzrlib.config'),
6040
6599
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6600
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6601
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6602
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6603
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6604
('cmd_verify_signatures', [],
6605
'bzrlib.commit_signature_commands'),
6606
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6608
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
