73
73
_parse_revision_str,
75
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
81
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
82
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
84
return internal_tree_files(file_list, default_branch, canonicalize,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
88
88
def tree_files_for_add(file_list):
153
153
# XXX: Bad function name; should possibly also be a class method of
154
154
# WorkingTree rather than a function.
155
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
156
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
157
156
apply_view=True):
158
157
"""Convert command-line paths to a WorkingTree and relative paths.
160
Deprecated: use WorkingTree.open_containing_paths instead.
162
159
This is typically used for command-line processors that take one or
163
160
more filenames, and infer the workingtree that contains them.
175
172
:return: workingtree, [relative_paths]
177
return WorkingTree.open_containing_paths(
178
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)
183
223
def _get_view_info_for_change_reporter(tree):
234
274
Not versioned and not matching an ignore pattern.
236
Additionally for directories, symlinks and files with a changed
237
executable bit, Bazaar indicates their type using a trailing
238
character: '/', '@' or '*' respectively. These decorations can be
239
disabled using the '--no-classify' option.
276
Additionally for directories, symlinks and files with an executable
277
bit, Bazaar indicates their type using a trailing character: '/', '@'
241
280
To see ignored files use 'bzr ignored'. For details on the
242
281
changes to file texts, use 'bzr diff'.
255
294
To skip the display of pending merge information altogether, use
256
295
the no-pending option or specify a file/directory.
258
To compare the working directory to a specific revision, pass a
259
single revision to the revision argument.
261
To see which files have changed in a specific revision, or between
262
two revisions, pass a revision range to the revision argument.
263
This will produce the same results as calling 'bzr diff --summarize'.
297
If a revision argument is given, the status is calculated against
298
that revision, or between two revisions if two are provided.
266
301
# TODO: --no-recurse, --recurse options
286
318
def run(self, show_ids=False, file_list=None, revision=None, short=False,
287
versioned=False, no_pending=False, verbose=False,
319
versioned=False, no_pending=False, verbose=False):
289
320
from bzrlib.status import show_tree_status
291
322
if revision and len(revision) > 2:
292
raise errors.BzrCommandError(gettext('bzr status --revision takes exactly'
293
' one or two revision specifiers'))
323
raise errors.BzrCommandError('bzr status --revision takes exactly'
324
' one or two revision specifiers')
295
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
326
tree, relfile_list = tree_files(file_list)
296
327
# Avoid asking for specific files when that is not needed.
297
328
if relfile_list == ['']:
298
329
relfile_list = None
305
336
show_tree_status(tree, show_ids=show_ids,
306
337
specific_files=relfile_list, revision=revision,
307
338
to_file=self.outf, short=short, versioned=versioned,
308
show_pending=(not no_pending), verbose=verbose,
309
classify=not no_classify)
339
show_pending=(not no_pending), verbose=verbose)
312
342
class cmd_cat_revision(Command):
334
364
def run(self, revision_id=None, revision=None, directory=u'.'):
335
365
if revision_id is not None and revision is not None:
336
raise errors.BzrCommandError(gettext('You can only supply one of'
337
' revision_id or --revision'))
366
raise errors.BzrCommandError('You can only supply one of'
367
' revision_id or --revision')
338
368
if revision_id is None and revision is None:
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]
369
raise errors.BzrCommandError('You must supply either'
370
' --revision or a revision_id')
371
b = WorkingTree.open_containing(directory)[0].branch
344
373
revisions = b.repository.revisions
345
374
if revisions is None:
346
raise errors.BzrCommandError(gettext('Repository %r does not support '
347
'access to raw revision texts'))
375
raise errors.BzrCommandError('Repository %r does not support '
376
'access to raw revision texts')
349
378
b.repository.lock_read()
355
384
self.print_revision(revisions, revision_id)
356
385
except errors.NoSuchRevision:
357
msg = gettext("The repository {0} contains no revision {1}.").format(
386
msg = "The repository %s contains no revision %s." % (
358
387
b.repository.base, revision_id)
359
388
raise errors.BzrCommandError(msg)
360
389
elif revision is not None:
361
390
for rev in revision:
363
392
raise errors.BzrCommandError(
364
gettext('You cannot specify a NULL revision.'))
393
'You cannot specify a NULL revision.')
365
394
rev_id = rev.as_revision_id(b)
366
395
self.print_revision(revisions, rev_id)
479
505
working = d.open_workingtree()
480
506
except errors.NoWorkingTree:
481
raise errors.BzrCommandError(gettext("No working tree to remove"))
507
raise errors.BzrCommandError("No working tree to remove")
482
508
except errors.NotLocalUrl:
483
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
484
" of a remote path"))
509
raise errors.BzrCommandError("You cannot remove the working tree"
486
512
if (working.has_changes()):
487
513
raise errors.UncommittedChanges(working)
488
if working.get_shelf_manager().last_shelf() is not None:
489
raise errors.ShelvedChanges(working)
491
515
if working.user_url != working.branch.user_url:
492
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
493
" from a lightweight checkout"))
516
raise errors.BzrCommandError("You cannot remove the working tree"
517
" from a lightweight checkout")
495
519
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))
550
522
class cmd_revno(Command):
551
523
__doc__ = """Show current revision number.
793
757
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
794
758
if kind and kind not in ['file', 'directory', 'symlink']:
795
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
797
761
revision = _get_one_revision('inventory', revision)
798
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
762
work_tree, file_list = tree_files(file_list)
799
763
self.add_cleanup(work_tree.lock_read().unlock)
800
764
if revision is not None:
801
765
tree = revision.as_tree(work_tree.branch)
863
826
return self.run_auto(names_list, after, dry_run)
865
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
828
raise errors.BzrCommandError('--dry-run requires --auto.')
866
829
if names_list is None:
868
831
if len(names_list) < 2:
869
raise errors.BzrCommandError(gettext("missing file argument"))
870
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
832
raise errors.BzrCommandError("missing file argument")
833
tree, rel_names = tree_files(names_list, canonicalize=False)
871
834
self.add_cleanup(tree.lock_tree_write().unlock)
872
835
self._run(tree, names_list, rel_names, after)
874
837
def run_auto(self, names_list, after, dry_run):
875
838
if names_list is not None and len(names_list) > 1:
876
raise errors.BzrCommandError(gettext('Only one path may be specified to'
839
raise errors.BzrCommandError('Only one path may be specified to'
879
raise errors.BzrCommandError(gettext('--after cannot be specified with'
881
work_tree, file_list = WorkingTree.open_containing_paths(
882
names_list, default_directory='.')
842
raise errors.BzrCommandError('--after cannot be specified with'
844
work_tree, file_list = tree_files(names_list, default_branch='.')
883
845
self.add_cleanup(work_tree.lock_tree_write().unlock)
884
846
rename_map.RenameMap.guess_renames(work_tree, dry_run)
980
942
match the remote one, use pull --overwrite. This will work even if the two
981
943
branches have diverged.
983
If there is no default location set, the first pull will set it (use
984
--no-remember to avoid setting it). After that, you can omit the
985
location to use the default. To change the default, use --remember. The
986
value will only be saved if the remote location can be accessed.
945
If there is no default location set, the first pull will set it. After
946
that, you can omit the location to use the default. To change the
947
default, use --remember. The value will only be saved if the remote
948
location can be accessed.
988
950
Note: The location can be specified either in the form of a branch,
989
951
or in the form of a path to a file containing a merge directive generated
1002
964
"branch. Local pulls are not applied to "
1003
965
"the master branch."
1006
help="Show base revision text in conflicts.")
1008
968
takes_args = ['location?']
1009
969
encoding_type = 'replace'
1011
def run(self, location=None, remember=None, overwrite=False,
971
def run(self, location=None, remember=False, overwrite=False,
1012
972
revision=None, verbose=False,
1013
directory=None, local=False,
973
directory=None, local=False):
1015
974
# FIXME: too much stuff is in the command class
1016
975
revision_id = None
1017
976
mergeable = None
1043
999
stored_loc = branch_to.get_parent()
1044
1000
if location is None:
1045
1001
if stored_loc is None:
1046
raise errors.BzrCommandError(gettext("No pull location known or"
1002
raise errors.BzrCommandError("No pull location known or"
1049
1005
display_url = urlutils.unescape_for_display(stored_loc,
1050
1006
self.outf.encoding)
1051
1007
if not is_quiet():
1052
self.outf.write(gettext("Using saved parent location: %s\n") % display_url)
1008
self.outf.write("Using saved parent location: %s\n" % display_url)
1053
1009
location = stored_loc
1055
1011
revision = _get_one_revision('pull', revision)
1056
1012
if mergeable is not None:
1057
1013
if revision is not None:
1058
raise errors.BzrCommandError(gettext(
1059
'Cannot use -r with merge directives or bundles'))
1014
raise errors.BzrCommandError(
1015
'Cannot use -r with merge directives or bundles')
1060
1016
mergeable.install_revisions(branch_to.repository)
1061
1017
base_revision_id, revision_id, verified = \
1062
1018
mergeable.get_merge_request(branch_to.repository)
1116
1067
do a merge (see bzr help merge) from the other branch, and commit that.
1117
1068
After that you will be able to do a push without '--overwrite'.
1119
If there is no default push location set, the first push will set it (use
1120
--no-remember to avoid setting it). After that, you can omit the
1121
location to use the default. To change the default, use --remember. The
1122
value will only be saved if the remote location can be accessed.
1070
If there is no default push location set, the first push will set it.
1071
After that, you can omit the location to use the default. To change the
1072
default, use --remember. The value will only be saved if the remote
1073
location can be accessed.
1125
1076
_see_also = ['pull', 'update', 'working-trees']
1146
1097
Option('strict',
1147
1098
help='Refuse to push if there are uncommitted changes in'
1148
1099
' the working tree, --no-strict disables the check.'),
1150
help="Don't populate the working tree, even for protocols"
1151
" that support it."),
1153
1101
takes_args = ['location?']
1154
1102
encoding_type = 'replace'
1156
def run(self, location=None, remember=None, overwrite=False,
1104
def run(self, location=None, remember=False, overwrite=False,
1157
1105
create_prefix=False, verbose=False, revision=None,
1158
1106
use_existing_dir=False, directory=None, stacked_on=None,
1159
stacked=False, strict=None, no_tree=False):
1107
stacked=False, strict=None):
1160
1108
from bzrlib.push import _show_push_branch
1162
1110
if directory is None:
1190
1138
# error by the feedback given to them. RBC 20080227.
1191
1139
stacked_on = parent_url
1192
1140
if not stacked_on:
1193
raise errors.BzrCommandError(gettext(
1194
"Could not determine branch to refer to."))
1141
raise errors.BzrCommandError(
1142
"Could not determine branch to refer to.")
1196
1144
# Get the destination location
1197
1145
if location is None:
1198
1146
stored_loc = br_from.get_push_location()
1199
1147
if stored_loc is None:
1200
raise errors.BzrCommandError(gettext(
1201
"No push location known or specified."))
1148
raise errors.BzrCommandError(
1149
"No push location known or specified.")
1203
1151
display_url = urlutils.unescape_for_display(stored_loc,
1204
1152
self.outf.encoding)
1205
note(gettext("Using saved push location: %s") % display_url)
1153
self.outf.write("Using saved push location: %s\n" % display_url)
1206
1154
location = stored_loc
1208
1156
_show_push_branch(br_from, revision_id, location, self.outf,
1209
1157
verbose=verbose, overwrite=overwrite, remember=remember,
1210
1158
stacked_on=stacked_on, create_prefix=create_prefix,
1211
use_existing_dir=use_existing_dir, no_tree=no_tree)
1159
use_existing_dir=use_existing_dir)
1214
1162
class cmd_branch(Command):
1224
1172
To retrieve the branch as of a particular revision, supply the --revision
1225
1173
parameter, as in "branch foo/bar -r 5".
1227
The synonyms 'clone' and 'get' for this command are deprecated.
1230
1176
_see_also = ['checkout']
1231
1177
takes_args = ['from_location', 'to_location?']
1232
takes_options = ['revision',
1233
Option('hardlink', help='Hard-link working tree files where possible.'),
1234
Option('files-from', type=str,
1235
help="Get file contents from this tree."),
1178
takes_options = ['revision', Option('hardlink',
1179
help='Hard-link working tree files where possible.'),
1236
1180
Option('no-tree',
1237
1181
help="Create a branch without a working-tree."),
1238
1182
Option('switch',
1257
1201
def run(self, from_location, to_location=None, revision=None,
1258
1202
hardlink=False, stacked=False, standalone=False, no_tree=False,
1259
use_existing_dir=False, switch=False, bind=False,
1203
use_existing_dir=False, switch=False, bind=False):
1261
1204
from bzrlib import switch as _mod_switch
1262
1205
from bzrlib.tag import _merge_tags_if_possible
1263
if self.invoked_as in ['get', 'clone']:
1264
ui.ui_factory.show_user_warning(
1265
'deprecated_command',
1266
deprecated_name=self.invoked_as,
1267
recommended_name='branch',
1268
deprecated_in_version='2.4')
1269
1206
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1271
if not (hardlink or files_from):
1272
# accelerator_tree is usually slower because you have to read N
1273
# files (no readahead, lots of seeks, etc), but allow the user to
1274
# explicitly request it
1275
accelerator_tree = None
1276
if files_from is not None and files_from != from_location:
1277
accelerator_tree = WorkingTree.open(files_from)
1278
1208
revision = _get_one_revision('branch', revision)
1279
1209
self.add_cleanup(br_from.lock_read().unlock)
1280
1210
if revision is not None:
1315
1245
branch = dir.open_branch()
1316
1246
except errors.NoSuchRevision:
1317
1247
to_transport.delete_tree('.')
1318
msg = gettext("The branch {0} has no revision {1}.").format(
1319
from_location, revision)
1248
msg = "The branch %s has no revision %s." % (from_location,
1320
1250
raise errors.BzrCommandError(msg)
1321
1251
_merge_tags_if_possible(br_from, branch)
1322
1252
# If the source branch is stacked, the new branch may
1323
1253
# be stacked whether we asked for that explicitly or not.
1324
1254
# We therefore need a try/except here and not just 'if stacked:'
1326
note(gettext('Created new stacked branch referring to %s.') %
1256
note('Created new stacked branch referring to %s.' %
1327
1257
branch.get_stacked_on_url())
1328
1258
except (errors.NotStacked, errors.UnstackableBranchFormat,
1329
1259
errors.UnstackableRepositoryFormat), e:
1330
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1260
note('Branched %d revision(s).' % branch.revno())
1332
1262
# Bind to the parent
1333
1263
parent_branch = Branch.open(from_location)
1334
1264
branch.bind(parent_branch)
1335
note(gettext('New branch bound to %s') % from_location)
1265
note('New branch bound to %s' % from_location)
1337
1267
# Switch to the new branch
1338
1268
wt, _ = WorkingTree.open_containing('.')
1339
1269
_mod_switch.switch(wt.bzrdir, branch)
1340
note(gettext('Switched to branch: %s'),
1270
note('Switched to branch: %s',
1341
1271
urlutils.unescape_for_display(branch.base, 'utf-8'))
1344
class cmd_branches(Command):
1345
__doc__ = """List the branches available at the current location.
1347
This command will print the names of all the branches at the current
1351
takes_args = ['location?']
1353
Option('recursive', short_name='R',
1354
help='Recursively scan for branches rather than '
1355
'just looking in the specified location.')]
1357
def run(self, location=".", recursive=False):
1359
t = transport.get_transport(location)
1360
if not t.listable():
1361
raise errors.BzrCommandError(
1362
"Can't scan this type of location.")
1363
for b in bzrdir.BzrDir.find_branches(t):
1364
self.outf.write("%s\n" % urlutils.unescape_for_display(
1365
urlutils.relative_url(t.base, b.base),
1366
self.outf.encoding).rstrip("/"))
1368
dir = bzrdir.BzrDir.open_containing(location)[0]
1369
for branch in dir.list_branches():
1370
if branch.name is None:
1371
self.outf.write(gettext(" (default)\n"))
1373
self.outf.write(" %s\n" % branch.name.encode(
1374
self.outf.encoding))
1377
1274
class cmd_checkout(Command):
1378
1275
__doc__ = """Create a new checkout of an existing branch.
1420
1317
to_location = branch_location
1421
1318
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1422
1319
branch_location)
1423
if not (hardlink or files_from):
1424
# accelerator_tree is usually slower because you have to read N
1425
# files (no readahead, lots of seeks, etc), but allow the user to
1426
# explicitly request it
1427
accelerator_tree = None
1428
1320
revision = _get_one_revision('checkout', revision)
1429
if files_from is not None and files_from != branch_location:
1321
if files_from is not None:
1430
1322
accelerator_tree = WorkingTree.open(files_from)
1431
1323
if revision is not None:
1432
1324
revision_id = revision.as_revision_id(source)
1488
1380
If you want to discard your local changes, you can just do a
1489
1381
'bzr revert' instead of 'bzr commit' after the update.
1491
If you want to restore a file that has been removed locally, use
1492
'bzr revert' instead of 'bzr update'.
1494
1383
If the tree's branch is bound to a master branch, it will also update
1495
1384
the branch from the master.
1498
1387
_see_also = ['pull', 'working-trees', 'status-flags']
1499
1388
takes_args = ['dir?']
1500
takes_options = ['revision',
1502
help="Show base revision text in conflicts."),
1389
takes_options = ['revision']
1504
1390
aliases = ['up']
1506
def run(self, dir='.', revision=None, show_base=None):
1392
def run(self, dir='.', revision=None):
1507
1393
if revision is not None and len(revision) != 1:
1508
raise errors.BzrCommandError(gettext(
1509
"bzr update --revision takes exactly one revision"))
1394
raise errors.BzrCommandError(
1395
"bzr update --revision takes exactly one revision")
1510
1396
tree = WorkingTree.open_containing(dir)[0]
1511
1397
branch = tree.branch
1512
1398
possible_transports = []
1537
1423
revision_id = branch.last_revision()
1538
1424
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1539
1425
revno = branch.revision_id_to_dotted_revno(revision_id)
1540
note(gettext("Tree is up to date at revision {0} of branch {1}"
1541
).format('.'.join(map(str, revno)), branch_location))
1426
note("Tree is up to date at revision %s of branch %s" %
1427
('.'.join(map(str, revno)), branch_location))
1543
1429
view_info = _get_view_info_for_change_reporter(tree)
1544
1430
change_reporter = delta._ChangeReporter(
1549
1435
change_reporter,
1550
1436
possible_transports=possible_transports,
1551
1437
revision=revision_id,
1553
show_base=show_base)
1554
1439
except errors.NoSuchRevision, e:
1555
raise errors.BzrCommandError(gettext(
1440
raise errors.BzrCommandError(
1556
1441
"branch has no revision %s\n"
1557
1442
"bzr update --revision only works"
1558
" for a revision in the branch history")
1443
" for a revision in the branch history"
1559
1444
% (e.revision))
1560
1445
revno = tree.branch.revision_id_to_dotted_revno(
1561
1446
_mod_revision.ensure_null(tree.last_revision()))
1562
note(gettext('Updated to revision {0} of branch {1}').format(
1563
'.'.join(map(str, revno)), branch_location))
1447
note('Updated to revision %s of branch %s' %
1448
('.'.join(map(str, revno)), branch_location))
1564
1449
parent_ids = tree.get_parent_ids()
1565
1450
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1566
note(gettext('Your local commits will now show as pending merges with '
1567
"'bzr status', and can be committed with 'bzr commit'."))
1451
note('Your local commits will now show as pending merges with '
1452
"'bzr status', and can be committed with 'bzr commit'.")
1568
1453
if conflicts != 0:
1618
1503
class cmd_remove(Command):
1619
1504
__doc__ = """Remove files or directories.
1621
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1622
delete them if they can easily be recovered using revert otherwise they
1623
will be backed up (adding an extention of the form .~#~). If no options or
1624
parameters are given Bazaar will scan for files that are being tracked by
1625
Bazaar but missing in your tree and stop tracking them for you.
1506
This makes bzr stop tracking changes to the specified files. bzr will delete
1507
them if they can easily be recovered using revert. If no options or
1508
parameters are given bzr will scan for files that are being tracked by bzr
1509
but missing in your tree and stop tracking them for you.
1627
1511
takes_args = ['file*']
1628
1512
takes_options = ['verbose',
1630
1514
RegistryOption.from_kwargs('file-deletion-strategy',
1631
1515
'The file deletion mode to be used.',
1632
1516
title='Deletion Strategy', value_switches=True, enum_switch=False,
1633
safe='Backup changed files (default).',
1517
safe='Only delete files if they can be'
1518
' safely recovered (default).',
1634
1519
keep='Delete from bzr but leave the working copy.',
1635
no_backup='Don\'t backup changed files.',
1636
1520
force='Delete all the specified files, even if they can not be '
1637
'recovered and even if they are non-empty directories. '
1638
'(deprecated, use no-backup)')]
1521
'recovered and even if they are non-empty directories.')]
1639
1522
aliases = ['rm', 'del']
1640
1523
encoding_type = 'replace'
1642
1525
def run(self, file_list, verbose=False, new=False,
1643
1526
file_deletion_strategy='safe'):
1644
if file_deletion_strategy == 'force':
1645
note(gettext("(The --force option is deprecated, rather use --no-backup "
1647
file_deletion_strategy = 'no-backup'
1649
tree, file_list = WorkingTree.open_containing_paths(file_list)
1527
tree, file_list = tree_files(file_list)
1651
1529
if file_list is not None:
1652
1530
file_list = [f for f in file_list]
1741
1619
_see_also = ['check']
1742
1620
takes_args = ['branch?']
1744
Option('canonicalize-chks',
1745
help='Make sure CHKs are in canonical form (repairs '
1750
def run(self, branch=".", canonicalize_chks=False):
1622
def run(self, branch="."):
1751
1623
from bzrlib.reconcile import reconcile
1752
1624
dir = bzrdir.BzrDir.open(branch)
1753
reconcile(dir, canonicalize_chks=canonicalize_chks)
1756
1628
class cmd_revision_history(Command):
1789
1661
last_revision = wt.last_revision()
1791
self.add_cleanup(b.repository.lock_read().unlock)
1792
graph = b.repository.get_graph()
1793
revisions = [revid for revid, parents in
1794
graph.iter_ancestry([last_revision])]
1795
for revision_id in reversed(revisions):
1796
if _mod_revision.is_null(revision_id):
1663
revision_ids = b.repository.get_ancestry(last_revision)
1665
for revision_id in revision_ids:
1798
1666
self.outf.write(revision_id + '\n')
1838
1706
Option('append-revisions-only',
1839
1707
help='Never change revnos or the existing log.'
1840
' Append revisions to it only.'),
1842
'Create a branch without a working tree.')
1708
' Append revisions to it only.')
1844
1710
def run(self, location=None, format=None, append_revisions_only=False,
1845
create_prefix=False, no_tree=False):
1711
create_prefix=False):
1846
1712
if format is None:
1847
1713
format = bzrdir.format_registry.make_bzrdir('default')
1848
1714
if location is None:
1887
1748
raise errors.BranchExistsWithoutWorkingTree(location)
1888
1749
raise errors.AlreadyBranchError(location)
1889
1750
branch = a_bzrdir.create_branch()
1891
a_bzrdir.create_workingtree()
1751
a_bzrdir.create_workingtree()
1892
1752
if append_revisions_only:
1894
1754
branch.set_append_revisions_only(True)
1895
1755
except errors.UpgradeRequired:
1896
raise errors.BzrCommandError(gettext('This branch format cannot be set'
1897
' to append-revisions-only. Try --default.'))
1756
raise errors.BzrCommandError('This branch format cannot be set'
1757
' to append-revisions-only. Try --default.')
1898
1758
if not is_quiet():
1899
1759
from bzrlib.info import describe_layout, describe_format
1904
1764
repository = branch.repository
1905
1765
layout = describe_layout(repository, branch, tree).lower()
1906
1766
format = describe_format(a_bzrdir, repository, branch, tree)
1907
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1767
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
1909
1768
if repository.is_shared():
1910
1769
#XXX: maybe this can be refactored into transport.path_or_url()
1911
1770
url = repository.bzrdir.root_transport.external_url()
2110
1952
elif ':' in prefix:
2111
1953
old_label, new_label = prefix.split(":")
2113
raise errors.BzrCommandError(gettext(
1955
raise errors.BzrCommandError(
2114
1956
'--prefix expects two values separated by a colon'
2115
' (eg "old/:new/")'))
1957
' (eg "old/:new/")')
2117
1959
if revision and len(revision) > 2:
2118
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2119
' one or two revision specifiers'))
1960
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1961
' one or two revision specifiers')
2121
1963
if using is not None and format is not None:
2122
raise errors.BzrCommandError(gettext(
2123
'{0} and {1} are mutually exclusive').format(
2124
'--using', '--format'))
1964
raise errors.BzrCommandError('--using and --format are mutually '
2126
1967
(old_tree, new_tree,
2127
1968
old_branch, new_branch,
2128
1969
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2129
1970
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2130
# GNU diff on Windows uses ANSI encoding for filenames
2131
path_encoding = osutils.get_diff_header_encoding()
2132
1971
return show_diff_trees(old_tree, new_tree, sys.stdout,
2133
1972
specific_files=specific_files,
2134
1973
external_diff_options=diff_options,
2135
1974
old_label=old_label, new_label=new_label,
2136
extra_trees=extra_trees,
2137
path_encoding=path_encoding,
1975
extra_trees=extra_trees, using=using,
2139
1976
format_cls=format)
2441
2273
Option('show-diff',
2442
2274
short_name='p',
2443
2275
help='Show changes made in each revision as a patch.'),
2444
Option('include-merged',
2276
Option('include-merges',
2445
2277
help='Show merged revisions like --levels 0 does.'),
2446
Option('include-merges', hidden=True,
2447
help='Historical alias for --include-merged.'),
2448
Option('omit-merges',
2449
help='Do not report commits with more than one parent.'),
2450
2278
Option('exclude-common-ancestry',
2451
2279
help='Display only the revisions that are not part'
2452
2280
' of both ancestries (require -rX..Y)'
2454
Option('signatures',
2455
help='Show digital signature validity'),
2458
help='Show revisions whose properties match this '
2461
ListOption('match-message',
2462
help='Show revisions whose message matches this '
2465
ListOption('match-committer',
2466
help='Show revisions whose committer matches this '
2469
ListOption('match-author',
2470
help='Show revisions whose authors match this '
2473
ListOption('match-bugs',
2474
help='Show revisions whose bugs match this '
2478
2283
encoding_type = 'replace'
2507
2304
_get_info_for_log_files,
2509
2306
direction = (forward and 'forward') or 'reverse'
2510
if symbol_versioning.deprecated_passed(include_merges):
2511
ui.ui_factory.show_user_warning(
2512
'deprecated_command_option',
2513
deprecated_name='--include-merges',
2514
recommended_name='--include-merged',
2515
deprecated_in_version='2.5',
2516
command=self.invoked_as)
2517
if include_merged is None:
2518
include_merged = include_merges
2520
raise errors.BzrCommandError(gettext(
2521
'{0} and {1} are mutually exclusive').format(
2522
'--include-merges', '--include-merged'))
2523
if include_merged is None:
2524
include_merged = False
2525
2307
if (exclude_common_ancestry
2526
2308
and (revision is None or len(revision) != 2)):
2527
raise errors.BzrCommandError(gettext(
2528
'--exclude-common-ancestry requires -r with two revisions'))
2309
raise errors.BzrCommandError(
2310
'--exclude-common-ancestry requires -r with two revisions')
2530
2312
if levels is None:
2533
raise errors.BzrCommandError(gettext(
2534
'{0} and {1} are mutually exclusive').format(
2535
'--levels', '--include-merged'))
2315
raise errors.BzrCommandError(
2316
'--levels and --include-merges are mutually exclusive')
2537
2318
if change is not None:
2538
2319
if len(change) > 1:
2539
2320
raise errors.RangeInChangeOption()
2540
2321
if revision is not None:
2541
raise errors.BzrCommandError(gettext(
2542
'{0} and {1} are mutually exclusive').format(
2543
'--revision', '--change'))
2322
raise errors.BzrCommandError(
2323
'--revision and --change are mutually exclusive')
2545
2325
revision = change
2645
2406
start_revision=rev1, end_revision=rev2, limit=limit,
2646
2407
message_search=message, delta_type=delta_type,
2647
2408
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2648
exclude_common_ancestry=exclude_common_ancestry, match=match_dict,
2649
signature=signatures, omit_merges=omit_merges,
2409
exclude_common_ancestry=exclude_common_ancestry,
2651
2411
Logger(b, rqst).show(lf)
2669
2429
# b is taken from revision[0].get_branch(), and
2670
2430
# show_log will use its revision_history. Having
2671
2431
# different branches will lead to weird behaviors.
2672
raise errors.BzrCommandError(gettext(
2432
raise errors.BzrCommandError(
2673
2433
"bzr %s doesn't accept two revisions in different"
2674
" branches.") % command_name)
2434
" branches." % command_name)
2675
2435
if start_spec.spec is None:
2676
2436
# Avoid loading all the history.
2677
2437
rev1 = RevisionInfo(branch, None, None)
2763
2523
null=False, kind=None, show_ids=False, path=None, directory=None):
2765
2525
if kind and kind not in ('file', 'directory', 'symlink'):
2766
raise errors.BzrCommandError(gettext('invalid kind specified'))
2526
raise errors.BzrCommandError('invalid kind specified')
2768
2528
if verbose and null:
2769
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2529
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2770
2530
all = not (unknown or versioned or ignored)
2772
2532
selection = {'I':ignored, '?':unknown, 'V':versioned}
2951
2702
self.outf.write("%s\n" % pattern)
2953
2704
if not name_pattern_list:
2954
raise errors.BzrCommandError(gettext("ignore requires at least one "
2955
"NAME_PATTERN or --default-rules."))
2705
raise errors.BzrCommandError("ignore requires at least one "
2706
"NAME_PATTERN or --default-rules.")
2956
2707
name_pattern_list = [globbing.normalize_pattern(p)
2957
2708
for p in name_pattern_list]
2959
bad_patterns_count = 0
2960
for p in name_pattern_list:
2961
if not globbing.Globster.is_pattern_valid(p):
2962
bad_patterns_count += 1
2963
bad_patterns += ('\n %s' % p)
2965
msg = (ngettext('Invalid ignore pattern found. %s',
2966
'Invalid ignore patterns found. %s',
2967
bad_patterns_count) % bad_patterns)
2968
ui.ui_factory.show_error(msg)
2969
raise errors.InvalidPattern('')
2970
2709
for name_pattern in name_pattern_list:
2971
2710
if (name_pattern[0] == '/' or
2972
2711
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2973
raise errors.BzrCommandError(gettext(
2974
"NAME_PATTERN should not be an absolute path"))
2712
raise errors.BzrCommandError(
2713
"NAME_PATTERN should not be an absolute path")
2975
2714
tree, relpath = WorkingTree.open_containing(directory)
2976
2715
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2977
2716
ignored = globbing.Globster(name_pattern_list)
2979
self.add_cleanup(tree.lock_read().unlock)
2980
2719
for entry in tree.list_files():
2982
2721
if id is not None:
2983
2722
filename = entry[0]
2984
2723
if ignored.match(filename):
2985
2724
matches.append(filename)
2986
2726
if len(matches) > 0:
2987
self.outf.write(gettext("Warning: the following files are version "
2988
"controlled and match your ignore pattern:\n%s"
2727
self.outf.write("Warning: the following files are version controlled and"
2728
" match your ignore pattern:\n%s"
2989
2729
"\nThese files will continue to be version controlled"
2990
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2730
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2993
2733
class cmd_ignored(Command):
3125
2864
def run(self, filename, revision=None, name_from_revision=False,
3126
2865
filters=False, directory=None):
3127
2866
if revision is not None and len(revision) != 1:
3128
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3129
" one revision specifier"))
2867
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2868
" one revision specifier")
3130
2869
tree, branch, relpath = \
3131
2870
_open_directory_or_containing_tree_or_branch(filename, directory)
3132
2871
self.add_cleanup(branch.lock_read().unlock)
3143
2882
old_file_id = rev_tree.path2id(relpath)
3145
# TODO: Split out this code to something that generically finds the
3146
# best id for a path across one or more trees; it's like
3147
# find_ids_across_trees but restricted to find just one. -- mbp
3149
2884
if name_from_revision:
3150
2885
# Try in revision if requested
3151
2886
if old_file_id is None:
3152
raise errors.BzrCommandError(gettext(
3153
"{0!r} is not present in revision {1}").format(
2887
raise errors.BzrCommandError(
2888
"%r is not present in revision %s" % (
3154
2889
filename, rev_tree.get_revision_id()))
3156
actual_file_id = old_file_id
2891
content = rev_tree.get_file_text(old_file_id)
3158
2893
cur_file_id = tree.path2id(relpath)
3159
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3160
actual_file_id = cur_file_id
3161
elif old_file_id is not None:
3162
actual_file_id = old_file_id
3164
raise errors.BzrCommandError(gettext(
3165
"{0!r} is not present in revision {1}").format(
2895
if cur_file_id is not None:
2896
# Then try with the actual file id
2898
content = rev_tree.get_file_text(cur_file_id)
2900
except errors.NoSuchId:
2901
# The actual file id didn't exist at that time
2903
if not found and old_file_id is not None:
2904
# Finally try with the old file id
2905
content = rev_tree.get_file_text(old_file_id)
2908
# Can't be found anywhere
2909
raise errors.BzrCommandError(
2910
"%r is not present in revision %s" % (
3166
2911
filename, rev_tree.get_revision_id()))
3168
from bzrlib.filter_tree import ContentFilterTree
3169
filter_tree = ContentFilterTree(rev_tree,
3170
rev_tree._content_filter_stack)
3171
content = filter_tree.get_file_text(actual_file_id)
2913
from bzrlib.filters import (
2914
ContentFilterContext,
2915
filtered_output_bytes,
2917
filters = rev_tree._content_filter_stack(relpath)
2918
chunks = content.splitlines(True)
2919
content = filtered_output_bytes(chunks, filters,
2920
ContentFilterContext(relpath, rev_tree))
2922
self.outf.writelines(content)
3173
content = rev_tree.get_file_text(actual_file_id)
3175
self.outf.write(content)
2925
self.outf.write(content)
3178
2928
class cmd_local_time_offset(Command):
3239
2989
to trigger updates to external systems like bug trackers. The --fixes
3240
2990
option can be used to record the association between a revision and
3241
2991
one or more bugs. See ``bzr help bugs`` for details.
2993
A selective commit may fail in some cases where the committed
2994
tree would be invalid. Consider::
2999
bzr commit foo -m "committing foo"
3000
bzr mv foo/bar foo/baz
3003
bzr commit foo/bar -m "committing bar but not baz"
3005
In the example above, the last commit will fail by design. This gives
3006
the user the opportunity to decide whether they want to commit the
3007
rename at the same time, separately first, or not at all. (As a general
3008
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3010
# TODO: Run hooks on tree to-be-committed, and after commit.
3012
# TODO: Strict commit that fails if there are deleted files.
3013
# (what does "deleted files" mean ??)
3015
# TODO: Give better message for -s, --summary, used by tla people
3017
# XXX: verbose currently does nothing
3244
3019
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3245
3020
takes_args = ['selected*']
3277
3052
Option('show-diff', short_name='p',
3278
3053
help='When no message is supplied, show the diff along'
3279
3054
' with the status summary in the message editor.'),
3281
help='When committing to a foreign version control '
3282
'system do not push data that can not be natively '
3285
3056
aliases = ['ci', 'checkin']
3287
3058
def _iter_bug_fix_urls(self, fixes, branch):
3288
default_bugtracker = None
3289
3059
# Configure the properties for bug fixing attributes.
3290
3060
for fixed_bug in fixes:
3291
3061
tokens = fixed_bug.split(':')
3292
if len(tokens) == 1:
3293
if default_bugtracker is None:
3294
branch_config = branch.get_config()
3295
default_bugtracker = branch_config.get_user_option(
3297
if default_bugtracker is None:
3298
raise errors.BzrCommandError(gettext(
3299
"No tracker specified for bug %s. Use the form "
3300
"'tracker:id' or specify a default bug tracker "
3301
"using the `bugtracker` option.\nSee "
3302
"\"bzr help bugs\" for more information on this "
3303
"feature. Commit refused.") % fixed_bug)
3304
tag = default_bugtracker
3306
elif len(tokens) != 2:
3307
raise errors.BzrCommandError(gettext(
3062
if len(tokens) != 2:
3063
raise errors.BzrCommandError(
3308
3064
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3309
3065
"See \"bzr help bugs\" for more information on this "
3310
"feature.\nCommit refused.") % fixed_bug)
3312
tag, bug_id = tokens
3066
"feature.\nCommit refused." % fixed_bug)
3067
tag, bug_id = tokens
3314
3069
yield bugtracker.get_bug_url(tag, branch, bug_id)
3315
3070
except errors.UnknownBugTrackerAbbreviation:
3316
raise errors.BzrCommandError(gettext(
3317
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3071
raise errors.BzrCommandError(
3072
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3318
3073
except errors.MalformedBugIdentifier, e:
3319
raise errors.BzrCommandError(gettext(
3320
"%s\nCommit refused.") % (str(e),))
3074
raise errors.BzrCommandError(
3075
"%s\nCommit refused." % (str(e),))
3322
3077
def run(self, message=None, file=None, verbose=False, selected_list=None,
3323
3078
unchanged=False, strict=False, local=False, fixes=None,
3324
author=None, show_diff=False, exclude=None, commit_time=None,
3079
author=None, show_diff=False, exclude=None, commit_time=None):
3326
3080
from bzrlib.errors import (
3327
3081
PointlessCommit,
3328
3082
ConflictsInTree,
3341
3094
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3342
3095
except ValueError, e:
3343
raise errors.BzrCommandError(gettext(
3344
"Could not parse --commit-time: " + str(e)))
3096
raise errors.BzrCommandError(
3097
"Could not parse --commit-time: " + str(e))
3099
# TODO: Need a blackbox test for invoking the external editor; may be
3100
# slightly problematic to run this cross-platform.
3102
# TODO: do more checks that the commit will succeed before
3103
# spending the user's valuable time typing a commit message.
3346
3105
properties = {}
3348
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3107
tree, selected_list = tree_files(selected_list)
3349
3108
if selected_list == ['']:
3350
3109
# workaround - commit of root of tree should be exactly the same
3351
3110
# as just default commit in that tree, and succeed even though
3380
3139
message = message.replace('\r\n', '\n')
3381
3140
message = message.replace('\r', '\n')
3383
raise errors.BzrCommandError(gettext(
3384
"please specify either --message or --file"))
3142
raise errors.BzrCommandError(
3143
"please specify either --message or --file")
3386
3145
def get_message(commit_obj):
3387
3146
"""Callback to get commit message"""
3391
my_message = f.read().decode(osutils.get_user_encoding())
3148
my_message = codecs.open(
3149
file, 'rt', osutils.get_user_encoding()).read()
3394
3150
elif message is not None:
3395
3151
my_message = message
3404
3160
# make_commit_message_template_encoded returns user encoding.
3405
3161
# We probably want to be using edit_commit_message instead to
3407
my_message = set_commit_message(commit_obj)
3408
if my_message is None:
3409
start_message = generate_commit_message_template(commit_obj)
3410
my_message = edit_commit_message_encoded(text,
3411
start_message=start_message)
3412
if my_message is None:
3413
raise errors.BzrCommandError(gettext("please specify a commit"
3414
" message with either --message or --file"))
3415
if my_message == "":
3416
raise errors.BzrCommandError(gettext("Empty commit message specified."
3417
" Please specify a commit message with either"
3418
" --message or --file or leave a blank message"
3419
" with --message \"\"."))
3163
start_message = generate_commit_message_template(commit_obj)
3164
my_message = edit_commit_message_encoded(text,
3165
start_message=start_message)
3166
if my_message is None:
3167
raise errors.BzrCommandError("please specify a commit"
3168
" message with either --message or --file")
3169
if my_message == "":
3170
raise errors.BzrCommandError("empty commit message specified")
3420
3171
return my_message
3422
3173
# The API permits a commit with a filter of [] to mean 'select nothing'
3430
3181
reporter=None, verbose=verbose, revprops=properties,
3431
3182
authors=author, timestamp=commit_stamp,
3432
3183
timezone=offset,
3433
exclude=tree.safe_relpath_files(exclude),
3184
exclude=safe_relpath_files(tree, exclude))
3435
3185
except PointlessCommit:
3436
raise errors.BzrCommandError(gettext("No changes to commit."
3437
" Please 'bzr add' the files you want to commit, or use"
3438
" --unchanged to force an empty commit."))
3186
raise errors.BzrCommandError("No changes to commit."
3187
" Use --unchanged to commit anyhow.")
3439
3188
except ConflictsInTree:
3440
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3189
raise errors.BzrCommandError('Conflicts detected in working '
3441
3190
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3443
3192
except StrictCommitFailed:
3444
raise errors.BzrCommandError(gettext("Commit refused because there are"
3445
" unknown files in the working tree."))
3193
raise errors.BzrCommandError("Commit refused because there are"
3194
" unknown files in the working tree.")
3446
3195
except errors.BoundBranchOutOfDate, e:
3447
e.extra_help = (gettext("\n"
3196
e.extra_help = ("\n"
3448
3197
'To commit to master branch, run update and then commit.\n'
3449
3198
'You can also pass --local to commit to continue working '
3524
3273
class cmd_upgrade(Command):
3525
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3527
When the default format has changed after a major new release of
3528
Bazaar, you may be informed during certain operations that you
3529
should upgrade. Upgrading to a newer format may improve performance
3530
or make new features available. It may however limit interoperability
3531
with older repositories or with older versions of Bazaar.
3533
If you wish to upgrade to a particular format rather than the
3534
current default, that can be specified using the --format option.
3535
As a consequence, you can use the upgrade command this way to
3536
"downgrade" to an earlier format, though some conversions are
3537
a one way process (e.g. changing from the 1.x default to the
3538
2.x default) so downgrading is not always possible.
3540
A backup.bzr.~#~ directory is created at the start of the conversion
3541
process (where # is a number). By default, this is left there on
3542
completion. If the conversion fails, delete the new .bzr directory
3543
and rename this one back in its place. Use the --clean option to ask
3544
for the backup.bzr directory to be removed on successful conversion.
3545
Alternatively, you can delete it by hand if everything looks good
3548
If the location given is a shared repository, dependent branches
3549
are also converted provided the repository converts successfully.
3550
If the conversion of a branch fails, remaining branches are still
3553
For more information on upgrades, see the Bazaar Upgrade Guide,
3554
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3274
__doc__ = """Upgrade branch storage to current format.
3276
The check command or bzr developers may sometimes advise you to run
3277
this command. When the default format has changed you may also be warned
3278
during other operations to upgrade.
3557
_see_also = ['check', 'reconcile', 'formats']
3281
_see_also = ['check']
3558
3282
takes_args = ['url?']
3559
3283
takes_options = [
3560
RegistryOption('format',
3561
help='Upgrade to a specific format. See "bzr help'
3562
' formats" for details.',
3563
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3564
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3565
value_switches=True, title='Branch format'),
3567
help='Remove the backup.bzr directory if successful.'),
3569
help="Show what would be done, but don't actually do anything."),
3284
RegistryOption('format',
3285
help='Upgrade to a specific format. See "bzr help'
3286
' formats" for details.',
3287
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3288
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3289
value_switches=True, title='Branch format'),
3572
def run(self, url='.', format=None, clean=False, dry_run=False):
3292
def run(self, url='.', format=None):
3573
3293
from bzrlib.upgrade import upgrade
3574
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3576
if len(exceptions) == 1:
3577
# Compatibility with historical behavior
3294
upgrade(url, format)
3583
3297
class cmd_whoami(Command):
3603
3316
encoding_type = 'replace'
3605
3318
@display_command
3606
def run(self, email=False, branch=False, name=None, directory=None):
3319
def run(self, email=False, branch=False, name=None):
3607
3320
if name is None:
3608
if directory is None:
3609
# use branch if we're inside one; otherwise global config
3611
c = Branch.open_containing(u'.')[0].get_config()
3612
except errors.NotBranchError:
3613
c = _mod_config.GlobalConfig()
3615
c = Branch.open(directory).get_config()
3321
# use branch if we're inside one; otherwise global config
3323
c = Branch.open_containing('.')[0].get_config()
3324
except errors.NotBranchError:
3325
c = config.GlobalConfig()
3617
3327
self.outf.write(c.user_email() + '\n')
3619
3329
self.outf.write(c.username() + '\n')
3623
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3626
3332
# display a warning if an email address isn't included in the given name.
3628
_mod_config.extract_email_address(name)
3334
config.extract_email_address(name)
3629
3335
except errors.NoEmailInUsername, e:
3630
3336
warning('"%s" does not seem to contain an email address. '
3631
3337
'This is allowed, but not recommended.', name)
3633
3339
# use global config unless --branch given
3635
if directory is None:
3636
c = Branch.open_containing(u'.')[0].get_config()
3638
c = Branch.open(directory).get_config()
3341
c = Branch.open_containing('.')[0].get_config()
3640
c = _mod_config.GlobalConfig()
3343
c = config.GlobalConfig()
3641
3344
c.set_user_option('email', name)
3707
3410
def remove_alias(self, alias_name):
3708
3411
if alias_name is None:
3709
raise errors.BzrCommandError(gettext(
3710
'bzr alias --remove expects an alias to remove.'))
3412
raise errors.BzrCommandError(
3413
'bzr alias --remove expects an alias to remove.')
3711
3414
# If alias is not found, print something like:
3712
3415
# unalias: foo: not found
3713
c = _mod_config.GlobalConfig()
3416
c = config.GlobalConfig()
3714
3417
c.unset_alias(alias_name)
3716
3419
@display_command
3717
3420
def print_aliases(self):
3718
3421
"""Print out the defined aliases in a similar format to bash."""
3719
aliases = _mod_config.GlobalConfig().get_aliases()
3422
aliases = config.GlobalConfig().get_aliases()
3720
3423
for key, value in sorted(aliases.iteritems()):
3721
3424
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3792
3492
if typestring == "sftp":
3793
3493
from bzrlib.tests import stub_sftp
3794
3494
return stub_sftp.SFTPAbsoluteServer
3795
elif typestring == "memory":
3495
if typestring == "memory":
3796
3496
from bzrlib.tests import test_server
3797
3497
return memory.MemoryServer
3798
elif typestring == "fakenfs":
3498
if typestring == "fakenfs":
3799
3499
from bzrlib.tests import test_server
3800
3500
return test_server.FakeNFSServer
3801
3501
msg = "No known transport type %s. Supported types are: sftp\n" %\
3814
3514
'throughout the test suite.',
3815
3515
type=get_transport_type),
3816
3516
Option('benchmark',
3817
help='Run the benchmarks rather than selftests.',
3517
help='Run the benchmarks rather than selftests.'),
3819
3518
Option('lsprof-timed',
3820
3519
help='Generate lsprof output for benchmarked'
3821
3520
' sections of code.'),
3822
3521
Option('lsprof-tests',
3823
3522
help='Generate lsprof output for each test.'),
3523
Option('cache-dir', type=str,
3524
help='Cache intermediate benchmark output in this '
3824
3526
Option('first',
3825
3527
help='Run all tests, but run specified tests first.',
3826
3528
short_name='f',
3835
3537
Option('randomize', type=str, argname="SEED",
3836
3538
help='Randomize the order of tests using the given'
3837
3539
' seed or "now" for the current time.'),
3838
ListOption('exclude', type=str, argname="PATTERN",
3840
help='Exclude tests that match this regular'
3540
Option('exclude', type=str, argname="PATTERN",
3542
help='Exclude tests that match this regular'
3842
3544
Option('subunit',
3843
3545
help='Output test progress via subunit.'),
3844
3546
Option('strict', help='Fail on missing dependencies or '
3864
3563
def run(self, testspecs_list=None, verbose=False, one=False,
3865
3564
transport=None, benchmark=None,
3565
lsprof_timed=None, cache_dir=None,
3867
3566
first=False, list_only=False,
3868
3567
randomize=None, exclude=None, strict=False,
3869
3568
load_list=None, debugflag=None, starting_with=None, subunit=False,
3870
parallel=None, lsprof_tests=False,
3872
from bzrlib import tests
3569
parallel=None, lsprof_tests=False):
3570
from bzrlib.tests import selftest
3571
import bzrlib.benchmarks as benchmarks
3572
from bzrlib.benchmarks import tree_creator
3574
# Make deprecation warnings visible, unless -Werror is set
3575
symbol_versioning.activate_deprecation_warnings(override=False)
3577
if cache_dir is not None:
3578
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3874
3579
if testspecs_list is not None:
3875
3580
pattern = '|'.join(testspecs_list)
3895
3600
self.additional_selftest_args.setdefault(
3896
3601
'suite_decorators', []).append(parallel)
3898
raise errors.BzrCommandError(gettext(
3899
"--benchmark is no longer supported from bzr 2.2; "
3900
"use bzr-usertest instead"))
3901
test_suite_factory = None
3903
exclude_pattern = None
3603
test_suite_factory = benchmarks.test_suite
3604
# Unless user explicitly asks for quiet, be verbose in benchmarks
3605
verbose = not is_quiet()
3606
# TODO: should possibly lock the history file...
3607
benchfile = open(".perf_history", "at", buffering=1)
3608
self.add_cleanup(benchfile.close)
3905
exclude_pattern = '(' + '|'.join(exclude) + ')'
3907
self._disable_fsync()
3610
test_suite_factory = None
3908
3612
selftest_kwargs = {"verbose": verbose,
3909
3613
"pattern": pattern,
3910
3614
"stop_on_failure": one,
3912
3616
"test_suite_factory": test_suite_factory,
3913
3617
"lsprof_timed": lsprof_timed,
3914
3618
"lsprof_tests": lsprof_tests,
3619
"bench_history": benchfile,
3915
3620
"matching_tests_first": first,
3916
3621
"list_only": list_only,
3917
3622
"random_seed": randomize,
3918
"exclude_pattern": exclude_pattern,
3623
"exclude_pattern": exclude,
3919
3624
"strict": strict,
3920
3625
"load_list": load_list,
3921
3626
"debug_flags": debugflag,
3922
3627
"starting_with": starting_with
3924
3629
selftest_kwargs.update(self.additional_selftest_args)
3926
# Make deprecation warnings visible, unless -Werror is set
3927
cleanup = symbol_versioning.activate_deprecation_warnings(
3930
result = tests.selftest(**selftest_kwargs)
3630
result = selftest(**selftest_kwargs)
3933
3631
return int(not result)
3935
def _disable_fsync(self):
3936
"""Change the 'os' functionality to not synchronize."""
3937
self._orig_fsync = getattr(os, 'fsync', None)
3938
if self._orig_fsync is not None:
3939
os.fsync = lambda filedes: None
3940
self._orig_fdatasync = getattr(os, 'fdatasync', None)
3941
if self._orig_fdatasync is not None:
3942
os.fdatasync = lambda filedes: None
3945
3634
class cmd_version(Command):
3946
3635
__doc__ = """Show version of bzr."""
3999
3688
The source of the merge can be specified either in the form of a branch,
4000
3689
or in the form of a path to a file containing a merge directive generated
4001
3690
with bzr send. If neither is specified, the default is the upstream branch
4002
or the branch most recently merged using --remember. The source of the
4003
merge may also be specified in the form of a path to a file in another
4004
branch: in this case, only the modifications to that file are merged into
4005
the current working tree.
4007
When merging from a branch, by default bzr will try to merge in all new
4008
work from the other branch, automatically determining an appropriate base
4009
revision. If this fails, you may need to give an explicit base.
4011
To pick a different ending revision, pass "--revision OTHER". bzr will
4012
try to merge in all new work up to and including revision OTHER.
4014
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4015
through OTHER, excluding BASE but including OTHER, will be merged. If this
4016
causes some revisions to be skipped, i.e. if the destination branch does
4017
not already contain revision BASE, such a merge is commonly referred to as
4018
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4019
cherrypicks. The changes look like a normal commit, and the history of the
4020
changes from the other branch is not stored in the commit.
4022
Revision numbers are always relative to the source branch.
3691
or the branch most recently merged using --remember.
3693
When merging a branch, by default the tip will be merged. To pick a different
3694
revision, pass --revision. If you specify two values, the first will be used as
3695
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3696
available revisions, like this is commonly referred to as "cherrypicking".
3698
Revision numbers are always relative to the branch being merged.
3700
By default, bzr will try to merge in all new work from the other
3701
branch, automatically determining an appropriate base. If this
3702
fails, you may need to give an explicit base.
4024
3704
Merge will do its best to combine the changes in two branches, but there
4025
3705
are some kinds of problems only a human can fix. When it encounters those,
4029
3709
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
4031
If there is no default branch set, the first merge will set it (use
4032
--no-remember to avoid setting it). After that, you can omit the branch
4033
to use the default. To change the default, use --remember. The value will
4034
only be saved if the remote location can be accessed.
3711
If there is no default branch set, the first merge will set it. After
3712
that, you can omit the branch to use the default. To change the
3713
default, use --remember. The value will only be saved if the remote
3714
location can be accessed.
4036
3716
The results of the merge are placed into the destination working
4037
3717
directory, where they can be reviewed (with bzr diff), tested, and then
4038
3718
committed to record the result of the merge.
4040
3720
merge refuses to run if there are any uncommitted changes, unless
4041
--force is given. If --force is given, then the changes from the source
4042
will be merged with the current working tree, including any uncommitted
4043
changes in the tree. The --force option can also be used to create a
3721
--force is given. The --force option can also be used to create a
4044
3722
merge revision which has more than two parents.
4046
3724
If one would like to merge changes from the working tree of the other
4106
3784
def run(self, location=None, revision=None, force=False,
4107
merge_type=None, show_base=False, reprocess=None, remember=None,
3785
merge_type=None, show_base=False, reprocess=None, remember=False,
4108
3786
uncommitted=False, pull=False,
4109
3787
directory=None,
4148
3822
mergeable = None
4150
3824
if uncommitted:
4151
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4152
' with bundles or merge directives.'))
3825
raise errors.BzrCommandError('Cannot use --uncommitted'
3826
' with bundles or merge directives.')
4154
3828
if revision is not None:
4155
raise errors.BzrCommandError(gettext(
4156
'Cannot use -r with merge directives or bundles'))
3829
raise errors.BzrCommandError(
3830
'Cannot use -r with merge directives or bundles')
4157
3831
merger, verified = _mod_merge.Merger.from_mergeable(tree,
4158
3832
mergeable, None)
4160
3834
if merger is None and uncommitted:
4161
3835
if revision is not None and len(revision) > 0:
4162
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4163
' --revision at the same time.'))
3836
raise errors.BzrCommandError('Cannot use --uncommitted and'
3837
' --revision at the same time.')
4164
3838
merger = self.get_merger_from_uncommitted(tree, location, None)
4165
3839
allow_pending = False
4174
3848
self.sanity_check_merger(merger)
4175
3849
if (merger.base_rev_id == merger.other_rev_id and
4176
3850
merger.other_rev_id is not None):
4177
# check if location is a nonexistent file (and not a branch) to
4178
# disambiguate the 'Nothing to do'
4179
if merger.interesting_files:
4180
if not merger.other_tree.has_filename(
4181
merger.interesting_files[0]):
4182
note(gettext("merger: ") + str(merger))
4183
raise errors.PathsDoNotExist([location])
4184
note(gettext('Nothing to do.'))
3851
note('Nothing to do.')
4186
if pull and not preview:
4187
3854
if merger.interesting_files is not None:
4188
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3855
raise errors.BzrCommandError('Cannot pull individual files')
4189
3856
if (merger.base_rev_id == tree.last_revision()):
4190
3857
result = tree.pull(merger.other_branch, False,
4191
3858
merger.other_rev_id)
4192
3859
result.report(self.outf)
4194
3861
if merger.this_basis is None:
4195
raise errors.BzrCommandError(gettext(
3862
raise errors.BzrCommandError(
4196
3863
"This branch has no commits."
4197
" (perhaps you would prefer 'bzr pull')"))
3864
" (perhaps you would prefer 'bzr pull')")
4199
3866
return self._do_preview(merger)
4200
3867
elif interactive:
4213
3880
def _do_preview(self, merger):
4214
3881
from bzrlib.diff import show_diff_trees
4215
3882
result_tree = self._get_preview(merger)
4216
path_encoding = osutils.get_diff_header_encoding()
4217
3883
show_diff_trees(merger.this_tree, result_tree, self.outf,
4218
old_label='', new_label='',
4219
path_encoding=path_encoding)
3884
old_label='', new_label='')
4221
3886
def _do_merge(self, merger, change_reporter, allow_pending, verified):
4222
3887
merger.change_reporter = change_reporter
4260
3925
# Use reprocess if the merger supports it
4261
3926
merger.reprocess = merger.merge_type.supports_reprocess
4262
3927
if merger.reprocess and not merger.merge_type.supports_reprocess:
4263
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4264
" for merge type %s.") %
3928
raise errors.BzrCommandError("Conflict reduction is not supported"
3929
" for merge type %s." %
4265
3930
merger.merge_type)
4266
3931
if merger.reprocess and merger.show_base:
4267
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
3932
raise errors.BzrCommandError("Cannot do conflict reduction and"
4270
3935
def _get_merger_from_branch(self, tree, location, revision, remember,
4271
3936
possible_transports, pb):
4298
3963
if other_revision_id is None:
4299
3964
other_revision_id = _mod_revision.ensure_null(
4300
3965
other_branch.last_revision())
4301
# Remember where we merge from. We need to remember if:
4302
# - user specify a location (and we don't merge from the parent
4304
# - user ask to remember or there is no previous location set to merge
4305
# from and user didn't ask to *not* remember
4306
if (user_location is not None
4308
or (remember is None
4309
and tree.branch.get_submit_branch() is None)))):
3966
# Remember where we merge from
3967
if ((remember or tree.branch.get_submit_branch() is None) and
3968
user_location is not None):
4310
3969
tree.branch.set_submit_branch(other_branch.base)
4311
# Merge tags (but don't set them in the master branch yet, the user
4312
# might revert this merge). Commit will propagate them.
4313
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3970
_merge_tags_if_possible(other_branch, tree.branch)
4314
3971
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4315
3972
other_revision_id, base_revision_id, other_branch, base_branch)
4316
3973
if other_path != '':
4375
4032
stored_location_type = "parent"
4376
4033
mutter("%s", stored_location)
4377
4034
if stored_location is None:
4378
raise errors.BzrCommandError(gettext("No location specified or remembered"))
4035
raise errors.BzrCommandError("No location specified or remembered")
4379
4036
display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
4380
note(gettext("{0} remembered {1} location {2}").format(verb_string,
4381
stored_location_type, display_url))
4037
note(u"%s remembered %s location %s", verb_string,
4038
stored_location_type, display_url)
4382
4039
return stored_location
4417
4074
from bzrlib.conflicts import restore
4418
4075
if merge_type is None:
4419
4076
merge_type = _mod_merge.Merge3Merger
4420
tree, file_list = WorkingTree.open_containing_paths(file_list)
4077
tree, file_list = tree_files(file_list)
4421
4078
self.add_cleanup(tree.lock_write().unlock)
4422
4079
parents = tree.get_parent_ids()
4423
4080
if len(parents) != 2:
4424
raise errors.BzrCommandError(gettext("Sorry, remerge only works after normal"
4081
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4425
4082
" merges. Not cherrypicking or"
4427
4084
repository = tree.branch.repository
4428
4085
interesting_ids = None
4429
4086
new_conflicts = []
4484
4141
last committed revision is used.
4486
4143
To remove only some changes, without reverting to a prior version, use
4487
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4488
will remove the changes introduced by the second last commit (-2), without
4489
affecting the changes introduced by the last commit (-1). To remove
4490
certain changes on a hunk-by-hunk basis, see the shelve command.
4144
merge instead. For example, "merge . --revision -2..-3" will remove the
4145
changes introduced by -2, without affecting the changes introduced by -1.
4146
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4492
4148
By default, any files that have been manually changed will be backed up
4493
4149
first. (Files changed only by merge are not backed up.) Backup files have
4660
4313
theirs_only=False,
4661
4314
log_format=None, long=False, short=False, line=False,
4662
4315
show_ids=False, verbose=False, this=False, other=False,
4663
include_merged=None, revision=None, my_revision=None,
4665
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4316
include_merges=False, revision=None, my_revision=None):
4666
4317
from bzrlib.missing import find_unmerged, iter_log_revisions
4667
4318
def message(s):
4668
4319
if not is_quiet():
4669
4320
self.outf.write(s)
4671
if symbol_versioning.deprecated_passed(include_merges):
4672
ui.ui_factory.show_user_warning(
4673
'deprecated_command_option',
4674
deprecated_name='--include-merges',
4675
recommended_name='--include-merged',
4676
deprecated_in_version='2.5',
4677
command=self.invoked_as)
4678
if include_merged is None:
4679
include_merged = include_merges
4681
raise errors.BzrCommandError(gettext(
4682
'{0} and {1} are mutually exclusive').format(
4683
'--include-merges', '--include-merged'))
4684
if include_merged is None:
4685
include_merged = False
4687
4323
mine_only = this
4696
4332
elif theirs_only:
4697
4333
restrict = 'remote'
4699
local_branch = Branch.open_containing(directory)[0]
4335
local_branch = Branch.open_containing(u".")[0]
4700
4336
self.add_cleanup(local_branch.lock_read().unlock)
4702
4338
parent = local_branch.get_parent()
4703
4339
if other_branch is None:
4704
4340
other_branch = parent
4705
4341
if other_branch is None:
4706
raise errors.BzrCommandError(gettext("No peer location known"
4342
raise errors.BzrCommandError("No peer location known"
4708
4344
display_url = urlutils.unescape_for_display(parent,
4709
4345
self.outf.encoding)
4710
message(gettext("Using saved parent location: {0}\n").format(
4346
message("Using saved parent location: "
4347
+ display_url + "\n")
4713
4349
remote_branch = Branch.open(other_branch)
4714
4350
if remote_branch.base == local_branch.base:
4769
4401
if mine_only and not local_extra:
4770
4402
# We checked local, and found nothing extra
4771
message(gettext('This branch has no new revisions.\n'))
4403
message('This branch is up to date.\n')
4772
4404
elif theirs_only and not remote_extra:
4773
4405
# We checked remote, and found nothing extra
4774
message(gettext('Other branch has no new revisions.\n'))
4406
message('Other branch is up to date.\n')
4775
4407
elif not (mine_only or theirs_only or local_extra or
4777
4409
# We checked both branches, and neither one had extra
4779
message(gettext("Branches are up to date.\n"))
4411
message("Branches are up to date.\n")
4780
4412
self.cleanup_now()
4781
4413
if not status_code and parent is None and other_branch is not None:
4782
4414
self.add_cleanup(local_branch.lock_write().unlock)
4845
4477
@display_command
4846
4478
def run(self, verbose=False):
4847
from bzrlib import plugin
4848
# Don't give writelines a generator as some codecs don't like that
4849
self.outf.writelines(
4850
list(plugin.describe_plugins(show_paths=verbose)))
4479
import bzrlib.plugin
4480
from inspect import getdoc
4482
for name, plugin in bzrlib.plugin.plugins().items():
4483
version = plugin.__version__
4484
if version == 'unknown':
4486
name_ver = '%s %s' % (name, version)
4487
d = getdoc(plugin.module)
4489
doc = d.split('\n')[0]
4491
doc = '(no description)'
4492
result.append((name_ver, doc, plugin.path()))
4493
for name_ver, doc, path in sorted(result):
4494
self.outf.write("%s\n" % name_ver)
4495
self.outf.write(" %s\n" % doc)
4497
self.outf.write(" %s\n" % path)
4498
self.outf.write("\n")
4853
4501
class cmd_testament(Command):
4917
4563
self.add_cleanup(branch.lock_read().unlock)
4918
4564
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4919
4565
self.add_cleanup(tree.lock_read().unlock)
4920
if wt is not None and revision is None:
4921
4567
file_id = wt.path2id(relpath)
4923
4569
file_id = tree.path2id(relpath)
4924
4570
if file_id is None:
4925
4571
raise errors.NotVersionedError(filename)
4572
file_version = tree.inventory[file_id].revision
4926
4573
if wt is not None and revision is None:
4927
4574
# If there is a tree and we're not annotating historical
4928
4575
# versions, annotate the working tree's content.
4929
4576
annotate_file_tree(wt, file_id, self.outf, long, all,
4930
4577
show_ids=show_ids)
4932
annotate_file_tree(tree, file_id, self.outf, long, all,
4933
show_ids=show_ids, branch=branch)
4579
annotate_file(branch, file_version, file_id, long, all, self.outf,
4936
4583
class cmd_re_sign(Command):
4944
4591
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4945
4592
if revision_id_list is not None and revision is not None:
4946
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4593
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4947
4594
if revision_id_list is None and revision is None:
4948
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
4595
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4949
4596
b = WorkingTree.open_containing(directory)[0].branch
4950
4597
self.add_cleanup(b.lock_write().unlock)
4951
4598
return self._run(b, revision_id_list, revision)
5021
4668
location = b.get_old_bound_location()
5022
4669
except errors.UpgradeRequired:
5023
raise errors.BzrCommandError(gettext('No location supplied. '
5024
'This format does not remember old locations.'))
4670
raise errors.BzrCommandError('No location supplied. '
4671
'This format does not remember old locations.')
5026
4673
if location is None:
5027
4674
if b.get_bound_location() is not None:
5028
raise errors.BzrCommandError(gettext('Branch is already bound'))
4675
raise errors.BzrCommandError('Branch is already bound')
5030
raise errors.BzrCommandError(gettext('No location supplied '
5031
'and no previous location known'))
4677
raise errors.BzrCommandError('No location supplied '
4678
'and no previous location known')
5032
4679
b_other = Branch.open(location)
5034
4681
b.bind(b_other)
5035
4682
except errors.DivergedBranches:
5036
raise errors.BzrCommandError(gettext('These branches have diverged.'
5037
' Try merging, and then bind again.'))
4683
raise errors.BzrCommandError('These branches have diverged.'
4684
' Try merging, and then bind again.')
5038
4685
if b.get_config().has_explicit_nickname():
5039
4686
b.nick = b_other.nick
5092
4737
encoding_type = 'replace'
5094
def run(self, location=None, dry_run=False, verbose=False,
5095
revision=None, force=False, local=False, keep_tags=False):
4739
def run(self, location=None,
4740
dry_run=False, verbose=False,
4741
revision=None, force=False, local=False):
5096
4742
if location is None:
5097
4743
location = u'.'
5098
4744
control, relpath = bzrdir.BzrDir.open_containing(location)
5107
4753
self.add_cleanup(tree.lock_write().unlock)
5109
4755
self.add_cleanup(b.lock_write().unlock)
5110
return self._run(b, tree, dry_run, verbose, revision, force,
4756
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5113
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4758
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5115
4759
from bzrlib.log import log_formatter, show_log
5116
4760
from bzrlib.uncommit import uncommit
5147
4791
end_revision=last_revno)
5150
self.outf.write(gettext('Dry-run, pretending to remove'
5151
' the above revisions.\n'))
4794
self.outf.write('Dry-run, pretending to remove'
4795
' the above revisions.\n')
5153
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4797
self.outf.write('The above revision(s) will be removed.\n')
5156
if not ui.ui_factory.confirm_action(
5157
gettext(u'Uncommit these revisions'),
5158
'bzrlib.builtins.uncommit',
5160
self.outf.write(gettext('Canceled\n'))
4800
if not ui.ui_factory.get_boolean('Are you sure'):
4801
self.outf.write('Canceled')
5163
4804
mutter('Uncommitting from {%s} to {%s}',
5164
4805
last_rev_id, rev_id)
5165
4806
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5166
revno=revno, local=local, keep_tags=keep_tags)
5167
self.outf.write(gettext('You can restore the old tip by running:\n'
5168
' bzr pull . -r revid:%s\n') % last_rev_id)
4807
revno=revno, local=local)
4808
self.outf.write('You can restore the old tip by running:\n'
4809
' bzr pull . -r revid:%s\n' % last_rev_id)
5171
4812
class cmd_break_lock(Command):
5172
__doc__ = """Break a dead lock.
5174
This command breaks a lock on a repository, branch, working directory or
4813
__doc__ = """Break a dead lock on a repository, branch or working directory.
5177
4815
CAUTION: Locks should only be broken when you are sure that the process
5178
4816
holding the lock has been stopped.
5185
4823
bzr break-lock bzr+ssh://example.com/bzr/foo
5186
bzr break-lock --conf ~/.bazaar
5189
4825
takes_args = ['location?']
5192
help='LOCATION is the directory where the config lock is.'),
5194
help='Do not ask for confirmation before breaking the lock.'),
5197
def run(self, location=None, config=False, force=False):
4827
def run(self, location=None, show=False):
5198
4828
if location is None:
5199
4829
location = u'.'
5201
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5203
{'bzrlib.lockdir.break': True})
5205
conf = _mod_config.LockableConfig(file_name=location)
5208
control, relpath = bzrdir.BzrDir.open_containing(location)
5210
control.break_lock()
5211
except NotImplementedError:
4830
control, relpath = bzrdir.BzrDir.open_containing(location)
4832
control.break_lock()
4833
except NotImplementedError:
5215
4837
class cmd_wait_until_signalled(Command):
5279
4899
return host, port
5281
4901
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5282
protocol=None, client_timeout=None):
5283
from bzrlib import transport
4903
from bzrlib.transport import get_transport, transport_server_registry
5284
4904
if directory is None:
5285
4905
directory = os.getcwd()
5286
4906
if protocol is None:
5287
protocol = transport.transport_server_registry.get()
4907
protocol = transport_server_registry.get()
5288
4908
host, port = self.get_host_and_port(port)
5289
4909
url = urlutils.local_path_to_url(directory)
5290
4910
if not allow_writes:
5291
4911
url = 'readonly+' + url
5292
t = transport.get_transport(url)
5294
protocol(t, host, port, inet, client_timeout)
5295
except TypeError, e:
5296
# We use symbol_versioning.deprecated_in just so that people
5297
# grepping can find it here.
5298
# symbol_versioning.deprecated_in((2, 5, 0))
5299
symbol_versioning.warn(
5300
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5301
'Most likely it needs to be updated to support a'
5302
' "timeout" parameter (added in bzr 2.5.0)'
5303
% (e, protocol.__module__, protocol),
5305
protocol(t, host, port, inet)
4912
transport = get_transport(url)
4913
protocol(transport, host, port, inet)
5308
4916
class cmd_join(Command):
5341
4949
except errors.BadReferenceTarget, e:
5342
4950
# XXX: Would be better to just raise a nicely printable
5343
4951
# exception from the real origin. Also below. mbp 20070306
5344
raise errors.BzrCommandError(
5345
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4952
raise errors.BzrCommandError("Cannot join %s. %s" %
5348
4956
containing_tree.subsume(sub_tree)
5349
4957
except errors.BadSubsumeSource, e:
5350
raise errors.BzrCommandError(
5351
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4958
raise errors.BzrCommandError("Cannot join %s. %s" %
5354
4962
class cmd_split(Command):
5420
5027
encoding_type = 'exact'
5422
5029
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5423
sign=False, revision=None, mail_to=None, message=None,
5030
sign=False, revision=None, mail_to=None, message=None):
5425
5031
from bzrlib.revision import ensure_null, NULL_REVISION
5426
5032
include_patch, include_bundle = {
5427
5033
'plain': (False, False),
5428
5034
'diff': (True, False),
5429
5035
'bundle': (True, True),
5431
branch = Branch.open(directory)
5037
branch = Branch.open('.')
5432
5038
stored_submit_branch = branch.get_submit_branch()
5433
5039
if submit_branch is None:
5434
5040
submit_branch = stored_submit_branch
5446
5052
elif stored_public_branch is None:
5447
5053
branch.set_public_branch(public_branch)
5448
5054
if not include_bundle and public_branch is None:
5449
raise errors.BzrCommandError(gettext('No public branch specified or'
5055
raise errors.BzrCommandError('No public branch specified or'
5451
5057
base_revision_id = None
5452
5058
if revision is not None:
5453
5059
if len(revision) > 2:
5454
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5455
'at most two one revision identifiers'))
5060
raise errors.BzrCommandError('bzr merge-directive takes '
5061
'at most two one revision identifiers')
5456
5062
revision_id = revision[-1].as_revision_id(branch)
5457
5063
if len(revision) == 2:
5458
5064
base_revision_id = revision[0].as_revision_id(branch)
5460
5066
revision_id = branch.last_revision()
5461
5067
revision_id = ensure_null(revision_id)
5462
5068
if revision_id == NULL_REVISION:
5463
raise errors.BzrCommandError(gettext('No revisions to bundle.'))
5069
raise errors.BzrCommandError('No revisions to bundle.')
5464
5070
directive = merge_directive.MergeDirective2.from_objects(
5465
5071
branch.repository, revision_id, time.time(),
5466
5072
osutils.local_time_offset(), submit_branch,
5510
5116
source branch defaults to that containing the working directory, but can
5511
5117
be changed using --from.
5513
Both the submit branch and the public branch follow the usual behavior with
5514
respect to --remember: If there is no default location set, the first send
5515
will set it (use --no-remember to avoid setting it). After that, you can
5516
omit the location to use the default. To change the default, use
5517
--remember. The value will only be saved if the location can be accessed.
5519
5119
In order to calculate those changes, bzr must analyse the submit branch.
5520
5120
Therefore it is most efficient for the submit branch to be a local mirror.
5521
5121
If a public location is known for the submit_branch, that location is used
5592
5192
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5593
no_patch=False, revision=None, remember=None, output=None,
5193
no_patch=False, revision=None, remember=False, output=None,
5594
5194
format=None, mail_to=None, message=None, body=None,
5595
5195
strict=None, **kwargs):
5596
5196
from bzrlib.send import send
5720
5320
self.add_cleanup(branch.lock_write().unlock)
5722
5322
if tag_name is None:
5723
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5323
raise errors.BzrCommandError("No tag specified to delete.")
5724
5324
branch.tags.delete_tag(tag_name)
5725
note(gettext('Deleted tag %s.') % tag_name)
5325
self.outf.write('Deleted tag %s.\n' % tag_name)
5728
5328
if len(revision) != 1:
5729
raise errors.BzrCommandError(gettext(
5329
raise errors.BzrCommandError(
5730
5330
"Tags can only be placed on a single revision, "
5732
5332
revision_id = revision[0].as_revision_id(branch)
5734
5334
revision_id = branch.last_revision()
5735
5335
if tag_name is None:
5736
5336
tag_name = branch.automatic_tag_name(revision_id)
5737
5337
if tag_name is None:
5738
raise errors.BzrCommandError(gettext(
5739
"Please specify a tag name."))
5741
existing_target = branch.tags.lookup_tag(tag_name)
5742
except errors.NoSuchTag:
5743
existing_target = None
5744
if not force and existing_target not in (None, revision_id):
5338
raise errors.BzrCommandError(
5339
"Please specify a tag name.")
5340
if (not force) and branch.tags.has_tag(tag_name):
5745
5341
raise errors.TagAlreadyExists(tag_name)
5746
if existing_target == revision_id:
5747
note(gettext('Tag %s already exists for that revision.') % tag_name)
5749
branch.tags.set_tag(tag_name, revision_id)
5750
if existing_target is None:
5751
note(gettext('Created tag %s.') % tag_name)
5753
note(gettext('Updated tag %s.') % tag_name)
5342
branch.tags.set_tag(tag_name, revision_id)
5343
self.outf.write('Created tag %s.\n' % tag_name)
5756
5346
class cmd_tags(Command):
5763
5353
takes_options = [
5764
5354
custom_help('directory',
5765
5355
help='Branch whose tags should be displayed.'),
5766
RegistryOption('sort',
5356
RegistryOption.from_kwargs('sort',
5767
5357
'Sort tags by different criteria.', title='Sorting',
5768
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5358
alpha='Sort tags lexicographically (default).',
5359
time='Sort tags chronologically.',
5774
5365
@display_command
5775
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5776
from bzrlib.tag import tag_sort_methods
5777
5372
branch, relpath = Branch.open_containing(directory)
5779
5374
tags = branch.tags.get_tag_dict().items()
5783
5378
self.add_cleanup(branch.lock_read().unlock)
5785
# Restrict to the specified range
5786
tags = self._tags_for_range(branch, revision)
5788
sort = tag_sort_methods.get()
5380
graph = branch.repository.get_graph()
5381
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5382
revid1, revid2 = rev1.rev_id, rev2.rev_id
5383
# only show revisions between revid1 and revid2 (inclusive)
5384
tags = [(tag, revid) for tag, revid in tags if
5385
graph.is_between(revid, revid1, revid2)]
5388
elif sort == 'time':
5390
for tag, revid in tags:
5392
revobj = branch.repository.get_revision(revid)
5393
except errors.NoSuchRevision:
5394
timestamp = sys.maxint # place them at the end
5396
timestamp = revobj.timestamp
5397
timestamps[revid] = timestamp
5398
tags.sort(key=lambda x: timestamps[x[1]])
5790
5399
if not show_ids:
5791
5400
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5792
5401
for index, (tag, revid) in enumerate(tags):
5804
5412
for tag, revspec in tags:
5805
5413
self.outf.write('%-20s %s\n' % (tag, revspec))
5807
def _tags_for_range(self, branch, revision):
5809
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5810
revid1, revid2 = rev1.rev_id, rev2.rev_id
5811
# _get_revision_range will always set revid2 if it's not specified.
5812
# If revid1 is None, it means we want to start from the branch
5813
# origin which is always a valid ancestor. If revid1 == revid2, the
5814
# ancestry check is useless.
5815
if revid1 and revid1 != revid2:
5816
# FIXME: We really want to use the same graph than
5817
# branch.iter_merge_sorted_revisions below, but this is not
5818
# easily available -- vila 2011-09-23
5819
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5820
# We don't want to output anything in this case...
5822
# only show revisions between revid1 and revid2 (inclusive)
5823
tagged_revids = branch.tags.get_reverse_tag_dict()
5825
for r in branch.iter_merge_sorted_revisions(
5826
start_revision_id=revid2, stop_revision_id=revid1,
5827
stop_rule='include'):
5828
revid_tags = tagged_revids.get(r[0], None)
5830
found.extend([(tag, r[0]) for tag in revid_tags])
5834
5416
class cmd_reconfigure(Command):
5835
5417
__doc__ = """Reconfigure the type of a bzr directory.
5849
5431
takes_args = ['location?']
5850
5432
takes_options = [
5851
5433
RegistryOption.from_kwargs(
5854
help='The relation between branch and tree.',
5435
title='Target type',
5436
help='The type to reconfigure the directory to.',
5855
5437
value_switches=True, enum_switch=False,
5856
5438
branch='Reconfigure to be an unbound branch with no working tree.',
5857
5439
tree='Reconfigure to be an unbound branch with a working tree.',
5858
5440
checkout='Reconfigure to be a bound branch with a working tree.',
5859
5441
lightweight_checkout='Reconfigure to be a lightweight'
5860
5442
' checkout (with no local history).',
5862
RegistryOption.from_kwargs(
5864
title='Repository type',
5865
help='Location fo the repository.',
5866
value_switches=True, enum_switch=False,
5867
5443
standalone='Reconfigure to be a standalone branch '
5868
5444
'(i.e. stop using shared repository).',
5869
5445
use_shared='Reconfigure to use a shared repository.',
5871
RegistryOption.from_kwargs(
5873
title='Trees in Repository',
5874
help='Whether new branches in the repository have trees.',
5875
value_switches=True, enum_switch=False,
5876
5446
with_trees='Reconfigure repository to create '
5877
5447
'working trees on branches by default.',
5878
5448
with_no_trees='Reconfigure repository to not create '
5895
def run(self, location=None, bind_to=None, force=False,
5896
tree_type=None, repository_type=None, repository_trees=None,
5897
stacked_on=None, unstacked=None):
5465
def run(self, location=None, target_type=None, bind_to=None, force=False,
5898
5468
directory = bzrdir.BzrDir.open(location)
5899
5469
if stacked_on and unstacked:
5900
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5470
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5901
5471
elif stacked_on is not None:
5902
5472
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5903
5473
elif unstacked:
5905
5475
# At the moment you can use --stacked-on and a different
5906
5476
# reconfiguration shape at the same time; there seems no good reason
5908
if (tree_type is None and
5909
repository_type is None and
5910
repository_trees is None):
5478
if target_type is None:
5911
5479
if stacked_on or unstacked:
5914
raise errors.BzrCommandError(gettext('No target configuration '
5916
reconfiguration = None
5917
if tree_type == 'branch':
5482
raise errors.BzrCommandError('No target configuration '
5484
elif target_type == 'branch':
5918
5485
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5919
elif tree_type == 'tree':
5486
elif target_type == 'tree':
5920
5487
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5921
elif tree_type == 'checkout':
5488
elif target_type == 'checkout':
5922
5489
reconfiguration = reconfigure.Reconfigure.to_checkout(
5923
5490
directory, bind_to)
5924
elif tree_type == 'lightweight-checkout':
5491
elif target_type == 'lightweight-checkout':
5925
5492
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5926
5493
directory, bind_to)
5928
reconfiguration.apply(force)
5929
reconfiguration = None
5930
if repository_type == 'use-shared':
5494
elif target_type == 'use-shared':
5931
5495
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5932
elif repository_type == 'standalone':
5496
elif target_type == 'standalone':
5933
5497
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5935
reconfiguration.apply(force)
5936
reconfiguration = None
5937
if repository_trees == 'with-trees':
5498
elif target_type == 'with-trees':
5938
5499
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5939
5500
directory, True)
5940
elif repository_trees == 'with-no-trees':
5501
elif target_type == 'with-no-trees':
5941
5502
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5942
5503
directory, False)
5944
reconfiguration.apply(force)
5945
reconfiguration = None
5504
reconfiguration.apply(force)
5948
5507
class cmd_switch(Command):
5981
5539
def run(self, to_location=None, force=False, create_branch=False,
5982
revision=None, directory=u'.'):
5983
5541
from bzrlib import switch
5984
tree_location = directory
5985
5543
revision = _get_one_revision('switch', revision)
5986
5544
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5987
5545
if to_location is None:
5988
5546
if revision is None:
5989
raise errors.BzrCommandError(gettext('You must supply either a'
5990
' revision or a location'))
5991
to_location = tree_location
5547
raise errors.BzrCommandError('You must supply either a'
5548
' revision or a location')
5993
5551
branch = control_dir.open_branch()
5994
5552
had_explicit_nick = branch.get_config().has_explicit_nickname()
6132
tree, file_list = WorkingTree.open_containing_paths(file_list,
5690
tree, file_list = tree_files(file_list, apply_view=False)
6134
5691
current_view, view_dict = tree.views.get_view_info()
6135
5692
if name is None:
6136
5693
name = current_view
6139
raise errors.BzrCommandError(gettext(
6140
"Both --delete and a file list specified"))
5696
raise errors.BzrCommandError(
5697
"Both --delete and a file list specified")
6142
raise errors.BzrCommandError(gettext(
6143
"Both --delete and --switch specified"))
5699
raise errors.BzrCommandError(
5700
"Both --delete and --switch specified")
6145
5702
tree.views.set_view_info(None, {})
6146
self.outf.write(gettext("Deleted all views.\n"))
5703
self.outf.write("Deleted all views.\n")
6147
5704
elif name is None:
6148
raise errors.BzrCommandError(gettext("No current view to delete"))
5705
raise errors.BzrCommandError("No current view to delete")
6150
5707
tree.views.delete_view(name)
6151
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5708
self.outf.write("Deleted '%s' view.\n" % name)
6154
raise errors.BzrCommandError(gettext(
6155
"Both --switch and a file list specified"))
5711
raise errors.BzrCommandError(
5712
"Both --switch and a file list specified")
6157
raise errors.BzrCommandError(gettext(
6158
"Both --switch and --all specified"))
5714
raise errors.BzrCommandError(
5715
"Both --switch and --all specified")
6159
5716
elif switch == 'off':
6160
5717
if current_view is None:
6161
raise errors.BzrCommandError(gettext("No current view to disable"))
5718
raise errors.BzrCommandError("No current view to disable")
6162
5719
tree.views.set_view_info(None, view_dict)
6163
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5720
self.outf.write("Disabled '%s' view.\n" % (current_view))
6165
5722
tree.views.set_view_info(switch, view_dict)
6166
5723
view_str = views.view_display_str(tree.views.lookup_view())
6167
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5724
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6170
self.outf.write(gettext('Views defined:\n'))
5727
self.outf.write('Views defined:\n')
6171
5728
for view in sorted(view_dict):
6172
5729
if view == current_view:
6176
5733
view_str = views.view_display_str(view_dict[view])
6177
5734
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
6179
self.outf.write(gettext('No views defined.\n'))
5736
self.outf.write('No views defined.\n')
6180
5737
elif file_list:
6181
5738
if name is None:
6182
5739
# No name given and no current view set
6184
5741
elif name == 'off':
6185
raise errors.BzrCommandError(gettext(
6186
"Cannot change the 'off' pseudo view"))
5742
raise errors.BzrCommandError(
5743
"Cannot change the 'off' pseudo view")
6187
5744
tree.views.set_view(name, sorted(file_list))
6188
5745
view_str = views.view_display_str(tree.views.lookup_view())
6189
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5746
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6191
5748
# list the files
6192
5749
if name is None:
6193
5750
# No name given and no current view set
6194
self.outf.write(gettext('No current view.\n'))
5751
self.outf.write('No current view.\n')
6196
5753
view_str = views.view_display_str(tree.views.lookup_view(name))
6197
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5754
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6200
5757
class cmd_hooks(Command):
6266
5823
You can put multiple items on the shelf, and by default, 'unshelve' will
6267
5824
restore the most recently shelved changes.
6269
For complicated changes, it is possible to edit the changes in a separate
6270
editor program to decide what the file remaining in the working copy
6271
should look like. To do this, add the configuration option
6273
change_editor = PROGRAM @new_path @old_path
6275
where @new_path is replaced with the path of the new version of the
6276
file and @old_path is replaced with the path of the old version of
6277
the file. The PROGRAM should save the new file with the desired
6278
contents of the file in the working tree.
6282
5827
takes_args = ['file*']
6284
5829
takes_options = [
6287
5831
Option('all', help='Shelve all changes.'),
6294
5838
Option('destroy',
6295
5839
help='Destroy removed changes instead of shelving them.'),
6297
_see_also = ['unshelve', 'configuration']
5841
_see_also = ['unshelve']
6299
5843
def run(self, revision=None, all=False, file_list=None, message=None,
6300
writer=None, list=False, destroy=False, directory=None):
5844
writer=None, list=False, destroy=False):
6302
return self.run_for_list(directory=directory)
5846
return self.run_for_list()
6303
5847
from bzrlib.shelf_ui import Shelver
6304
5848
if writer is None:
6305
5849
writer = bzrlib.option.diff_writer_registry.get()
6307
5851
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
6308
file_list, message, destroy=destroy, directory=directory)
5852
file_list, message, destroy=destroy)
6313
5857
except errors.UserAbort:
6316
def run_for_list(self, directory=None):
6317
if directory is None:
6319
tree = WorkingTree.open_containing(directory)[0]
5860
def run_for_list(self):
5861
tree = WorkingTree.open_containing('.')[0]
6320
5862
self.add_cleanup(tree.lock_read().unlock)
6321
5863
manager = tree.get_shelf_manager()
6322
5864
shelves = manager.active_shelves()
6323
5865
if len(shelves) == 0:
6324
note(gettext('No shelved changes.'))
5866
note('No shelved changes.')
6326
5868
for shelf_id in reversed(shelves):
6327
5869
message = manager.get_metadata(shelf_id).get('message')
6382
5923
takes_options = ['directory',
6383
5924
Option('ignored', help='Delete all ignored files.'),
6384
Option('detritus', help='Delete conflict files, merge and revert'
5925
Option('detritus', help='Delete conflict files, merge'
6385
5926
' backups, and failed selftest dirs.'),
6386
5927
Option('unknown',
6387
5928
help='Delete files unknown to bzr (default).'),
6446
5987
self.outf.write('%s %s\n' % (path, location))
6449
class cmd_export_pot(Command):
6450
__doc__ = """Export command helps and error messages in po format."""
6455
from bzrlib.export_pot import export_pot
6456
export_pot(self.outf)
6459
5990
def _register_lazy_builtins():
6460
5991
# register lazy builtins from other modules; called at startup and should
6461
5992
# be only called once.
6462
5993
for (name, aliases, module_name) in [
6463
5994
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6464
('cmd_config', [], 'bzrlib.config'),
6465
5995
('cmd_dpush', [], 'bzrlib.foreign'),
6466
5996
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6467
5997
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6468
5998
('cmd_conflicts', [], 'bzrlib.conflicts'),
6469
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6470
('cmd_verify_signatures', [],
6471
'bzrlib.commit_signature_commands'),
6472
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
5999
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6474
6001
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
