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