172
175
:return: workingtree, [relative_paths]
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
177
return WorkingTree.open_containing_paths(
178
file_list, default_directory='.',
223
183
def _get_view_info_for_change_reporter(tree):
310
286
def run(self, show_ids=False, file_list=None, revision=None, short=False,
311
versioned=False, no_pending=False, verbose=False):
287
versioned=False, no_pending=False, verbose=False,
312
289
from bzrlib.status import show_tree_status
314
291
if revision and len(revision) > 2:
315
raise errors.BzrCommandError('bzr status --revision takes exactly'
316
' one or two revision specifiers')
292
raise errors.BzrCommandError(gettext('bzr status --revision takes exactly'
293
' one or two revision specifiers'))
318
tree, relfile_list = tree_files(file_list)
295
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
319
296
# Avoid asking for specific files when that is not needed.
320
297
if relfile_list == ['']:
321
298
relfile_list = None
353
331
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
334
def run(self, revision_id=None, revision=None, directory=u'.'):
357
335
if revision_id is not None and revision is not None:
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
336
raise errors.BzrCommandError(gettext('You can only supply one of'
337
' revision_id or --revision'))
360
338
if revision_id is None and revision is None:
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
339
raise errors.BzrCommandError(gettext('You must supply either'
340
' --revision or a revision_id'))
342
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
365
344
revisions = b.repository.revisions
366
345
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
346
raise errors.BzrCommandError(gettext('Repository %r does not support '
347
'access to raw revision texts'))
370
349
b.repository.lock_read()
497
479
working = d.open_workingtree()
498
480
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
481
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
482
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
483
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
484
" of a remote path"))
504
486
if (working.has_changes()):
505
487
raise errors.UncommittedChanges(working)
488
if working.get_shelf_manager().last_shelf() is not None:
489
raise errors.ShelvedChanges(working)
507
491
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
492
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
493
" from a lightweight checkout"))
511
495
d.destroy_workingtree()
498
class cmd_repair_workingtree(Command):
499
__doc__ = """Reset the working tree state file.
501
This is not meant to be used normally, but more as a way to recover from
502
filesystem corruption, etc. This rebuilds the working inventory back to a
503
'known good' state. Any new modifications (adding a file, renaming, etc)
504
will be lost, though modified files will still be detected as such.
506
Most users will want something more like "bzr revert" or "bzr update"
507
unless the state file has become corrupted.
509
By default this attempts to recover the current state by looking at the
510
headers of the state file. If the state file is too corrupted to even do
511
that, you can supply --revision to force the state of the tree.
514
takes_options = ['revision', 'directory',
516
help='Reset the tree even if it doesn\'t appear to be'
521
def run(self, revision=None, directory='.', force=False):
522
tree, _ = WorkingTree.open_containing(directory)
523
self.add_cleanup(tree.lock_tree_write().unlock)
527
except errors.BzrError:
528
pass # There seems to be a real error here, so we'll reset
531
raise errors.BzrCommandError(gettext(
532
'The tree does not appear to be corrupt. You probably'
533
' want "bzr revert" instead. Use "--force" if you are'
534
' sure you want to reset the working tree.'))
538
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
540
tree.reset_state(revision_ids)
541
except errors.BzrError, e:
542
if revision_ids is None:
543
extra = (gettext(', the header appears corrupt, try passing -r -1'
544
' to set the state to the last commit'))
547
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
550
class cmd_revno(Command):
515
551
__doc__ = """Show current revision number.
521
557
takes_args = ['location?']
522
558
takes_options = [
523
559
Option('tree', help='Show revno of working tree'),
527
def run(self, tree=False, location=u'.'):
564
def run(self, tree=False, location=u'.', revision=None):
565
if revision is not None and tree:
566
raise errors.BzrCommandError(gettext("--tree and --revision can "
567
"not be used together"))
530
571
wt = WorkingTree.open_containing(location)[0]
572
self.add_cleanup(wt.lock_read().unlock)
532
573
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
574
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
576
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
542
578
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
579
self.add_cleanup(b.lock_read().unlock)
581
if len(revision) != 1:
582
raise errors.BzrCommandError(gettext(
583
"Tags can only be placed on a single revision, "
585
revid = revision[0].as_revision_id(b)
587
revid = b.last_revision()
589
revno_t = b.revision_id_to_dotted_revno(revid)
590
except errors.NoSuchRevision:
592
revno = ".".join(str(n) for n in revno_t)
546
593
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
594
self.outf.write(revno + '\n')
550
597
class cmd_revision_info(Command):
757
807
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
758
808
if kind and kind not in ['file', 'directory', 'symlink']:
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
809
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
761
811
revision = _get_one_revision('inventory', revision)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
812
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
813
self.add_cleanup(work_tree.lock_read().unlock)
765
814
if revision is not None:
766
815
tree = revision.as_tree(work_tree.branch)
768
817
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
818
self.add_cleanup(tree.lock_read().unlock)
828
877
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
879
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
880
if names_list is None:
833
882
if len(names_list) < 2:
834
raise errors.BzrCommandError("missing file argument")
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
883
raise errors.BzrCommandError(gettext("missing file argument"))
884
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
885
self.add_cleanup(tree.lock_tree_write().unlock)
838
886
self._run(tree, names_list, rel_names, after)
840
888
def run_auto(self, names_list, after, dry_run):
841
889
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
890
raise errors.BzrCommandError(gettext('Only one path may be specified to'
845
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
893
raise errors.BzrCommandError(gettext('--after cannot be specified with'
895
work_tree, file_list = WorkingTree.open_containing_paths(
896
names_list, default_directory='.')
897
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
898
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
900
def _run(self, tree, names_list, rel_names, after):
946
994
match the remote one, use pull --overwrite. This will work even if the two
947
995
branches have diverged.
949
If there is no default location set, the first pull will set it. After
950
that, you can omit the location to use the default. To change the
951
default, use --remember. The value will only be saved if the remote
952
location can be accessed.
997
If there is no default location set, the first pull will set it (use
998
--no-remember to avoid setting it). After that, you can omit the
999
location to use the default. To change the default, use --remember. The
1000
value will only be saved if the remote location can be accessed.
1002
The --verbose option will display the revisions pulled using the log_format
1003
configuration option. You can use a different format by overriding it with
1004
-Olog_format=<other_format>.
954
1006
Note: The location can be specified either in the form of a branch,
955
1007
or in the form of a path to a file containing a merge directive generated
960
1012
takes_options = ['remember', 'overwrite', 'revision',
961
1013
custom_help('verbose',
962
1014
help='Show logs of pulled revisions.'),
1015
custom_help('directory',
964
1016
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
1017
'rather than the one containing the working directory.'),
970
1019
help="Perform a local pull in a bound "
971
1020
"branch. Local pulls are not applied to "
972
1021
"the master branch."
1024
help="Show base revision text in conflicts.")
975
1026
takes_args = ['location?']
976
1027
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1029
def run(self, location=None, remember=None, overwrite=False,
979
1030
revision=None, verbose=False,
980
directory=None, local=False):
1031
directory=None, local=False,
981
1033
# FIXME: too much stuff is in the command class
982
1034
revision_id = None
983
1035
mergeable = None
1008
1061
stored_loc = branch_to.get_parent()
1009
1062
if location is None:
1010
1063
if stored_loc is None:
1011
raise errors.BzrCommandError("No pull location known or"
1064
raise errors.BzrCommandError(gettext("No pull location known or"
1014
1067
display_url = urlutils.unescape_for_display(stored_loc,
1015
1068
self.outf.encoding)
1016
1069
if not is_quiet():
1017
self.outf.write("Using saved parent location: %s\n" % display_url)
1070
self.outf.write(gettext("Using saved parent location: %s\n") % display_url)
1018
1071
location = stored_loc
1020
1073
revision = _get_one_revision('pull', revision)
1021
1074
if mergeable is not None:
1022
1075
if revision is not None:
1023
raise errors.BzrCommandError(
1024
'Cannot use -r with merge directives or bundles')
1076
raise errors.BzrCommandError(gettext(
1077
'Cannot use -r with merge directives or bundles'))
1025
1078
mergeable.install_revisions(branch_to.repository)
1026
1079
base_revision_id, revision_id, verified = \
1027
1080
mergeable.get_merge_request(branch_to.repository)
1077
1134
do a merge (see bzr help merge) from the other branch, and commit that.
1078
1135
After that you will be able to do a push without '--overwrite'.
1080
If there is no default push location set, the first push will set it.
1081
After that, you can omit the location to use the default. To change the
1082
default, use --remember. The value will only be saved if the remote
1083
location can be accessed.
1137
If there is no default push location set, the first push will set it (use
1138
--no-remember to avoid setting it). After that, you can omit the
1139
location to use the default. To change the default, use --remember. The
1140
value will only be saved if the remote location can be accessed.
1142
The --verbose option will display the revisions pushed using the log_format
1143
configuration option. You can use a different format by overriding it with
1144
-Olog_format=<other_format>.
1086
1147
_see_also = ['pull', 'update', 'working-trees']
1110
1168
Option('strict',
1111
1169
help='Refuse to push if there are uncommitted changes in'
1112
1170
' the working tree, --no-strict disables the check.'),
1172
help="Don't populate the working tree, even for protocols"
1173
" that support it."),
1114
1175
takes_args = ['location?']
1115
1176
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1178
def run(self, location=None, remember=None, overwrite=False,
1118
1179
create_prefix=False, verbose=False, revision=None,
1119
1180
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1181
stacked=False, strict=None, no_tree=False):
1121
1182
from bzrlib.push import _show_push_branch
1123
1184
if directory is None:
1151
1212
# error by the feedback given to them. RBC 20080227.
1152
1213
stacked_on = parent_url
1153
1214
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1215
raise errors.BzrCommandError(gettext(
1216
"Could not determine branch to refer to."))
1157
1218
# Get the destination location
1158
1219
if location is None:
1159
1220
stored_loc = br_from.get_push_location()
1160
1221
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1222
raise errors.BzrCommandError(gettext(
1223
"No push location known or specified."))
1164
1225
display_url = urlutils.unescape_for_display(stored_loc,
1165
1226
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1227
note(gettext("Using saved push location: %s") % display_url)
1167
1228
location = stored_loc
1169
1230
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1231
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1232
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1233
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1236
class cmd_branch(Command):
1185
1246
To retrieve the branch as of a particular revision, supply the --revision
1186
1247
parameter, as in "branch foo/bar -r 5".
1249
The synonyms 'clone' and 'get' for this command are deprecated.
1189
1252
_see_also = ['checkout']
1190
1253
takes_args = ['from_location', 'to_location?']
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1254
takes_options = ['revision',
1255
Option('hardlink', help='Hard-link working tree files where possible.'),
1256
Option('files-from', type=str,
1257
help="Get file contents from this tree."),
1193
1258
Option('no-tree',
1194
1259
help="Create a branch without a working-tree."),
1195
1260
Option('switch',
1214
1279
def run(self, from_location, to_location=None, revision=None,
1215
1280
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1281
use_existing_dir=False, switch=False, bind=False,
1217
1283
from bzrlib import switch as _mod_switch
1218
1284
from bzrlib.tag import _merge_tags_if_possible
1285
if self.invoked_as in ['get', 'clone']:
1286
ui.ui_factory.show_user_warning(
1287
'deprecated_command',
1288
deprecated_name=self.invoked_as,
1289
recommended_name='branch',
1290
deprecated_in_version='2.4')
1219
1291
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1293
if not (hardlink or files_from):
1294
# accelerator_tree is usually slower because you have to read N
1295
# files (no readahead, lots of seeks, etc), but allow the user to
1296
# explicitly request it
1297
accelerator_tree = None
1298
if files_from is not None and files_from != from_location:
1299
accelerator_tree = WorkingTree.open(files_from)
1221
1300
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1301
self.add_cleanup(br_from.lock_read().unlock)
1224
1302
if revision is not None:
1225
1303
revision_id = revision.as_revision_id(br_from)
1235
1313
to_transport.mkdir('.')
1236
1314
except errors.FileExists:
1237
1315
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1316
raise errors.BzrCommandError(gettext('Target directory "%s" '
1317
'already exists.') % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1320
to_dir = bzrdir.BzrDir.open_from_transport(to_transport)
1243
1321
except errors.NotBranchError:
1246
raise errors.AlreadyBranchError(to_location)
1325
to_dir.open_branch()
1326
except errors.NotBranchError:
1329
raise errors.AlreadyBranchError(to_location)
1247
1330
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1331
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1264
raise errors.BzrCommandError(msg)
1337
# preserve whatever source format we have.
1338
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1339
possible_transports=[to_transport],
1340
accelerator_tree=accelerator_tree,
1341
hardlink=hardlink, stacked=stacked,
1342
force_new_repo=standalone,
1343
create_tree_if_local=not no_tree,
1344
source_branch=br_from)
1345
branch = to_dir.open_branch()
1346
except errors.NoSuchRevision:
1347
to_transport.delete_tree('.')
1348
msg = gettext("The branch {0} has no revision {1}.").format(
1349
from_location, revision)
1350
raise errors.BzrCommandError(msg)
1352
branch = br_from.sprout(to_dir, revision_id=revision_id)
1265
1353
_merge_tags_if_possible(br_from, branch)
1266
1354
# If the source branch is stacked, the new branch may
1267
1355
# be stacked whether we asked for that explicitly or not.
1268
1356
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1358
note(gettext('Created new stacked branch referring to %s.') %
1271
1359
branch.get_stacked_on_url())
1272
1360
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
1361
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1362
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1364
# Bind to the parent
1277
1365
parent_branch = Branch.open(from_location)
1278
1366
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1367
note(gettext('New branch bound to %s') % from_location)
1281
1369
# Switch to the new branch
1282
1370
wt, _ = WorkingTree.open_containing('.')
1283
1371
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1372
note(gettext('Switched to branch: %s'),
1285
1373
urlutils.unescape_for_display(branch.base, 'utf-8'))
1376
class cmd_branches(Command):
1377
__doc__ = """List the branches available at the current location.
1379
This command will print the names of all the branches at the current
1383
takes_args = ['location?']
1385
Option('recursive', short_name='R',
1386
help='Recursively scan for branches rather than '
1387
'just looking in the specified location.')]
1389
def run(self, location=".", recursive=False):
1391
t = transport.get_transport(location)
1392
if not t.listable():
1393
raise errors.BzrCommandError(
1394
"Can't scan this type of location.")
1395
for b in bzrdir.BzrDir.find_branches(t):
1396
self.outf.write("%s\n" % urlutils.unescape_for_display(
1397
urlutils.relative_url(t.base, b.base),
1398
self.outf.encoding).rstrip("/"))
1400
dir = bzrdir.BzrDir.open_containing(location)[0]
1401
for branch in dir.list_branches():
1402
if branch.name is None:
1403
self.outf.write(gettext(" (default)\n"))
1405
self.outf.write(" %s\n" % branch.name.encode(
1406
self.outf.encoding))
1288
1409
class cmd_checkout(Command):
1289
1410
__doc__ = """Create a new checkout of an existing branch.
1389
1513
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1392
This will perform a merge into the working tree, and may generate
1393
conflicts. If you have any local changes, you will still
1394
need to commit them after the update for the update to be complete.
1396
If you want to discard your local changes, you can just do a
1397
'bzr revert' instead of 'bzr commit' after the update.
1399
If the tree's branch is bound to a master branch, it will also update
1514
__doc__ = """Update a working tree to a new revision.
1516
This will perform a merge of the destination revision (the tip of the
1517
branch, or the specified revision) into the working tree, and then make
1518
that revision the basis revision for the working tree.
1520
You can use this to visit an older revision, or to update a working tree
1521
that is out of date from its branch.
1523
If there are any uncommitted changes in the tree, they will be carried
1524
across and remain as uncommitted changes after the update. To discard
1525
these changes, use 'bzr revert'. The uncommitted changes may conflict
1526
with the changes brought in by the change in basis revision.
1528
If the tree's branch is bound to a master branch, bzr will also update
1400
1529
the branch from the master.
1531
You cannot update just a single file or directory, because each Bazaar
1532
working tree has just a single basis revision. If you want to restore a
1533
file that has been removed locally, use 'bzr revert' instead of 'bzr
1534
update'. If you want to restore a file to its state in a previous
1535
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1536
out the old content of that file to a new location.
1538
The 'dir' argument, if given, must be the location of the root of a
1539
working tree to update. By default, the working tree that contains the
1540
current working directory is used.
1403
1543
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1544
takes_args = ['dir?']
1405
takes_options = ['revision']
1545
takes_options = ['revision',
1547
help="Show base revision text in conflicts."),
1406
1549
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1551
def run(self, dir=None, revision=None, show_base=None):
1409
1552
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1412
tree = WorkingTree.open_containing(dir)[0]
1553
raise errors.BzrCommandError(gettext(
1554
"bzr update --revision takes exactly one revision"))
1556
tree = WorkingTree.open_containing('.')[0]
1558
tree, relpath = WorkingTree.open_containing(dir)
1561
raise errors.BzrCommandError(gettext(
1562
"bzr update can only update a whole tree, "
1563
"not a file or subdirectory"))
1413
1564
branch = tree.branch
1414
1565
possible_transports = []
1415
1566
master = branch.get_master_branch(
1416
1567
possible_transports=possible_transports)
1417
1568
if master is not None:
1419
1569
branch_location = master.base
1572
branch_location = tree.branch.base
1421
1573
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1574
self.add_cleanup(tree.unlock)
1424
1575
# get rid of the final '/' and be ready for display
1425
1576
branch_location = urlutils.unescape_for_display(
1451
1602
change_reporter,
1452
1603
possible_transports=possible_transports,
1453
1604
revision=revision_id,
1606
show_base=show_base)
1455
1607
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1608
raise errors.BzrCommandError(gettext(
1457
1609
"branch has no revision %s\n"
1458
1610
"bzr update --revision only works"
1459
" for a revision in the branch history"
1611
" for a revision in the branch history")
1460
1612
% (e.revision))
1461
1613
revno = tree.branch.revision_id_to_dotted_revno(
1462
1614
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1615
note(gettext('Updated to revision {0} of branch {1}').format(
1616
'.'.join(map(str, revno)), branch_location))
1465
1617
parent_ids = tree.get_parent_ids()
1466
1618
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1619
note(gettext('Your local commits will now show as pending merges with '
1620
"'bzr status', and can be committed with 'bzr commit'."))
1469
1621
if conflicts != 0:
1530
1683
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1684
'The file deletion mode to be used.',
1532
1685
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1686
safe='Backup changed files (default).',
1535
1687
keep='Delete from bzr but leave the working copy.',
1688
no_backup='Don\'t backup changed files.',
1536
1689
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1690
'recovered and even if they are non-empty directories. '
1691
'(deprecated, use no-backup)')]
1538
1692
aliases = ['rm', 'del']
1539
1693
encoding_type = 'replace'
1541
1695
def run(self, file_list, verbose=False, new=False,
1542
1696
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1697
if file_deletion_strategy == 'force':
1698
note(gettext("(The --force option is deprecated, rather use --no-backup "
1700
file_deletion_strategy = 'no-backup'
1702
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1704
if file_list is not None:
1546
1705
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1707
self.add_cleanup(tree.lock_write().unlock)
1550
1708
# Heuristics should probably all move into tree.remove_smart or
1969
2163
elif ':' in prefix:
1970
2164
old_label, new_label = prefix.split(":")
1972
raise errors.BzrCommandError(
2166
raise errors.BzrCommandError(gettext(
1973
2167
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2168
' (eg "old/:new/")'))
1976
2170
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2171
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2172
' one or two revision specifiers'))
1980
2174
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2175
raise errors.BzrCommandError(gettext(
2176
'{0} and {1} are mutually exclusive').format(
2177
'--using', '--format'))
1984
2179
(old_tree, new_tree,
1985
2180
old_branch, new_branch,
1986
2181
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2182
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2183
# GNU diff on Windows uses ANSI encoding for filenames
2184
path_encoding = osutils.get_diff_header_encoding()
1988
2185
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2186
specific_files=specific_files,
1990
2187
external_diff_options=diff_options,
1991
2188
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2189
extra_trees=extra_trees,
2190
path_encoding=path_encoding,
1993
2192
format_cls=format)
2003
2202
# level of effort but possibly much less IO. (Or possibly not,
2004
2203
# if the directories are very large...)
2005
2204
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
2205
takes_options = ['directory', 'show-ids']
2008
2207
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2208
def run(self, show_ids=False, directory=u'.'):
2209
tree = WorkingTree.open_containing(directory)[0]
2210
self.add_cleanup(tree.lock_read().unlock)
2013
2211
old = tree.basis_tree()
2015
self.add_cleanup(old.unlock)
2212
self.add_cleanup(old.lock_read().unlock)
2016
2213
for path, ie in old.inventory.iter_entries():
2017
2214
if not tree.has_id(ie.file_id):
2018
2215
self.outf.write(path)
2053
2248
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2249
takes_options = ['directory', 'null']
2060
2251
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2252
def run(self, null=False, directory=u'.'):
2253
wt = WorkingTree.open_containing(directory)[0]
2254
self.add_cleanup(wt.lock_read().unlock)
2065
2255
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2256
self.add_cleanup(basis.lock_read().unlock)
2068
2257
basis_inv = basis.inventory
2069
2258
inv = wt.inventory
2070
2259
for file_id in inv:
2071
if file_id in basis_inv:
2260
if basis_inv.has_id(file_id):
2073
2262
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2264
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2265
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2268
self.outf.write(path + '\0')
2297
2494
Option('show-diff',
2298
2495
short_name='p',
2299
2496
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2497
Option('include-merged',
2301
2498
help='Show merged revisions like --levels 0 does.'),
2499
Option('include-merges', hidden=True,
2500
help='Historical alias for --include-merged.'),
2501
Option('omit-merges',
2502
help='Do not report commits with more than one parent.'),
2302
2503
Option('exclude-common-ancestry',
2303
2504
help='Display only the revisions that are not part'
2304
2505
' of both ancestries (require -rX..Y)'
2507
Option('signatures',
2508
help='Show digital signature validity'),
2511
help='Show revisions whose properties match this '
2514
ListOption('match-message',
2515
help='Show revisions whose message matches this '
2518
ListOption('match-committer',
2519
help='Show revisions whose committer matches this '
2522
ListOption('match-author',
2523
help='Show revisions whose authors match this '
2526
ListOption('match-bugs',
2527
help='Show revisions whose bugs match this '
2307
2531
encoding_type = 'replace'
2327
2560
_get_info_for_log_files,
2329
2562
direction = (forward and 'forward') or 'reverse'
2563
if symbol_versioning.deprecated_passed(include_merges):
2564
ui.ui_factory.show_user_warning(
2565
'deprecated_command_option',
2566
deprecated_name='--include-merges',
2567
recommended_name='--include-merged',
2568
deprecated_in_version='2.5',
2569
command=self.invoked_as)
2570
if include_merged is None:
2571
include_merged = include_merges
2573
raise errors.BzrCommandError(gettext(
2574
'{0} and {1} are mutually exclusive').format(
2575
'--include-merges', '--include-merged'))
2576
if include_merged is None:
2577
include_merged = False
2330
2578
if (exclude_common_ancestry
2331
2579
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2580
raise errors.BzrCommandError(gettext(
2581
'--exclude-common-ancestry requires -r with two revisions'))
2335
2583
if levels is None:
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2586
raise errors.BzrCommandError(gettext(
2587
'{0} and {1} are mutually exclusive').format(
2588
'--levels', '--include-merged'))
2341
2590
if change is not None:
2342
2591
if len(change) > 1:
2343
2592
raise errors.RangeInChangeOption()
2344
2593
if revision is not None:
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2594
raise errors.BzrCommandError(gettext(
2595
'{0} and {1} are mutually exclusive').format(
2596
'--revision', '--change'))
2348
2598
revision = change
2528
2796
help='Recurse into subdirectories.'),
2529
2797
Option('from-root',
2530
2798
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2799
Option('unknown', short_name='u',
2800
help='Print unknown files.'),
2532
2801
Option('versioned', help='Print versioned files.',
2533
2802
short_name='V'),
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2803
Option('ignored', short_name='i',
2804
help='Print ignored files.'),
2805
Option('kind', short_name='k',
2539
2806
help='List entries of a particular kind: file, directory, symlink.',
2543
2812
@display_command
2544
2813
def run(self, revision=None, verbose=False,
2545
2814
recursive=False, from_root=False,
2546
2815
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2816
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2818
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2819
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
2821
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2822
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
2823
all = not (unknown or versioned or ignored)
2556
2825
selection = {'I':ignored, '?':unknown, 'V':versioned}
2725
3004
self.outf.write("%s\n" % pattern)
2727
3006
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3007
raise errors.BzrCommandError(gettext("ignore requires at least one "
3008
"NAME_PATTERN or --default-rules."))
2730
3009
name_pattern_list = [globbing.normalize_pattern(p)
2731
3010
for p in name_pattern_list]
3012
bad_patterns_count = 0
3013
for p in name_pattern_list:
3014
if not globbing.Globster.is_pattern_valid(p):
3015
bad_patterns_count += 1
3016
bad_patterns += ('\n %s' % p)
3018
msg = (ngettext('Invalid ignore pattern found. %s',
3019
'Invalid ignore patterns found. %s',
3020
bad_patterns_count) % bad_patterns)
3021
ui.ui_factory.show_error(msg)
3022
raise errors.InvalidPattern('')
2732
3023
for name_pattern in name_pattern_list:
2733
3024
if (name_pattern[0] == '/' or
2734
3025
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
raise errors.BzrCommandError(
2736
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
3026
raise errors.BzrCommandError(gettext(
3027
"NAME_PATTERN should not be an absolute path"))
3028
tree, relpath = WorkingTree.open_containing(directory)
2738
3029
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3030
ignored = globbing.Globster(name_pattern_list)
3032
self.add_cleanup(tree.lock_read().unlock)
2742
3033
for entry in tree.list_files():
2744
3035
if id is not None:
2745
3036
filename = entry[0]
2746
3037
if ignored.match(filename):
2747
3038
matches.append(filename)
2749
3039
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3040
self.outf.write(gettext("Warning: the following files are version "
3041
"controlled and match your ignore pattern:\n%s"
2752
3042
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3043
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2756
3046
class cmd_ignored(Command):
2885
3177
@display_command
2886
3178
def run(self, filename, revision=None, name_from_revision=False,
3179
filters=False, directory=None):
2888
3180
if revision is not None and len(revision) != 1:
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3181
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3182
" one revision specifier"))
2891
3183
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3184
_open_directory_or_containing_tree_or_branch(filename, directory)
3185
self.add_cleanup(branch.lock_read().unlock)
2895
3186
return self._run(tree, branch, relpath, filename, revision,
2896
3187
name_from_revision, filters)
2900
3191
if tree is None:
2901
3192
tree = b.basis_tree()
2902
3193
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3194
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3196
old_file_id = rev_tree.path2id(relpath)
3198
# TODO: Split out this code to something that generically finds the
3199
# best id for a path across one or more trees; it's like
3200
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3202
if name_from_revision:
2909
3203
# Try in revision if requested
2910
3204
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3205
raise errors.BzrCommandError(gettext(
3206
"{0!r} is not present in revision {1}").format(
2913
3207
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3209
actual_file_id = old_file_id
2917
3211
cur_file_id = tree.path2id(relpath)
2919
if cur_file_id is not None:
2920
# Then try with the actual file id
2922
content = rev_tree.get_file_text(cur_file_id)
2924
except errors.NoSuchId:
2925
# The actual file id didn't exist at that time
2927
if not found and old_file_id is not None:
2928
# Finally try with the old file id
2929
content = rev_tree.get_file_text(old_file_id)
2932
# Can't be found anywhere
2933
raise errors.BzrCommandError(
2934
"%r is not present in revision %s" % (
3212
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3213
actual_file_id = cur_file_id
3214
elif old_file_id is not None:
3215
actual_file_id = old_file_id
3217
raise errors.BzrCommandError(gettext(
3218
"{0!r} is not present in revision {1}").format(
2935
3219
filename, rev_tree.get_revision_id()))
2937
from bzrlib.filters import (
2938
ContentFilterContext,
2939
filtered_output_bytes,
2941
filters = rev_tree._content_filter_stack(relpath)
2942
chunks = content.splitlines(True)
2943
content = filtered_output_bytes(chunks, filters,
2944
ContentFilterContext(relpath, rev_tree))
2946
self.outf.writelines(content)
3221
from bzrlib.filter_tree import ContentFilterTree
3222
filter_tree = ContentFilterTree(rev_tree,
3223
rev_tree._content_filter_stack)
3224
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3226
content = rev_tree.get_file_text(actual_file_id)
3228
self.outf.write(content)
2952
3231
class cmd_local_time_offset(Command):
3013
3292
to trigger updates to external systems like bug trackers. The --fixes
3014
3293
option can be used to record the association between a revision and
3015
3294
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3034
# TODO: Run hooks on tree to-be-committed, and after commit.
3036
# TODO: Strict commit that fails if there are deleted files.
3037
# (what does "deleted files" mean ??)
3039
# TODO: Give better message for -s, --summary, used by tla people
3041
# XXX: verbose currently does nothing
3043
3297
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3298
takes_args = ['selected*']
3076
3330
Option('show-diff', short_name='p',
3077
3331
help='When no message is supplied, show the diff along'
3078
3332
' with the status summary in the message editor.'),
3334
help='When committing to a foreign version control '
3335
'system do not push data that can not be natively '
3080
3338
aliases = ['ci', 'checkin']
3082
3340
def _iter_bug_fix_urls(self, fixes, branch):
3341
default_bugtracker = None
3083
3342
# Configure the properties for bug fixing attributes.
3084
3343
for fixed_bug in fixes:
3085
3344
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3345
if len(tokens) == 1:
3346
if default_bugtracker is None:
3347
branch_config = branch.get_config()
3348
default_bugtracker = branch_config.get_user_option(
3350
if default_bugtracker is None:
3351
raise errors.BzrCommandError(gettext(
3352
"No tracker specified for bug %s. Use the form "
3353
"'tracker:id' or specify a default bug tracker "
3354
"using the `bugtracker` option.\nSee "
3355
"\"bzr help bugs\" for more information on this "
3356
"feature. Commit refused.") % fixed_bug)
3357
tag = default_bugtracker
3359
elif len(tokens) != 2:
3360
raise errors.BzrCommandError(gettext(
3088
3361
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
3362
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3363
"feature.\nCommit refused.") % fixed_bug)
3365
tag, bug_id = tokens
3093
3367
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
3368
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3369
raise errors.BzrCommandError(gettext(
3370
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3097
3371
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3372
raise errors.BzrCommandError(gettext(
3373
"%s\nCommit refused.") % (str(e),))
3101
3375
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3376
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3377
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3379
from bzrlib.errors import (
3105
3380
PointlessCommit,
3106
3381
ConflictsInTree,
3118
3394
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3119
3395
except ValueError, e:
3120
raise errors.BzrCommandError(
3121
"Could not parse --commit-time: " + str(e))
3123
# TODO: Need a blackbox test for invoking the external editor; may be
3124
# slightly problematic to run this cross-platform.
3126
# TODO: do more checks that the commit will succeed before
3127
# spending the user's valuable time typing a commit message.
3396
raise errors.BzrCommandError(gettext(
3397
"Could not parse --commit-time: " + str(e)))
3129
3399
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3401
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3402
if selected_list == ['']:
3133
3403
# workaround - commit of root of tree should be exactly the same
3134
3404
# as just default commit in that tree, and succeed even though
3184
3457
# make_commit_message_template_encoded returns user encoding.
3185
3458
# We probably want to be using edit_commit_message instead to
3187
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3189
start_message=start_message)
3190
if my_message is None:
3191
raise errors.BzrCommandError("please specify a commit"
3192
" message with either --message or --file")
3193
if my_message == "":
3194
raise errors.BzrCommandError("empty commit message specified")
3460
my_message = set_commit_message(commit_obj)
3461
if my_message is None:
3462
start_message = generate_commit_message_template(commit_obj)
3463
my_message = edit_commit_message_encoded(text,
3464
start_message=start_message)
3465
if my_message is None:
3466
raise errors.BzrCommandError(gettext("please specify a commit"
3467
" message with either --message or --file"))
3468
if my_message == "":
3469
raise errors.BzrCommandError(gettext("Empty commit message specified."
3470
" Please specify a commit message with either"
3471
" --message or --file or leave a blank message"
3472
" with --message \"\"."))
3195
3473
return my_message
3197
3475
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3483
reporter=None, verbose=verbose, revprops=properties,
3206
3484
authors=author, timestamp=commit_stamp,
3207
3485
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3486
exclude=tree.safe_relpath_files(exclude),
3209
3488
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3489
raise errors.BzrCommandError(gettext("No changes to commit."
3490
" Please 'bzr add' the files you want to commit, or use"
3491
" --unchanged to force an empty commit."))
3212
3492
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3493
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3214
3494
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3216
3496
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3497
raise errors.BzrCommandError(gettext("Commit refused because there are"
3498
" unknown files in the working tree."))
3219
3499
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3500
e.extra_help = (gettext("\n"
3221
3501
'To commit to master branch, run update and then commit.\n'
3222
3502
'You can also pass --local to commit to continue working '
3297
3577
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
3300
The check command or bzr developers may sometimes advise you to run
3301
this command. When the default format has changed you may also be warned
3302
during other operations to upgrade.
3578
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3580
When the default format has changed after a major new release of
3581
Bazaar, you may be informed during certain operations that you
3582
should upgrade. Upgrading to a newer format may improve performance
3583
or make new features available. It may however limit interoperability
3584
with older repositories or with older versions of Bazaar.
3586
If you wish to upgrade to a particular format rather than the
3587
current default, that can be specified using the --format option.
3588
As a consequence, you can use the upgrade command this way to
3589
"downgrade" to an earlier format, though some conversions are
3590
a one way process (e.g. changing from the 1.x default to the
3591
2.x default) so downgrading is not always possible.
3593
A backup.bzr.~#~ directory is created at the start of the conversion
3594
process (where # is a number). By default, this is left there on
3595
completion. If the conversion fails, delete the new .bzr directory
3596
and rename this one back in its place. Use the --clean option to ask
3597
for the backup.bzr directory to be removed on successful conversion.
3598
Alternatively, you can delete it by hand if everything looks good
3601
If the location given is a shared repository, dependent branches
3602
are also converted provided the repository converts successfully.
3603
If the conversion of a branch fails, remaining branches are still
3606
For more information on upgrades, see the Bazaar Upgrade Guide,
3607
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3610
_see_also = ['check', 'reconcile', 'formats']
3306
3611
takes_args = ['url?']
3307
3612
takes_options = [
3308
RegistryOption('format',
3309
help='Upgrade to a specific format. See "bzr help'
3310
' formats" for details.',
3311
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3312
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3313
value_switches=True, title='Branch format'),
3613
RegistryOption('format',
3614
help='Upgrade to a specific format. See "bzr help'
3615
' formats" for details.',
3616
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3617
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3618
value_switches=True, title='Branch format'),
3620
help='Remove the backup.bzr directory if successful.'),
3622
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3625
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3626
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3627
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3629
if len(exceptions) == 1:
3630
# Compatibility with historical behavior
3321
3636
class cmd_whoami(Command):
3340
3656
encoding_type = 'replace'
3342
3658
@display_command
3343
def run(self, email=False, branch=False, name=None):
3659
def run(self, email=False, branch=False, name=None, directory=None):
3344
3660
if name is None:
3345
# use branch if we're inside one; otherwise global config
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3661
if directory is None:
3662
# use branch if we're inside one; otherwise global config
3664
c = Branch.open_containing(u'.')[0].get_config()
3665
except errors.NotBranchError:
3666
c = _mod_config.GlobalConfig()
3668
c = Branch.open(directory).get_config()
3351
3670
self.outf.write(c.user_email() + '\n')
3353
3672
self.outf.write(c.username() + '\n')
3676
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3679
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3681
_mod_config.extract_email_address(name)
3359
3682
except errors.NoEmailInUsername, e:
3360
3683
warning('"%s" does not seem to contain an email address. '
3361
3684
'This is allowed, but not recommended.', name)
3363
3686
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3688
if directory is None:
3689
c = Branch.open_containing(u'.')[0].get_config()
3691
c = Branch.open(directory).get_config()
3367
c = config.GlobalConfig()
3693
c = _mod_config.GlobalConfig()
3368
3694
c.set_user_option('email', name)
3433
3760
def remove_alias(self, alias_name):
3434
3761
if alias_name is None:
3435
raise errors.BzrCommandError(
3436
'bzr alias --remove expects an alias to remove.')
3762
raise errors.BzrCommandError(gettext(
3763
'bzr alias --remove expects an alias to remove.'))
3437
3764
# If alias is not found, print something like:
3438
3765
# unalias: foo: not found
3439
c = config.GlobalConfig()
3766
c = _mod_config.GlobalConfig()
3440
3767
c.unset_alias(alias_name)
3442
3769
@display_command
3443
3770
def print_aliases(self):
3444
3771
"""Print out the defined aliases in a similar format to bash."""
3445
aliases = config.GlobalConfig().get_aliases()
3772
aliases = _mod_config.GlobalConfig().get_aliases()
3446
3773
for key, value in sorted(aliases.iteritems()):
3447
3774
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3586
3917
def run(self, testspecs_list=None, verbose=False, one=False,
3587
3918
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
3920
first=False, list_only=False,
3590
3921
randomize=None, exclude=None, strict=False,
3591
3922
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
parallel=None, lsprof_tests=False):
3593
from bzrlib.tests import selftest
3594
import bzrlib.benchmarks as benchmarks
3595
from bzrlib.benchmarks import tree_creator
3597
# Make deprecation warnings visible, unless -Werror is set
3598
symbol_versioning.activate_deprecation_warnings(override=False)
3600
if cache_dir is not None:
3601
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3923
parallel=None, lsprof_tests=False,
3925
from bzrlib import tests
3602
3927
if testspecs_list is not None:
3603
3928
pattern = '|'.join(testspecs_list)
3608
3933
from bzrlib.tests import SubUnitBzrRunner
3609
3934
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3935
raise errors.BzrCommandError(gettext("subunit not available. subunit "
3936
"needs to be installed to use --subunit."))
3612
3937
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3938
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3939
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3940
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3941
# following code can be deleted when it's sufficiently deployed
3942
# -- vila/mgz 20100514
3943
if (sys.platform == "win32"
3944
and getattr(sys.stdout, 'fileno', None) is not None):
3617
3946
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
3948
self.additional_selftest_args.setdefault(
3620
3949
'suite_decorators', []).append(parallel)
3622
test_suite_factory = benchmarks.test_suite
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
verbose = not is_quiet()
3625
# TODO: should possibly lock the history file...
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3951
raise errors.BzrCommandError(gettext(
3952
"--benchmark is no longer supported from bzr 2.2; "
3953
"use bzr-usertest instead"))
3954
test_suite_factory = None
3956
exclude_pattern = None
3629
test_suite_factory = None
3958
exclude_pattern = '(' + '|'.join(exclude) + ')'
3960
self._disable_fsync()
3631
3961
selftest_kwargs = {"verbose": verbose,
3632
3962
"pattern": pattern,
3633
3963
"stop_on_failure": one,
3635
3965
"test_suite_factory": test_suite_factory,
3636
3966
"lsprof_timed": lsprof_timed,
3637
3967
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
3968
"matching_tests_first": first,
3640
3969
"list_only": list_only,
3641
3970
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3971
"exclude_pattern": exclude_pattern,
3643
3972
"strict": strict,
3644
3973
"load_list": load_list,
3645
3974
"debug_flags": debugflag,
3646
3975
"starting_with": starting_with
3648
3977
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3979
# Make deprecation warnings visible, unless -Werror is set
3980
cleanup = symbol_versioning.activate_deprecation_warnings(
3983
result = tests.selftest(**selftest_kwargs)
3650
3986
return int(not result)
3988
def _disable_fsync(self):
3989
"""Change the 'os' functionality to not synchronize."""
3990
self._orig_fsync = getattr(os, 'fsync', None)
3991
if self._orig_fsync is not None:
3992
os.fsync = lambda filedes: None
3993
self._orig_fdatasync = getattr(os, 'fdatasync', None)
3994
if self._orig_fdatasync is not None:
3995
os.fdatasync = lambda filedes: None
3653
3998
class cmd_version(Command):
3654
3999
__doc__ = """Show version of bzr."""
3709
4052
The source of the merge can be specified either in the form of a branch,
3710
4053
or in the form of a path to a file containing a merge directive generated
3711
4054
with bzr send. If neither is specified, the default is the upstream branch
3712
or the branch most recently merged using --remember.
3714
When merging a branch, by default the tip will be merged. To pick a different
3715
revision, pass --revision. If you specify two values, the first will be used as
3716
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3717
available revisions, like this is commonly referred to as "cherrypicking".
3719
Revision numbers are always relative to the branch being merged.
3721
By default, bzr will try to merge in all new work from the other
3722
branch, automatically determining an appropriate base. If this
3723
fails, you may need to give an explicit base.
4055
or the branch most recently merged using --remember. The source of the
4056
merge may also be specified in the form of a path to a file in another
4057
branch: in this case, only the modifications to that file are merged into
4058
the current working tree.
4060
When merging from a branch, by default bzr will try to merge in all new
4061
work from the other branch, automatically determining an appropriate base
4062
revision. If this fails, you may need to give an explicit base.
4064
To pick a different ending revision, pass "--revision OTHER". bzr will
4065
try to merge in all new work up to and including revision OTHER.
4067
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4068
through OTHER, excluding BASE but including OTHER, will be merged. If this
4069
causes some revisions to be skipped, i.e. if the destination branch does
4070
not already contain revision BASE, such a merge is commonly referred to as
4071
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4072
cherrypicks. The changes look like a normal commit, and the history of the
4073
changes from the other branch is not stored in the commit.
4075
Revision numbers are always relative to the source branch.
3725
4077
Merge will do its best to combine the changes in two branches, but there
3726
4078
are some kinds of problems only a human can fix. When it encounters those,
3730
4082
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3732
If there is no default branch set, the first merge will set it. After
3733
that, you can omit the branch to use the default. To change the
3734
default, use --remember. The value will only be saved if the remote
3735
location can be accessed.
4084
If there is no default branch set, the first merge will set it (use
4085
--no-remember to avoid setting it). After that, you can omit the branch
4086
to use the default. To change the default, use --remember. The value will
4087
only be saved if the remote location can be accessed.
3737
4089
The results of the merge are placed into the destination working
3738
4090
directory, where they can be reviewed (with bzr diff), tested, and then
3739
4091
committed to record the result of the merge.
3741
4093
merge refuses to run if there are any uncommitted changes, unless
3742
--force is given. The --force option can also be used to create a
4094
--force is given. If --force is given, then the changes from the source
4095
will be merged with the current working tree, including any uncommitted
4096
changes in the tree. The --force option can also be used to create a
3743
4097
merge revision which has more than two parents.
3745
4099
If one would like to merge changes from the working tree of the other
3847
4201
mergeable = None
3849
4203
if uncommitted:
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
4204
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4205
' with bundles or merge directives.'))
3853
4207
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
4208
raise errors.BzrCommandError(gettext(
4209
'Cannot use -r with merge directives or bundles'))
3856
4210
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3857
4211
mergeable, None)
3859
4213
if merger is None and uncommitted:
3860
4214
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
4215
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4216
' --revision at the same time.'))
3863
4217
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
4218
allow_pending = False
3873
4227
self.sanity_check_merger(merger)
3874
4228
if (merger.base_rev_id == merger.other_rev_id and
3875
4229
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4230
# check if location is a nonexistent file (and not a branch) to
4231
# disambiguate the 'Nothing to do'
4232
if merger.interesting_files:
4233
if not merger.other_tree.has_filename(
4234
merger.interesting_files[0]):
4235
note(gettext("merger: ") + str(merger))
4236
raise errors.PathsDoNotExist([location])
4237
note(gettext('Nothing to do.'))
4239
if pull and not preview:
3879
4240
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4241
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4242
if (merger.base_rev_id == tree.last_revision()):
3882
4243
result = tree.pull(merger.other_branch, False,
3883
4244
merger.other_rev_id)
3884
4245
result.report(self.outf)
3886
4247
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4248
raise errors.BzrCommandError(gettext(
3888
4249
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4250
" (perhaps you would prefer 'bzr pull')"))
3891
4252
return self._do_preview(merger)
3892
4253
elif interactive:
3988
4351
if other_revision_id is None:
3989
4352
other_revision_id = _mod_revision.ensure_null(
3990
4353
other_branch.last_revision())
3991
# Remember where we merge from
3992
if ((remember or tree.branch.get_submit_branch() is None) and
3993
user_location is not None):
4354
# Remember where we merge from. We need to remember if:
4355
# - user specify a location (and we don't merge from the parent
4357
# - user ask to remember or there is no previous location set to merge
4358
# from and user didn't ask to *not* remember
4359
if (user_location is not None
4361
or (remember is None
4362
and tree.branch.get_submit_branch() is None)))):
3994
4363
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4364
# Merge tags (but don't set them in the master branch yet, the user
4365
# might revert this merge). Commit will propagate them.
4366
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4367
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4368
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4369
if other_path != '':
4340
4713
theirs_only=False,
4341
4714
log_format=None, long=False, short=False, line=False,
4342
4715
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4716
include_merged=None, revision=None, my_revision=None,
4718
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4344
4719
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4720
def message(s):
4346
4721
if not is_quiet():
4347
4722
self.outf.write(s)
4724
if symbol_versioning.deprecated_passed(include_merges):
4725
ui.ui_factory.show_user_warning(
4726
'deprecated_command_option',
4727
deprecated_name='--include-merges',
4728
recommended_name='--include-merged',
4729
deprecated_in_version='2.5',
4730
command=self.invoked_as)
4731
if include_merged is None:
4732
include_merged = include_merges
4734
raise errors.BzrCommandError(gettext(
4735
'{0} and {1} are mutually exclusive').format(
4736
'--include-merges', '--include-merged'))
4737
if include_merged is None:
4738
include_merged = False
4350
4740
mine_only = this
4359
4749
elif theirs_only:
4360
4750
restrict = 'remote'
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4752
local_branch = Branch.open_containing(directory)[0]
4753
self.add_cleanup(local_branch.lock_read().unlock)
4366
4755
parent = local_branch.get_parent()
4367
4756
if other_branch is None:
4368
4757
other_branch = parent
4369
4758
if other_branch is None:
4370
raise errors.BzrCommandError("No peer location known"
4759
raise errors.BzrCommandError(gettext("No peer location known"
4372
4761
display_url = urlutils.unescape_for_display(parent,
4373
4762
self.outf.encoding)
4374
message("Using saved parent location: "
4375
+ display_url + "\n")
4763
message(gettext("Using saved parent location: {0}\n").format(
4377
4766
remote_branch = Branch.open(other_branch)
4378
4767
if remote_branch.base == local_branch.base:
4379
4768
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4770
self.add_cleanup(remote_branch.lock_read().unlock)
4384
4772
local_revid_range = _revision_range_to_revid_range(
4385
4773
_get_revision_range(my_revision, local_branch,
4430
4822
if mine_only and not local_extra:
4431
4823
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4824
message(gettext('This branch has no new revisions.\n'))
4433
4825
elif theirs_only and not remote_extra:
4434
4826
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4827
message(gettext('Other branch has no new revisions.\n'))
4436
4828
elif not (mine_only or theirs_only or local_extra or
4438
4830
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
4832
message(gettext("Branches are up to date.\n"))
4441
4833
self.cleanup_now()
4442
4834
if not status_code and parent is None and other_branch is not None:
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4835
self.add_cleanup(local_branch.lock_write().unlock)
4445
4836
# handle race conditions - a parent might be set while we run.
4446
4837
if local_branch.get_parent() is None:
4447
4838
local_branch.set_parent(remote_branch.base)
4507
4898
@display_command
4508
4899
def run(self, verbose=False):
4509
import bzrlib.plugin
4510
from inspect import getdoc
4512
for name, plugin in bzrlib.plugin.plugins().items():
4513
version = plugin.__version__
4514
if version == 'unknown':
4516
name_ver = '%s %s' % (name, version)
4517
d = getdoc(plugin.module)
4519
doc = d.split('\n')[0]
4521
doc = '(no description)'
4522
result.append((name_ver, doc, plugin.path()))
4523
for name_ver, doc, path in sorted(result):
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
4900
from bzrlib import plugin
4901
# Don't give writelines a generator as some codecs don't like that
4902
self.outf.writelines(
4903
list(plugin.describe_plugins(show_paths=verbose)))
4531
4906
class cmd_testament(Command):
4578
4952
Option('long', help='Show commit date in annotations.'),
4582
4957
encoding_type = 'exact'
4584
4959
@display_command
4585
4960
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4961
show_ids=False, directory=None):
4962
from bzrlib.annotate import (
4588
4965
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4966
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
4967
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4968
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4970
self.add_cleanup(branch.lock_read().unlock)
4596
4971
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4972
self.add_cleanup(tree.lock_read().unlock)
4973
if wt is not None and revision is None:
4600
4974
file_id = wt.path2id(relpath)
4602
4976
file_id = tree.path2id(relpath)
4603
4977
if file_id is None:
4604
4978
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
4979
if wt is not None and revision is None:
4607
4980
# If there is a tree and we're not annotating historical
4608
4981
# versions, annotate the working tree's content.
4609
4982
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
4983
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4985
annotate_file_tree(tree, file_id, self.outf, long, all,
4986
show_ids=show_ids, branch=branch)
4616
4989
class cmd_re_sign(Command):
4620
4993
hidden = True # is this right ?
4621
4994
takes_args = ['revision_id*']
4622
takes_options = ['revision']
4995
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
4997
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
4998
if revision_id_list is not None and revision is not None:
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4999
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5000
if revision_id_list is None and revision is None:
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
5001
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5002
b = WorkingTree.open_containing(directory)[0].branch
5003
self.add_cleanup(b.lock_write().unlock)
4632
5004
return self._run(b, revision_id_list, revision)
4634
5006
def _run(self, b, revision_id_list, revision):
4694
5066
_see_also = ['checkouts', 'unbind']
4695
5067
takes_args = ['location?']
5068
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5070
def run(self, location=None, directory=u'.'):
5071
b, relpath = Branch.open_containing(directory)
4700
5072
if location is None:
4702
5074
location = b.get_old_bound_location()
4703
5075
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5076
raise errors.BzrCommandError(gettext('No location supplied. '
5077
'This format does not remember old locations.'))
4707
5079
if location is None:
4708
5080
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5081
raise errors.BzrCommandError(gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5083
raise errors.BzrCommandError(gettext('No location supplied '
5084
'and no previous location known'))
4713
5085
b_other = Branch.open(location)
4715
5087
b.bind(b_other)
4716
5088
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5089
raise errors.BzrCommandError(gettext('These branches have diverged.'
5090
' Try merging, and then bind again.'))
4719
5091
if b.get_config().has_explicit_nickname():
4720
5092
b.nick = b_other.nick
4784
5157
b = control.open_branch()
4786
5159
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5160
self.add_cleanup(tree.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5162
self.add_cleanup(b.lock_write().unlock)
5163
return self._run(b, tree, dry_run, verbose, revision, force,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5166
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4795
5168
from bzrlib.log import log_formatter, show_log
4796
5169
from bzrlib.uncommit import uncommit
4827
5200
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5203
self.outf.write(gettext('Dry-run, pretending to remove'
5204
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5206
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5209
if not ui.ui_factory.confirm_action(
5210
gettext(u'Uncommit these revisions'),
5211
'bzrlib.builtins.uncommit',
5213
self.outf.write(gettext('Canceled\n'))
4840
5216
mutter('Uncommitting from {%s} to {%s}',
4841
5217
last_rev_id, rev_id)
4842
5218
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
5219
revno=revno, local=local, keep_tags=keep_tags)
5220
self.outf.write(gettext('You can restore the old tip by running:\n'
5221
' bzr pull . -r revid:%s\n') % last_rev_id)
4848
5224
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5225
__doc__ = """Break a dead lock.
5227
This command breaks a lock on a repository, branch, working directory or
4851
5230
CAUTION: Locks should only be broken when you are sure that the process
4852
5231
holding the lock has been stopped.
4859
5238
bzr break-lock bzr+ssh://example.com/bzr/foo
5239
bzr break-lock --conf ~/.bazaar
4861
5242
takes_args = ['location?']
5245
help='LOCATION is the directory where the config lock is.'),
5247
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5250
def run(self, location=None, config=False, force=False):
4864
5251
if location is None:
4865
5252
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5254
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5256
{'bzrlib.lockdir.break': True})
5258
conf = _mod_config.LockableConfig(file_name=location)
5261
control, relpath = bzrdir.BzrDir.open_containing(location)
5263
control.break_lock()
5264
except NotImplementedError:
4873
5268
class cmd_wait_until_signalled(Command):
4936
5332
return host, port
4938
5334
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5335
protocol=None, client_timeout=None):
5336
from bzrlib import transport
4941
5337
if directory is None:
4942
5338
directory = os.getcwd()
4943
5339
if protocol is None:
4944
protocol = transport_server_registry.get()
5340
protocol = transport.transport_server_registry.get()
4945
5341
host, port = self.get_host_and_port(port)
4946
5342
url = urlutils.local_path_to_url(directory)
4947
5343
if not allow_writes:
4948
5344
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5345
t = transport.get_transport(url)
5347
protocol(t, host, port, inet, client_timeout)
5348
except TypeError, e:
5349
# We use symbol_versioning.deprecated_in just so that people
5350
# grepping can find it here.
5351
# symbol_versioning.deprecated_in((2, 5, 0))
5352
symbol_versioning.warn(
5353
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5354
'Most likely it needs to be updated to support a'
5355
' "timeout" parameter (added in bzr 2.5.0)'
5356
% (e, protocol.__module__, protocol),
5358
protocol(t, host, port, inet)
4953
5361
class cmd_join(Command):
5359
5772
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5773
self.add_cleanup(branch.lock_write().unlock)
5363
5775
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5776
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5777
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5778
note(gettext('Deleted tag %s.') % tag_name)
5369
5781
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5782
raise errors.BzrCommandError(gettext(
5371
5783
"Tags can only be placed on a single revision, "
5373
5785
revision_id = revision[0].as_revision_id(branch)
5375
5787
revision_id = branch.last_revision()
5376
5788
if tag_name is None:
5377
5789
tag_name = branch.automatic_tag_name(revision_id)
5378
5790
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5791
raise errors.BzrCommandError(gettext(
5792
"Please specify a tag name."))
5794
existing_target = branch.tags.lookup_tag(tag_name)
5795
except errors.NoSuchTag:
5796
existing_target = None
5797
if not force and existing_target not in (None, revision_id):
5382
5798
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5799
if existing_target == revision_id:
5800
note(gettext('Tag %s already exists for that revision.') % tag_name)
5802
branch.tags.set_tag(tag_name, revision_id)
5803
if existing_target is None:
5804
note(gettext('Created tag %s.') % tag_name)
5806
note(gettext('Updated tag %s.') % tag_name)
5387
5809
class cmd_tags(Command):
5393
5815
_see_also = ['tag']
5394
5816
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5817
custom_help('directory',
5818
help='Branch whose tags should be displayed.'),
5819
RegistryOption('sort',
5401
5820
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5821
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
5827
@display_command
5828
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5829
from bzrlib.tag import tag_sort_methods
5416
5830
branch, relpath = Branch.open_containing(directory)
5418
5832
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
5836
self.add_cleanup(branch.lock_read().unlock)
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
5433
elif sort == 'time':
5435
for tag, revid in tags:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
5838
# Restrict to the specified range
5839
tags = self._tags_for_range(branch, revision)
5841
sort = tag_sort_methods.get()
5444
5843
if not show_ids:
5445
5844
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
5845
for index, (tag, revid) in enumerate(tags):
5457
5858
for tag, revspec in tags:
5458
5859
self.outf.write('%-20s %s\n' % (tag, revspec))
5861
def _tags_for_range(self, branch, revision):
5863
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5864
revid1, revid2 = rev1.rev_id, rev2.rev_id
5865
# _get_revision_range will always set revid2 if it's not specified.
5866
# If revid1 is None, it means we want to start from the branch
5867
# origin which is always a valid ancestor. If revid1 == revid2, the
5868
# ancestry check is useless.
5869
if revid1 and revid1 != revid2:
5870
# FIXME: We really want to use the same graph than
5871
# branch.iter_merge_sorted_revisions below, but this is not
5872
# easily available -- vila 2011-09-23
5873
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5874
# We don't want to output anything in this case...
5876
# only show revisions between revid1 and revid2 (inclusive)
5877
tagged_revids = branch.tags.get_reverse_tag_dict()
5879
for r in branch.iter_merge_sorted_revisions(
5880
start_revision_id=revid2, stop_revision_id=revid1,
5881
stop_rule='include'):
5882
revid_tags = tagged_revids.get(r[0], None)
5884
found.extend([(tag, r[0]) for tag in revid_tags])
5461
5888
class cmd_reconfigure(Command):
5462
5889
__doc__ = """Reconfigure the type of a bzr directory.
5476
5903
takes_args = ['location?']
5477
5904
takes_options = [
5478
5905
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
5908
help='The relation between branch and tree.',
5482
5909
value_switches=True, enum_switch=False,
5483
5910
branch='Reconfigure to be an unbound branch with no working tree.',
5484
5911
tree='Reconfigure to be an unbound branch with a working tree.',
5485
5912
checkout='Reconfigure to be a bound branch with a working tree.',
5486
5913
lightweight_checkout='Reconfigure to be a lightweight'
5487
5914
' checkout (with no local history).',
5916
RegistryOption.from_kwargs(
5918
title='Repository type',
5919
help='Location fo the repository.',
5920
value_switches=True, enum_switch=False,
5488
5921
standalone='Reconfigure to be a standalone branch '
5489
5922
'(i.e. stop using shared repository).',
5490
5923
use_shared='Reconfigure to use a shared repository.',
5925
RegistryOption.from_kwargs(
5927
title='Trees in Repository',
5928
help='Whether new branches in the repository have trees.',
5929
value_switches=True, enum_switch=False,
5491
5930
with_trees='Reconfigure repository to create '
5492
5931
'working trees on branches by default.',
5493
5932
with_no_trees='Reconfigure repository to not create '
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5949
def run(self, location=None, bind_to=None, force=False,
5950
tree_type=None, repository_type=None, repository_trees=None,
5951
stacked_on=None, unstacked=None):
5513
5952
directory = bzrdir.BzrDir.open(location)
5514
5953
if stacked_on and unstacked:
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5954
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5516
5955
elif stacked_on is not None:
5517
5956
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5518
5957
elif unstacked:
5520
5959
# At the moment you can use --stacked-on and a different
5521
5960
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
5962
if (tree_type is None and
5963
repository_type is None and
5964
repository_trees is None):
5524
5965
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
5968
raise errors.BzrCommandError(gettext('No target configuration '
5970
reconfiguration = None
5971
if tree_type == 'branch':
5530
5972
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
5973
elif tree_type == 'tree':
5532
5974
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
5975
elif tree_type == 'checkout':
5534
5976
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
5977
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
5978
elif tree_type == 'lightweight-checkout':
5537
5979
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
5980
directory, bind_to)
5539
elif target_type == 'use-shared':
5982
reconfiguration.apply(force)
5983
reconfiguration = None
5984
if repository_type == 'use-shared':
5540
5985
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
5986
elif repository_type == 'standalone':
5542
5987
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
5989
reconfiguration.apply(force)
5990
reconfiguration = None
5991
if repository_trees == 'with-trees':
5544
5992
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
5993
directory, True)
5546
elif target_type == 'with-no-trees':
5994
elif repository_trees == 'with-no-trees':
5547
5995
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
5996
directory, False)
5549
reconfiguration.apply(force)
5998
reconfiguration.apply(force)
5999
reconfiguration = None
5552
6002
class cmd_switch(Command):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6186
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6188
current_view, view_dict = tree.views.get_view_info()
5737
6189
if name is None:
5738
6190
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6193
raise errors.BzrCommandError(gettext(
6194
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6196
raise errors.BzrCommandError(gettext(
6197
"Both --delete and --switch specified"))
5747
6199
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6200
self.outf.write(gettext("Deleted all views.\n"))
5749
6201
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6202
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6204
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6205
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6208
raise errors.BzrCommandError(gettext(
6209
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6211
raise errors.BzrCommandError(gettext(
6212
"Both --switch and --all specified"))
5761
6213
elif switch == 'off':
5762
6214
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6215
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6216
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6217
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6219
tree.views.set_view_info(switch, view_dict)
5768
6220
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6221
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6224
self.outf.write(gettext('Views defined:\n'))
5773
6225
for view in sorted(view_dict):
5774
6226
if view == current_view:
5778
6230
view_str = views.view_display_str(view_dict[view])
5779
6231
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6233
self.outf.write(gettext('No views defined.\n'))
5782
6234
elif file_list:
5783
6235
if name is None:
5784
6236
# No name given and no current view set
5786
6238
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6239
raise errors.BzrCommandError(gettext(
6240
"Cannot change the 'off' pseudo view"))
5789
6241
tree.views.set_view(name, sorted(file_list))
5790
6242
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6243
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6245
# list the files
5794
6246
if name is None:
5795
6247
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6248
self.outf.write(gettext('No current view.\n'))
5798
6250
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6251
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6254
class cmd_hooks(Command):
5883
6348
Option('destroy',
5884
6349
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6351
_see_also = ['unshelve', 'configuration']
5888
6353
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6354
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6356
return self.run_for_list(directory=directory)
5892
6357
from bzrlib.shelf_ui import Shelver
5893
6358
if writer is None:
5894
6359
writer = bzrlib.option.diff_writer_registry.get()
5896
6361
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6362
file_list, message, destroy=destroy, directory=directory)
5975
6443
' deleting them.'),
5976
6444
Option('force', help='Do not prompt before deleting.')]
5977
6445
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6446
force=False, directory=u'.'):
5979
6447
from bzrlib.clean_tree import clean_tree
5980
6448
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6452
clean_tree(directory, unknown=unknown, ignored=ignored,
6453
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6456
class cmd_reference(Command):
6032
6500
self.outf.write('%s %s\n' % (path, location))
6503
class cmd_export_pot(Command):
6504
__doc__ = """Export command helps and error messages in po format."""
6507
takes_options = [Option('plugin',
6508
help='Export help text from named command '\
6509
'(defaults to all built in commands).',
6512
def run(self, plugin=None):
6513
from bzrlib.export_pot import export_pot
6514
export_pot(self.outf, plugin)
6035
6517
def _register_lazy_builtins():
6036
6518
# register lazy builtins from other modules; called at startup and should
6037
6519
# be only called once.
6038
6520
for (name, aliases, module_name) in [
6039
6521
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6522
('cmd_config', [], 'bzrlib.config'),
6040
6523
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6524
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6525
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6526
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6527
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6528
('cmd_verify_signatures', [],
6529
'bzrlib.commit_signature_commands'),
6530
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6532
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
