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