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)))
78
82
def tree_files(file_list, default_branch=u'.', canonicalize=True,
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]))
84
return internal_tree_files(file_list, default_branch, canonicalize,
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)))
155
156
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
157
apply_view=True):
157
158
"""Convert command-line paths to a WorkingTree and relative paths.
160
Deprecated: use WorkingTree.open_containing_paths instead.
159
162
This is typically used for command-line processors that take one or
160
163
more filenames, and infer the workingtree that contains them.
172
175
:return: workingtree, [relative_paths]
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
177
return WorkingTree.open_containing_paths(
178
file_list, default_directory='.',
223
183
def _get_view_info_for_change_reporter(tree):
195
def _open_directory_or_containing_tree_or_branch(filename, directory):
196
"""Open the tree or branch containing the specified file, unless
197
the --directory option is used to specify a different branch."""
198
if directory is not None:
199
return (None, Branch.open(directory), filename)
200
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
235
203
# TODO: Make sure no commands unconditionally use the working directory as a
236
204
# branch. If a filename argument is used, the first of them should be used to
237
205
# specify the branch. (Perhaps this can be factored out into some kind of
266
234
Not versioned and not matching an ignore pattern.
268
Additionally for directories, symlinks and files with an executable
269
bit, Bazaar indicates their type using a trailing character: '/', '@'
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.
272
241
To see ignored files use 'bzr ignored'. For details on the
273
242
changes to file texts, use 'bzr diff'.
286
255
To skip the display of pending merge information altogether, use
287
256
the no-pending option or specify a file/directory.
289
If a revision argument is given, the status is calculated against
290
that revision, or between two revisions if two are provided.
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'.
293
266
# TODO: --no-recurse, --recurse options
310
286
def run(self, show_ids=False, file_list=None, revision=None, short=False,
311
versioned=False, no_pending=False, verbose=False):
287
versioned=False, no_pending=False, verbose=False,
312
289
from bzrlib.status import show_tree_status
314
291
if revision and len(revision) > 2:
315
raise errors.BzrCommandError('bzr status --revision takes exactly'
316
' one or two revision specifiers')
292
raise errors.BzrCommandError(gettext('bzr status --revision takes exactly'
293
' one or two revision specifiers'))
318
tree, relfile_list = tree_files(file_list)
295
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
319
296
# Avoid asking for specific files when that is not needed.
320
297
if relfile_list == ['']:
321
298
relfile_list = None
328
305
show_tree_status(tree, show_ids=show_ids,
329
306
specific_files=relfile_list, revision=revision,
330
307
to_file=self.outf, short=short, versioned=versioned,
331
show_pending=(not no_pending), verbose=verbose)
308
show_pending=(not no_pending), verbose=verbose,
309
classify=not no_classify)
334
312
class cmd_cat_revision(Command):
353
331
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
334
def run(self, revision_id=None, revision=None, directory=u'.'):
357
335
if revision_id is not None and revision is not None:
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
336
raise errors.BzrCommandError(gettext('You can only supply one of'
337
' revision_id or --revision'))
360
338
if revision_id is None and revision is None:
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
339
raise errors.BzrCommandError(gettext('You must supply either'
340
' --revision or a revision_id'))
342
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
365
344
revisions = b.repository.revisions
366
345
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
346
raise errors.BzrCommandError(gettext('Repository %r does not support '
347
'access to raw revision texts'))
370
349
b.repository.lock_read()
376
355
self.print_revision(revisions, revision_id)
377
356
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
357
msg = gettext("The repository {0} contains no revision {1}.").format(
379
358
b.repository.base, revision_id)
380
359
raise errors.BzrCommandError(msg)
381
360
elif revision is not None:
382
361
for rev in revision:
384
363
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
364
gettext('You cannot specify a NULL revision.'))
386
365
rev_id = rev.as_revision_id(b)
387
366
self.print_revision(revisions, rev_id)
497
479
working = d.open_workingtree()
498
480
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
481
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
482
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
483
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
484
" of a remote path"))
504
486
if (working.has_changes()):
505
487
raise errors.UncommittedChanges(working)
488
if working.get_shelf_manager().last_shelf() is not None:
489
raise errors.ShelvedChanges(working)
507
491
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
492
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
493
" from a lightweight checkout"))
511
495
d.destroy_workingtree()
498
class cmd_repair_workingtree(Command):
499
__doc__ = """Reset the working tree state file.
501
This is not meant to be used normally, but more as a way to recover from
502
filesystem corruption, etc. This rebuilds the working inventory back to a
503
'known good' state. Any new modifications (adding a file, renaming, etc)
504
will be lost, though modified files will still be detected as such.
506
Most users will want something more like "bzr revert" or "bzr update"
507
unless the state file has become corrupted.
509
By default this attempts to recover the current state by looking at the
510
headers of the state file. If the state file is too corrupted to even do
511
that, you can supply --revision to force the state of the tree.
514
takes_options = ['revision', 'directory',
516
help='Reset the tree even if it doesn\'t appear to be'
521
def run(self, revision=None, directory='.', force=False):
522
tree, _ = WorkingTree.open_containing(directory)
523
self.add_cleanup(tree.lock_tree_write().unlock)
527
except errors.BzrError:
528
pass # There seems to be a real error here, so we'll reset
531
raise errors.BzrCommandError(gettext(
532
'The tree does not appear to be corrupt. You probably'
533
' want "bzr revert" instead. Use "--force" if you are'
534
' sure you want to reset the working tree.'))
538
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
540
tree.reset_state(revision_ids)
541
except errors.BzrError, e:
542
if revision_ids is None:
543
extra = (gettext(', the header appears corrupt, try passing -r -1'
544
' to set the state to the last commit'))
547
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
550
class cmd_revno(Command):
515
551
__doc__ = """Show current revision number.
677
713
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
678
714
to_file=self.outf, should_print=(not is_quiet()))
680
action = bzrlib.add.AddAction(to_file=self.outf,
716
action = bzrlib.add.AddWithSkipLargeAction(to_file=self.outf,
681
717
should_print=(not is_quiet()))
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
720
self.add_cleanup(base_tree.lock_read().unlock)
686
721
tree, file_list = tree_files_for_add(file_list)
687
722
added, ignored = tree.smart_add(file_list, not
688
723
no_recurse, action=action, save=not dry_run)
757
793
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
758
794
if kind and kind not in ['file', 'directory', 'symlink']:
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
795
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
761
797
revision = _get_one_revision('inventory', revision)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
798
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
799
self.add_cleanup(work_tree.lock_read().unlock)
765
800
if revision is not None:
766
801
tree = revision.as_tree(work_tree.branch)
768
803
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
804
self.add_cleanup(tree.lock_read().unlock)
828
863
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
865
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
866
if names_list is None:
833
868
if len(names_list) < 2:
834
raise errors.BzrCommandError("missing file argument")
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
869
raise errors.BzrCommandError(gettext("missing file argument"))
870
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
871
self.add_cleanup(tree.lock_tree_write().unlock)
838
872
self._run(tree, names_list, rel_names, after)
840
874
def run_auto(self, names_list, after, dry_run):
841
875
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
876
raise errors.BzrCommandError(gettext('Only one path may be specified to'
845
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
879
raise errors.BzrCommandError(gettext('--after cannot be specified with'
881
work_tree, file_list = WorkingTree.open_containing_paths(
882
names_list, default_directory='.')
883
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
884
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
886
def _run(self, tree, names_list, rel_names, after):
946
980
match the remote one, use pull --overwrite. This will work even if the two
947
981
branches have diverged.
949
If there is no default location set, the first pull will set it. After
950
that, you can omit the location to use the default. To change the
951
default, use --remember. The value will only be saved if the remote
952
location can be accessed.
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.
954
988
Note: The location can be specified either in the form of a branch,
955
989
or in the form of a path to a file containing a merge directive generated
960
994
takes_options = ['remember', 'overwrite', 'revision',
961
995
custom_help('verbose',
962
996
help='Show logs of pulled revisions.'),
997
custom_help('directory',
964
998
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
999
'rather than the one containing the working directory.'),
970
1001
help="Perform a local pull in a bound "
971
1002
"branch. Local pulls are not applied to "
972
1003
"the master branch."
1006
help="Show base revision text in conflicts.")
975
1008
takes_args = ['location?']
976
1009
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1011
def run(self, location=None, remember=None, overwrite=False,
979
1012
revision=None, verbose=False,
980
directory=None, local=False):
1013
directory=None, local=False,
981
1015
# FIXME: too much stuff is in the command class
982
1016
revision_id = None
983
1017
mergeable = None
987
1021
tree_to = WorkingTree.open_containing(directory)[0]
988
1022
branch_to = tree_to.branch
990
self.add_cleanup(tree_to.unlock)
1023
self.add_cleanup(tree_to.lock_write().unlock)
991
1024
except errors.NoWorkingTree:
993
1026
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
1027
self.add_cleanup(branch_to.lock_write().unlock)
1029
if tree_to is None and show_base:
1030
raise errors.BzrCommandError(gettext("Need working tree for --show-base."))
997
1032
if local and not branch_to.get_bound_location():
998
1033
raise errors.LocalRequiresBoundBranch()
1008
1043
stored_loc = branch_to.get_parent()
1009
1044
if location is None:
1010
1045
if stored_loc is None:
1011
raise errors.BzrCommandError("No pull location known or"
1046
raise errors.BzrCommandError(gettext("No pull location known or"
1014
1049
display_url = urlutils.unescape_for_display(stored_loc,
1015
1050
self.outf.encoding)
1016
1051
if not is_quiet():
1017
self.outf.write("Using saved parent location: %s\n" % display_url)
1052
self.outf.write(gettext("Using saved parent location: %s\n") % display_url)
1018
1053
location = stored_loc
1020
1055
revision = _get_one_revision('pull', revision)
1021
1056
if mergeable is not None:
1022
1057
if revision is not None:
1023
raise errors.BzrCommandError(
1024
'Cannot use -r with merge directives or bundles')
1058
raise errors.BzrCommandError(gettext(
1059
'Cannot use -r with merge directives or bundles'))
1025
1060
mergeable.install_revisions(branch_to.repository)
1026
1061
base_revision_id, revision_id, verified = \
1027
1062
mergeable.get_merge_request(branch_to.repository)
1077
1116
do a merge (see bzr help merge) from the other branch, and commit that.
1078
1117
After that you will be able to do a push without '--overwrite'.
1080
If there is no default push location set, the first push will set it.
1081
After that, you can omit the location to use the default. To change the
1082
default, use --remember. The value will only be saved if the remote
1083
location can be accessed.
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.
1086
1125
_see_also = ['pull', 'update', 'working-trees']
1088
1127
Option('create-prefix',
1089
1128
help='Create the path leading up to the branch '
1090
1129
'if it does not already exist.'),
1130
custom_help('directory',
1092
1131
help='Branch to push from, '
1093
'rather than the one containing the working directory.',
1132
'rather than the one containing the working directory.'),
1097
1133
Option('use-existing-dir',
1098
1134
help='By default push will fail if the target'
1099
1135
' directory exists, but does not already'
1110
1146
Option('strict',
1111
1147
help='Refuse to push if there are uncommitted changes in'
1112
1148
' the working tree, --no-strict disables the check.'),
1150
help="Don't populate the working tree, even for protocols"
1151
" that support it."),
1114
1153
takes_args = ['location?']
1115
1154
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1156
def run(self, location=None, remember=None, overwrite=False,
1118
1157
create_prefix=False, verbose=False, revision=None,
1119
1158
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1159
stacked=False, strict=None, no_tree=False):
1121
1160
from bzrlib.push import _show_push_branch
1123
1162
if directory is None:
1151
1190
# error by the feedback given to them. RBC 20080227.
1152
1191
stacked_on = parent_url
1153
1192
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1193
raise errors.BzrCommandError(gettext(
1194
"Could not determine branch to refer to."))
1157
1196
# Get the destination location
1158
1197
if location is None:
1159
1198
stored_loc = br_from.get_push_location()
1160
1199
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1200
raise errors.BzrCommandError(gettext(
1201
"No push location known or specified."))
1164
1203
display_url = urlutils.unescape_for_display(stored_loc,
1165
1204
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1205
note(gettext("Using saved push location: %s") % display_url)
1167
1206
location = stored_loc
1169
1208
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1209
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1210
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1211
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1214
class cmd_branch(Command):
1185
1224
To retrieve the branch as of a particular revision, supply the --revision
1186
1225
parameter, as in "branch foo/bar -r 5".
1227
The synonyms 'clone' and 'get' for this command are deprecated.
1189
1230
_see_also = ['checkout']
1190
1231
takes_args = ['from_location', 'to_location?']
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
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."),
1193
1236
Option('no-tree',
1194
1237
help="Create a branch without a working-tree."),
1195
1238
Option('switch',
1214
1257
def run(self, from_location, to_location=None, revision=None,
1215
1258
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1259
use_existing_dir=False, switch=False, bind=False,
1217
1261
from bzrlib import switch as _mod_switch
1218
1262
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')
1219
1269
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)
1221
1278
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1279
self.add_cleanup(br_from.lock_read().unlock)
1224
1280
if revision is not None:
1225
1281
revision_id = revision.as_revision_id(br_from)
1259
1315
branch = dir.open_branch()
1260
1316
except errors.NoSuchRevision:
1261
1317
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1318
msg = gettext("The branch {0} has no revision {1}.").format(
1319
from_location, revision)
1264
1320
raise errors.BzrCommandError(msg)
1265
1321
_merge_tags_if_possible(br_from, branch)
1266
1322
# If the source branch is stacked, the new branch may
1267
1323
# be stacked whether we asked for that explicitly or not.
1268
1324
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1326
note(gettext('Created new stacked branch referring to %s.') %
1271
1327
branch.get_stacked_on_url())
1272
1328
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
1329
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1330
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1332
# Bind to the parent
1277
1333
parent_branch = Branch.open(from_location)
1278
1334
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1335
note(gettext('New branch bound to %s') % from_location)
1281
1337
# Switch to the new branch
1282
1338
wt, _ = WorkingTree.open_containing('.')
1283
1339
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1340
note(gettext('Switched to branch: %s'),
1285
1341
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 location.
1350
takes_args = ['location?']
1352
def run(self, location="."):
1353
dir = bzrdir.BzrDir.open_containing(location)[0]
1354
for branch in dir.list_branches():
1355
if branch.name is None:
1356
self.outf.write(gettext(" (default)\n"))
1358
self.outf.write(" %s\n" % branch.name.encode(self.outf.encoding))
1288
1361
class cmd_checkout(Command):
1289
1362
__doc__ = """Create a new checkout of an existing branch.
1331
1404
to_location = branch_location
1332
1405
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1333
1406
branch_location)
1407
if not (hardlink or files_from):
1408
# accelerator_tree is usually slower because you have to read N
1409
# files (no readahead, lots of seeks, etc), but allow the user to
1410
# explicitly request it
1411
accelerator_tree = None
1334
1412
revision = _get_one_revision('checkout', revision)
1335
if files_from is not None:
1413
if files_from is not None and files_from != branch_location:
1336
1414
accelerator_tree = WorkingTree.open(files_from)
1337
1415
if revision is not None:
1338
1416
revision_id = revision.as_revision_id(source)
1396
1472
If you want to discard your local changes, you can just do a
1397
1473
'bzr revert' instead of 'bzr commit' after the update.
1475
If you want to restore a file that has been removed locally, use
1476
'bzr revert' instead of 'bzr update'.
1399
1478
If the tree's branch is bound to a master branch, it will also update
1400
1479
the branch from the master.
1403
1482
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1483
takes_args = ['dir?']
1405
takes_options = ['revision']
1484
takes_options = ['revision',
1486
help="Show base revision text in conflicts."),
1406
1488
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1490
def run(self, dir='.', revision=None, show_base=None):
1409
1491
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1492
raise errors.BzrCommandError(gettext(
1493
"bzr update --revision takes exactly one revision"))
1412
1494
tree = WorkingTree.open_containing(dir)[0]
1413
1495
branch = tree.branch
1414
1496
possible_transports = []
1415
1497
master = branch.get_master_branch(
1416
1498
possible_transports=possible_transports)
1417
1499
if master is not None:
1419
1500
branch_location = master.base
1503
branch_location = tree.branch.base
1421
1504
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1505
self.add_cleanup(tree.unlock)
1424
1506
# get rid of the final '/' and be ready for display
1425
1507
branch_location = urlutils.unescape_for_display(
1439
1521
revision_id = branch.last_revision()
1440
1522
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1441
1523
revno = branch.revision_id_to_dotted_revno(revision_id)
1442
note("Tree is up to date at revision %s of branch %s" %
1443
('.'.join(map(str, revno)), branch_location))
1524
note(gettext("Tree is up to date at revision {0} of branch {1}"
1525
).format('.'.join(map(str, revno)), branch_location))
1445
1527
view_info = _get_view_info_for_change_reporter(tree)
1446
1528
change_reporter = delta._ChangeReporter(
1451
1533
change_reporter,
1452
1534
possible_transports=possible_transports,
1453
1535
revision=revision_id,
1537
show_base=show_base)
1455
1538
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1539
raise errors.BzrCommandError(gettext(
1457
1540
"branch has no revision %s\n"
1458
1541
"bzr update --revision only works"
1459
" for a revision in the branch history"
1542
" for a revision in the branch history")
1460
1543
% (e.revision))
1461
1544
revno = tree.branch.revision_id_to_dotted_revno(
1462
1545
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1546
note(gettext('Updated to revision {0} of branch {1}').format(
1547
'.'.join(map(str, revno)), branch_location))
1465
1548
parent_ids = tree.get_parent_ids()
1466
1549
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1550
note(gettext('Your local commits will now show as pending merges with '
1551
"'bzr status', and can be committed with 'bzr commit'."))
1469
1552
if conflicts != 0:
1519
1602
class cmd_remove(Command):
1520
1603
__doc__ = """Remove files or directories.
1522
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
them if they can easily be recovered using revert. If no options or
1524
parameters are given bzr will scan for files that are being tracked by bzr
1525
but missing in your tree and stop tracking them for you.
1605
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1606
delete them if they can easily be recovered using revert otherwise they
1607
will be backed up (adding an extention of the form .~#~). If no options or
1608
parameters are given Bazaar will scan for files that are being tracked by
1609
Bazaar but missing in your tree and stop tracking them for you.
1527
1611
takes_args = ['file*']
1528
1612
takes_options = ['verbose',
1530
1614
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1615
'The file deletion mode to be used.',
1532
1616
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1617
safe='Backup changed files (default).',
1535
1618
keep='Delete from bzr but leave the working copy.',
1619
no_backup='Don\'t backup changed files.',
1536
1620
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1621
'recovered and even if they are non-empty directories. '
1622
'(deprecated, use no-backup)')]
1538
1623
aliases = ['rm', 'del']
1539
1624
encoding_type = 'replace'
1541
1626
def run(self, file_list, verbose=False, new=False,
1542
1627
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1628
if file_deletion_strategy == 'force':
1629
note(gettext("(The --force option is deprecated, rather use --no-backup "
1631
file_deletion_strategy = 'no-backup'
1633
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1635
if file_list is not None:
1546
1636
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1638
self.add_cleanup(tree.lock_write().unlock)
1550
1639
# Heuristics should probably all move into tree.remove_smart or
1636
1725
_see_also = ['check']
1637
1726
takes_args = ['branch?']
1728
Option('canonicalize-chks',
1729
help='Make sure CHKs are in canonical form (repairs '
1639
def run(self, branch="."):
1734
def run(self, branch=".", canonicalize_chks=False):
1640
1735
from bzrlib.reconcile import reconcile
1641
1736
dir = bzrdir.BzrDir.open(branch)
1737
reconcile(dir, canonicalize_chks=canonicalize_chks)
1645
1740
class cmd_revision_history(Command):
1678
1773
last_revision = wt.last_revision()
1680
revision_ids = b.repository.get_ancestry(last_revision)
1682
for revision_id in revision_ids:
1775
self.add_cleanup(b.repository.lock_read().unlock)
1776
graph = b.repository.get_graph()
1777
revisions = [revid for revid, parents in
1778
graph.iter_ancestry([last_revision])]
1779
for revision_id in reversed(revisions):
1780
if _mod_revision.is_null(revision_id):
1683
1782
self.outf.write(revision_id + '\n')
1723
1822
Option('append-revisions-only',
1724
1823
help='Never change revnos or the existing log.'
1725
' Append revisions to it only.')
1824
' Append revisions to it only.'),
1826
'Create a branch without a working tree.')
1727
1828
def run(self, location=None, format=None, append_revisions_only=False,
1728
create_prefix=False):
1829
create_prefix=False, no_tree=False):
1729
1830
if format is None:
1730
1831
format = bzrdir.format_registry.make_bzrdir('default')
1731
1832
if location is None:
1765
1871
raise errors.BranchExistsWithoutWorkingTree(location)
1766
1872
raise errors.AlreadyBranchError(location)
1767
1873
branch = a_bzrdir.create_branch()
1768
a_bzrdir.create_workingtree()
1875
a_bzrdir.create_workingtree()
1769
1876
if append_revisions_only:
1771
1878
branch.set_append_revisions_only(True)
1772
1879
except errors.UpgradeRequired:
1773
raise errors.BzrCommandError('This branch format cannot be set'
1774
' to append-revisions-only. Try --default.')
1880
raise errors.BzrCommandError(gettext('This branch format cannot be set'
1881
' to append-revisions-only. Try --default.'))
1775
1882
if not is_quiet():
1776
1883
from bzrlib.info import describe_layout, describe_format
1781
1888
repository = branch.repository
1782
1889
layout = describe_layout(repository, branch, tree).lower()
1783
1890
format = describe_format(a_bzrdir, repository, branch, tree)
1784
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
1891
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1785
1893
if repository.is_shared():
1786
1894
#XXX: maybe this can be refactored into transport.path_or_url()
1787
1895
url = repository.bzrdir.root_transport.external_url()
1969
2094
elif ':' in prefix:
1970
2095
old_label, new_label = prefix.split(":")
1972
raise errors.BzrCommandError(
2097
raise errors.BzrCommandError(gettext(
1973
2098
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2099
' (eg "old/:new/")'))
1976
2101
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2102
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2103
' one or two revision specifiers'))
1980
2105
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2106
raise errors.BzrCommandError(gettext(
2107
'{0} and {1} are mutually exclusive').format(
2108
'--using', '--format'))
1984
2110
(old_tree, new_tree,
1985
2111
old_branch, new_branch,
1986
2112
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2113
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2114
# GNU diff on Windows uses ANSI encoding for filenames
2115
path_encoding = osutils.get_diff_header_encoding()
1988
2116
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2117
specific_files=specific_files,
1990
2118
external_diff_options=diff_options,
1991
2119
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2120
extra_trees=extra_trees,
2121
path_encoding=path_encoding,
1993
2123
format_cls=format)
2003
2133
# level of effort but possibly much less IO. (Or possibly not,
2004
2134
# if the directories are very large...)
2005
2135
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
2136
takes_options = ['directory', 'show-ids']
2008
2138
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2139
def run(self, show_ids=False, directory=u'.'):
2140
tree = WorkingTree.open_containing(directory)[0]
2141
self.add_cleanup(tree.lock_read().unlock)
2013
2142
old = tree.basis_tree()
2015
self.add_cleanup(old.unlock)
2143
self.add_cleanup(old.lock_read().unlock)
2016
2144
for path, ie in old.inventory.iter_entries():
2017
2145
if not tree.has_id(ie.file_id):
2018
2146
self.outf.write(path)
2030
2158
_see_also = ['status', 'ls']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2159
takes_options = ['directory', 'null']
2037
2161
@display_command
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2162
def run(self, null=False, directory=u'.'):
2163
tree = WorkingTree.open_containing(directory)[0]
2164
self.add_cleanup(tree.lock_read().unlock)
2040
2165
td = tree.changes_from(tree.basis_tree())
2041
2167
for path, id, kind, text_modified, meta_modified in td.modified:
2043
2169
self.outf.write(path + '\0')
2053
2179
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2180
takes_options = ['directory', 'null']
2060
2182
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2183
def run(self, null=False, directory=u'.'):
2184
wt = WorkingTree.open_containing(directory)[0]
2185
self.add_cleanup(wt.lock_read().unlock)
2065
2186
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2187
self.add_cleanup(basis.lock_read().unlock)
2068
2188
basis_inv = basis.inventory
2069
2189
inv = wt.inventory
2070
2190
for file_id in inv:
2071
if file_id in basis_inv:
2191
if basis_inv.has_id(file_id):
2073
2193
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2195
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2196
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2199
self.outf.write(path + '\0')
2279
2402
help='Show just the specified revision.'
2280
2403
' See also "help revisionspec".'),
2405
RegistryOption('authors',
2406
'What names to list as authors - first, all or committer.',
2408
lazy_registry=('bzrlib.log', 'author_list_registry'),
2282
2410
Option('levels',
2283
2411
short_name='n',
2284
2412
help='Number of levels to display - 0 for all, 1 for flat.',
2286
2414
type=_parse_levels),
2287
2415
Option('message',
2289
2416
help='Show revisions whose message matches this '
2290
2417
'regular expression.',
2292
2420
Option('limit',
2293
2421
short_name='l',
2294
2422
help='Limit the output to the first N revisions.',
2297
2425
Option('show-diff',
2298
2426
short_name='p',
2299
2427
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2428
Option('include-merged',
2301
2429
help='Show merged revisions like --levels 0 does.'),
2430
Option('include-merges', hidden=True,
2431
help='Historical alias for --include-merged.'),
2432
Option('omit-merges',
2433
help='Do not report commits with more than one parent.'),
2302
2434
Option('exclude-common-ancestry',
2303
2435
help='Display only the revisions that are not part'
2304
2436
' of both ancestries (require -rX..Y)'
2438
Option('signatures',
2439
help='Show digital signature validity'),
2442
help='Show revisions whose properties match this '
2445
ListOption('match-message',
2446
help='Show revisions whose message matches this '
2449
ListOption('match-committer',
2450
help='Show revisions whose committer matches this '
2453
ListOption('match-author',
2454
help='Show revisions whose authors match this '
2457
ListOption('match-bugs',
2458
help='Show revisions whose bugs match this '
2307
2462
encoding_type = 'replace'
2327
2491
_get_info_for_log_files,
2329
2493
direction = (forward and 'forward') or 'reverse'
2494
if symbol_versioning.deprecated_passed(include_merges):
2495
ui.ui_factory.show_user_warning(
2496
'deprecated_command_option',
2497
deprecated_name='--include-merges',
2498
recommended_name='--include-merged',
2499
deprecated_in_version='2.5',
2500
command=self.invoked_as)
2501
if include_merged is None:
2502
include_merged = include_merges
2504
raise errors.BzrCommandError(gettext(
2505
'{0} and {1} are mutually exclusive').format(
2506
'--include-merges', '--include-merged'))
2507
if include_merged is None:
2508
include_merged = False
2330
2509
if (exclude_common_ancestry
2331
2510
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2511
raise errors.BzrCommandError(gettext(
2512
'--exclude-common-ancestry requires -r with two revisions'))
2335
2514
if levels is None:
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2517
raise errors.BzrCommandError(gettext(
2518
'{0} and {1} are mutually exclusive').format(
2519
'--levels', '--include-merged'))
2341
2521
if change is not None:
2342
2522
if len(change) > 1:
2343
2523
raise errors.RangeInChangeOption()
2344
2524
if revision is not None:
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2525
raise errors.BzrCommandError(gettext(
2526
'{0} and {1} are mutually exclusive').format(
2527
'--revision', '--change'))
2348
2529
revision = change
2353
2534
# find the file ids to log and check for directory filtering
2354
2535
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2536
revision, file_list, self.add_cleanup)
2357
2537
for relpath, file_id, kind in file_info_list:
2358
2538
if file_id is None:
2359
raise errors.BzrCommandError(
2360
"Path unknown at end or start of revision range: %s" %
2539
raise errors.BzrCommandError(gettext(
2540
"Path unknown at end or start of revision range: %s") %
2362
2542
# If the relpath is the top of the tree, we log everything
2363
2543
if relpath == '':
2378
2558
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
2559
b = dir.open_branch()
2381
self.add_cleanup(b.unlock)
2560
self.add_cleanup(b.lock_read().unlock)
2382
2561
rev1, rev2 = _get_revision_range(revision, b, self.name())
2563
if b.get_config().validate_signatures_in_log():
2567
if not gpg.GPGStrategy.verify_signatures_available():
2568
raise errors.GpgmeNotInstalled(None)
2384
2570
# Decide on the type of delta & diff filtering to use
2385
2571
# TODO: add an --all-files option to make this configurable & consistent
2386
2572
if not verbose:
2430
2629
start_revision=rev1, end_revision=rev2, limit=limit,
2431
2630
message_search=message, delta_type=delta_type,
2432
2631
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2433
exclude_common_ancestry=exclude_common_ancestry,
2632
exclude_common_ancestry=exclude_common_ancestry, match=match_dict,
2633
signature=signatures, omit_merges=omit_merges,
2435
2635
Logger(b, rqst).show(lf)
2453
2653
# b is taken from revision[0].get_branch(), and
2454
2654
# show_log will use its revision_history. Having
2455
2655
# different branches will lead to weird behaviors.
2456
raise errors.BzrCommandError(
2656
raise errors.BzrCommandError(gettext(
2457
2657
"bzr %s doesn't accept two revisions in different"
2458
" branches." % command_name)
2658
" branches.") % command_name)
2459
2659
if start_spec.spec is None:
2460
2660
# Avoid loading all the history.
2461
2661
rev1 = RevisionInfo(branch, None, None)
2528
2727
help='Recurse into subdirectories.'),
2529
2728
Option('from-root',
2530
2729
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2730
Option('unknown', short_name='u',
2731
help='Print unknown files.'),
2532
2732
Option('versioned', help='Print versioned files.',
2533
2733
short_name='V'),
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2734
Option('ignored', short_name='i',
2735
help='Print ignored files.'),
2736
Option('kind', short_name='k',
2539
2737
help='List entries of a particular kind: file, directory, symlink.',
2543
2743
@display_command
2544
2744
def run(self, revision=None, verbose=False,
2545
2745
recursive=False, from_root=False,
2546
2746
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2747
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2749
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2750
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
2752
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2753
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
2754
all = not (unknown or versioned or ignored)
2556
2756
selection = {'I':ignored, '?':unknown, 'V':versioned}
2583
2783
apply_view = True
2584
2784
view_str = views.view_display_str(view_files)
2585
note("Ignoring files outside view. View is %s" % view_str)
2785
note(gettext("Ignoring files outside view. View is %s") % view_str)
2588
self.add_cleanup(tree.unlock)
2787
self.add_cleanup(tree.lock_read().unlock)
2589
2788
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
2789
from_dir=relpath, recursive=recursive):
2591
2790
# Apply additional masking
2713
2922
_see_also = ['status', 'ignored', 'patterns']
2714
2923
takes_args = ['name_pattern*']
2924
takes_options = ['directory',
2716
2925
Option('default-rules',
2717
2926
help='Display the default ignore rules that bzr uses.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2929
def run(self, name_pattern_list=None, default_rules=None,
2721
2931
from bzrlib import ignores
2722
2932
if default_rules is not None:
2723
2933
# dump the default rules and exit
2725
2935
self.outf.write("%s\n" % pattern)
2727
2937
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2938
raise errors.BzrCommandError(gettext("ignore requires at least one "
2939
"NAME_PATTERN or --default-rules."))
2730
2940
name_pattern_list = [globbing.normalize_pattern(p)
2731
2941
for p in name_pattern_list]
2943
bad_patterns_count = 0
2944
for p in name_pattern_list:
2945
if not globbing.Globster.is_pattern_valid(p):
2946
bad_patterns_count += 1
2947
bad_patterns += ('\n %s' % p)
2949
msg = (ngettext('Invalid ignore pattern found. %s',
2950
'Invalid ignore patterns found. %s',
2951
bad_patterns_count) % bad_patterns)
2952
ui.ui_factory.show_error(msg)
2953
raise errors.InvalidPattern('')
2732
2954
for name_pattern in name_pattern_list:
2733
2955
if (name_pattern[0] == '/' or
2734
2956
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
raise errors.BzrCommandError(
2736
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
2957
raise errors.BzrCommandError(gettext(
2958
"NAME_PATTERN should not be an absolute path"))
2959
tree, relpath = WorkingTree.open_containing(directory)
2738
2960
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
2961
ignored = globbing.Globster(name_pattern_list)
2963
self.add_cleanup(tree.lock_read().unlock)
2742
2964
for entry in tree.list_files():
2744
2966
if id is not None:
2745
2967
filename = entry[0]
2746
2968
if ignored.match(filename):
2747
2969
matches.append(filename)
2749
2970
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
2971
self.outf.write(gettext("Warning: the following files are version "
2972
"controlled and match your ignore pattern:\n%s"
2752
2973
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2974
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2756
2977
class cmd_ignored(Command):
2767
2988
encoding_type = 'replace'
2768
2989
_see_also = ['ignore', 'ls']
2990
takes_options = ['directory']
2770
2992
@display_command
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
2993
def run(self, directory=u'.'):
2994
tree = WorkingTree.open_containing(directory)[0]
2995
self.add_cleanup(tree.lock_read().unlock)
2775
2996
for path, file_class, kind, file_id, entry in tree.list_files():
2776
2997
if file_class != 'I':
2844
3067
'revision in which it was changed.'),
2846
3069
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
3070
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2848
3071
from bzrlib.export import export
2850
3073
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
3074
tree = WorkingTree.open_containing(directory)[0]
2852
3075
b = tree.branch
2885
3108
@display_command
2886
3109
def run(self, filename, revision=None, name_from_revision=False,
3110
filters=False, directory=None):
2888
3111
if revision is not None and len(revision) != 1:
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3112
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3113
" one revision specifier"))
2891
3114
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3115
_open_directory_or_containing_tree_or_branch(filename, directory)
3116
self.add_cleanup(branch.lock_read().unlock)
2895
3117
return self._run(tree, branch, relpath, filename, revision,
2896
3118
name_from_revision, filters)
2900
3122
if tree is None:
2901
3123
tree = b.basis_tree()
2902
3124
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3125
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3127
old_file_id = rev_tree.path2id(relpath)
3129
# TODO: Split out this code to something that generically finds the
3130
# best id for a path across one or more trees; it's like
3131
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3133
if name_from_revision:
2909
3134
# Try in revision if requested
2910
3135
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3136
raise errors.BzrCommandError(gettext(
3137
"{0!r} is not present in revision {1}").format(
2913
3138
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3140
actual_file_id = old_file_id
2917
3142
cur_file_id = tree.path2id(relpath)
2919
if cur_file_id is not None:
2920
# Then try with the actual file id
2922
content = rev_tree.get_file_text(cur_file_id)
2924
except errors.NoSuchId:
2925
# The actual file id didn't exist at that time
2927
if not found and old_file_id is not None:
2928
# Finally try with the old file id
2929
content = rev_tree.get_file_text(old_file_id)
2932
# Can't be found anywhere
2933
raise errors.BzrCommandError(
2934
"%r is not present in revision %s" % (
3143
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3144
actual_file_id = cur_file_id
3145
elif old_file_id is not None:
3146
actual_file_id = old_file_id
3148
raise errors.BzrCommandError(gettext(
3149
"{0!r} is not present in revision {1}").format(
2935
3150
filename, rev_tree.get_revision_id()))
2937
from bzrlib.filters import (
2938
ContentFilterContext,
2939
filtered_output_bytes,
2941
filters = rev_tree._content_filter_stack(relpath)
2942
chunks = content.splitlines(True)
2943
content = filtered_output_bytes(chunks, filters,
2944
ContentFilterContext(relpath, rev_tree))
2946
self.outf.writelines(content)
3152
from bzrlib.filter_tree import ContentFilterTree
3153
filter_tree = ContentFilterTree(rev_tree,
3154
rev_tree._content_filter_stack)
3155
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3157
content = rev_tree.get_file_text(actual_file_id)
3159
self.outf.write(content)
2952
3162
class cmd_local_time_offset(Command):
3013
3223
to trigger updates to external systems like bug trackers. The --fixes
3014
3224
option can be used to record the association between a revision and
3015
3225
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3034
# TODO: Run hooks on tree to-be-committed, and after commit.
3036
# TODO: Strict commit that fails if there are deleted files.
3037
# (what does "deleted files" mean ??)
3039
# TODO: Give better message for -s, --summary, used by tla people
3041
# XXX: verbose currently does nothing
3043
3228
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3229
takes_args = ['selected*']
3076
3261
Option('show-diff', short_name='p',
3077
3262
help='When no message is supplied, show the diff along'
3078
3263
' with the status summary in the message editor.'),
3265
help='When committing to a foreign version control '
3266
'system do not push data that can not be natively '
3080
3269
aliases = ['ci', 'checkin']
3082
3271
def _iter_bug_fix_urls(self, fixes, branch):
3272
default_bugtracker = None
3083
3273
# Configure the properties for bug fixing attributes.
3084
3274
for fixed_bug in fixes:
3085
3275
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3276
if len(tokens) == 1:
3277
if default_bugtracker is None:
3278
branch_config = branch.get_config()
3279
default_bugtracker = branch_config.get_user_option(
3281
if default_bugtracker is None:
3282
raise errors.BzrCommandError(gettext(
3283
"No tracker specified for bug %s. Use the form "
3284
"'tracker:id' or specify a default bug tracker "
3285
"using the `bugtracker` option.\nSee "
3286
"\"bzr help bugs\" for more information on this "
3287
"feature. Commit refused.") % fixed_bug)
3288
tag = default_bugtracker
3290
elif len(tokens) != 2:
3291
raise errors.BzrCommandError(gettext(
3088
3292
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
3293
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3294
"feature.\nCommit refused.") % fixed_bug)
3296
tag, bug_id = tokens
3093
3298
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
3299
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3300
raise errors.BzrCommandError(gettext(
3301
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3097
3302
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3303
raise errors.BzrCommandError(gettext(
3304
"%s\nCommit refused.") % (str(e),))
3101
3306
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3307
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3308
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3310
from bzrlib.errors import (
3105
3311
PointlessCommit,
3106
3312
ConflictsInTree,
3118
3325
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3119
3326
except ValueError, e:
3120
raise errors.BzrCommandError(
3121
"Could not parse --commit-time: " + str(e))
3123
# TODO: Need a blackbox test for invoking the external editor; may be
3124
# slightly problematic to run this cross-platform.
3126
# TODO: do more checks that the commit will succeed before
3127
# spending the user's valuable time typing a commit message.
3327
raise errors.BzrCommandError(gettext(
3328
"Could not parse --commit-time: " + str(e)))
3129
3330
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3332
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3333
if selected_list == ['']:
3133
3334
# workaround - commit of root of tree should be exactly the same
3134
3335
# as just default commit in that tree, and succeed even though
3163
3364
message = message.replace('\r\n', '\n')
3164
3365
message = message.replace('\r', '\n')
3166
raise errors.BzrCommandError(
3167
"please specify either --message or --file")
3367
raise errors.BzrCommandError(gettext(
3368
"please specify either --message or --file"))
3169
3370
def get_message(commit_obj):
3170
3371
"""Callback to get commit message"""
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3375
my_message = f.read().decode(osutils.get_user_encoding())
3174
3378
elif message is not None:
3175
3379
my_message = message
3184
3388
# make_commit_message_template_encoded returns user encoding.
3185
3389
# We probably want to be using edit_commit_message instead to
3187
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3189
start_message=start_message)
3190
if my_message is None:
3191
raise errors.BzrCommandError("please specify a commit"
3192
" message with either --message or --file")
3193
if my_message == "":
3194
raise errors.BzrCommandError("empty commit message specified")
3391
my_message = set_commit_message(commit_obj)
3392
if my_message is None:
3393
start_message = generate_commit_message_template(commit_obj)
3394
my_message = edit_commit_message_encoded(text,
3395
start_message=start_message)
3396
if my_message is None:
3397
raise errors.BzrCommandError(gettext("please specify a commit"
3398
" message with either --message or --file"))
3399
if my_message == "":
3400
raise errors.BzrCommandError(gettext("Empty commit message specified."
3401
" Please specify a commit message with either"
3402
" --message or --file or leave a blank message"
3403
" with --message \"\"."))
3195
3404
return my_message
3197
3406
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3414
reporter=None, verbose=verbose, revprops=properties,
3206
3415
authors=author, timestamp=commit_stamp,
3207
3416
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3417
exclude=tree.safe_relpath_files(exclude),
3209
3419
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3420
raise errors.BzrCommandError(gettext("No changes to commit."
3421
" Please 'bzr add' the files you want to commit, or use"
3422
" --unchanged to force an empty commit."))
3212
3423
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3424
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3214
3425
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3216
3427
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3428
raise errors.BzrCommandError(gettext("Commit refused because there are"
3429
" unknown files in the working tree."))
3219
3430
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3431
e.extra_help = (gettext("\n"
3221
3432
'To commit to master branch, run update and then commit.\n'
3222
3433
'You can also pass --local to commit to continue working '
3297
3508
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
3300
The check command or bzr developers may sometimes advise you to run
3301
this command. When the default format has changed you may also be warned
3302
during other operations to upgrade.
3509
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3511
When the default format has changed after a major new release of
3512
Bazaar, you may be informed during certain operations that you
3513
should upgrade. Upgrading to a newer format may improve performance
3514
or make new features available. It may however limit interoperability
3515
with older repositories or with older versions of Bazaar.
3517
If you wish to upgrade to a particular format rather than the
3518
current default, that can be specified using the --format option.
3519
As a consequence, you can use the upgrade command this way to
3520
"downgrade" to an earlier format, though some conversions are
3521
a one way process (e.g. changing from the 1.x default to the
3522
2.x default) so downgrading is not always possible.
3524
A backup.bzr.~#~ directory is created at the start of the conversion
3525
process (where # is a number). By default, this is left there on
3526
completion. If the conversion fails, delete the new .bzr directory
3527
and rename this one back in its place. Use the --clean option to ask
3528
for the backup.bzr directory to be removed on successful conversion.
3529
Alternatively, you can delete it by hand if everything looks good
3532
If the location given is a shared repository, dependent branches
3533
are also converted provided the repository converts successfully.
3534
If the conversion of a branch fails, remaining branches are still
3537
For more information on upgrades, see the Bazaar Upgrade Guide,
3538
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3541
_see_also = ['check', 'reconcile', 'formats']
3306
3542
takes_args = ['url?']
3307
3543
takes_options = [
3308
RegistryOption('format',
3309
help='Upgrade to a specific format. See "bzr help'
3310
' formats" for details.',
3311
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3312
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3313
value_switches=True, title='Branch format'),
3544
RegistryOption('format',
3545
help='Upgrade to a specific format. See "bzr help'
3546
' formats" for details.',
3547
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3548
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3549
value_switches=True, title='Branch format'),
3551
help='Remove the backup.bzr directory if successful.'),
3553
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3556
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3557
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3558
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3560
if len(exceptions) == 1:
3561
# Compatibility with historical behavior
3321
3567
class cmd_whoami(Command):
3340
3587
encoding_type = 'replace'
3342
3589
@display_command
3343
def run(self, email=False, branch=False, name=None):
3590
def run(self, email=False, branch=False, name=None, directory=None):
3344
3591
if name is None:
3345
# use branch if we're inside one; otherwise global config
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3592
if directory is None:
3593
# use branch if we're inside one; otherwise global config
3595
c = Branch.open_containing(u'.')[0].get_config()
3596
except errors.NotBranchError:
3597
c = _mod_config.GlobalConfig()
3599
c = Branch.open(directory).get_config()
3351
3601
self.outf.write(c.user_email() + '\n')
3353
3603
self.outf.write(c.username() + '\n')
3607
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3610
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3612
_mod_config.extract_email_address(name)
3359
3613
except errors.NoEmailInUsername, e:
3360
3614
warning('"%s" does not seem to contain an email address. '
3361
3615
'This is allowed, but not recommended.', name)
3363
3617
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3619
if directory is None:
3620
c = Branch.open_containing(u'.')[0].get_config()
3622
c = Branch.open(directory).get_config()
3367
c = config.GlobalConfig()
3624
c = _mod_config.GlobalConfig()
3368
3625
c.set_user_option('email', name)
3433
3691
def remove_alias(self, alias_name):
3434
3692
if alias_name is None:
3435
raise errors.BzrCommandError(
3436
'bzr alias --remove expects an alias to remove.')
3693
raise errors.BzrCommandError(gettext(
3694
'bzr alias --remove expects an alias to remove.'))
3437
3695
# If alias is not found, print something like:
3438
3696
# unalias: foo: not found
3439
c = config.GlobalConfig()
3697
c = _mod_config.GlobalConfig()
3440
3698
c.unset_alias(alias_name)
3442
3700
@display_command
3443
3701
def print_aliases(self):
3444
3702
"""Print out the defined aliases in a similar format to bash."""
3445
aliases = config.GlobalConfig().get_aliases()
3703
aliases = _mod_config.GlobalConfig().get_aliases()
3446
3704
for key, value in sorted(aliases.iteritems()):
3447
3705
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3515
3776
if typestring == "sftp":
3516
3777
from bzrlib.tests import stub_sftp
3517
3778
return stub_sftp.SFTPAbsoluteServer
3518
if typestring == "memory":
3779
elif typestring == "memory":
3519
3780
from bzrlib.tests import test_server
3520
3781
return memory.MemoryServer
3521
if typestring == "fakenfs":
3782
elif typestring == "fakenfs":
3522
3783
from bzrlib.tests import test_server
3523
3784
return test_server.FakeNFSServer
3524
3785
msg = "No known transport type %s. Supported types are: sftp\n" %\
3537
3798
'throughout the test suite.',
3538
3799
type=get_transport_type),
3539
3800
Option('benchmark',
3540
help='Run the benchmarks rather than selftests.'),
3801
help='Run the benchmarks rather than selftests.',
3541
3803
Option('lsprof-timed',
3542
3804
help='Generate lsprof output for benchmarked'
3543
3805
' sections of code.'),
3544
3806
Option('lsprof-tests',
3545
3807
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3549
3808
Option('first',
3550
3809
help='Run all tests, but run specified tests first.',
3551
3810
short_name='f',
3560
3819
Option('randomize', type=str, argname="SEED",
3561
3820
help='Randomize the order of tests using the given'
3562
3821
' seed or "now" for the current time.'),
3563
Option('exclude', type=str, argname="PATTERN",
3565
help='Exclude tests that match this regular'
3822
ListOption('exclude', type=str, argname="PATTERN",
3824
help='Exclude tests that match this regular'
3567
3826
Option('subunit',
3568
3827
help='Output test progress via subunit.'),
3569
3828
Option('strict', help='Fail on missing dependencies or '
3586
3848
def run(self, testspecs_list=None, verbose=False, one=False,
3587
3849
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
3851
first=False, list_only=False,
3590
3852
randomize=None, exclude=None, strict=False,
3591
3853
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
parallel=None, lsprof_tests=False):
3593
from bzrlib.tests import selftest
3594
import bzrlib.benchmarks as benchmarks
3595
from bzrlib.benchmarks import tree_creator
3597
# Make deprecation warnings visible, unless -Werror is set
3598
symbol_versioning.activate_deprecation_warnings(override=False)
3600
if cache_dir is not None:
3601
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3854
parallel=None, lsprof_tests=False,
3856
from bzrlib import tests
3602
3858
if testspecs_list is not None:
3603
3859
pattern = '|'.join(testspecs_list)
3608
3864
from bzrlib.tests import SubUnitBzrRunner
3609
3865
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3866
raise errors.BzrCommandError(gettext("subunit not available. subunit "
3867
"needs to be installed to use --subunit."))
3612
3868
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3869
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3870
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3871
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3872
# following code can be deleted when it's sufficiently deployed
3873
# -- vila/mgz 20100514
3874
if (sys.platform == "win32"
3875
and getattr(sys.stdout, 'fileno', None) is not None):
3617
3877
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
3879
self.additional_selftest_args.setdefault(
3620
3880
'suite_decorators', []).append(parallel)
3622
test_suite_factory = benchmarks.test_suite
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
verbose = not is_quiet()
3625
# TODO: should possibly lock the history file...
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3882
raise errors.BzrCommandError(gettext(
3883
"--benchmark is no longer supported from bzr 2.2; "
3884
"use bzr-usertest instead"))
3885
test_suite_factory = None
3887
exclude_pattern = None
3629
test_suite_factory = None
3889
exclude_pattern = '(' + '|'.join(exclude) + ')'
3891
self._disable_fsync()
3631
3892
selftest_kwargs = {"verbose": verbose,
3632
3893
"pattern": pattern,
3633
3894
"stop_on_failure": one,
3635
3896
"test_suite_factory": test_suite_factory,
3636
3897
"lsprof_timed": lsprof_timed,
3637
3898
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
3899
"matching_tests_first": first,
3640
3900
"list_only": list_only,
3641
3901
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3902
"exclude_pattern": exclude_pattern,
3643
3903
"strict": strict,
3644
3904
"load_list": load_list,
3645
3905
"debug_flags": debugflag,
3646
3906
"starting_with": starting_with
3648
3908
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3910
# Make deprecation warnings visible, unless -Werror is set
3911
cleanup = symbol_versioning.activate_deprecation_warnings(
3914
result = tests.selftest(**selftest_kwargs)
3650
3917
return int(not result)
3919
def _disable_fsync(self):
3920
"""Change the 'os' functionality to not synchronize."""
3921
self._orig_fsync = getattr(os, 'fsync', None)
3922
if self._orig_fsync is not None:
3923
os.fsync = lambda filedes: None
3924
self._orig_fdatasync = getattr(os, 'fdatasync', None)
3925
if self._orig_fdatasync is not None:
3926
os.fdatasync = lambda filedes: None
3653
3929
class cmd_version(Command):
3654
3930
__doc__ = """Show version of bzr."""
3691
3967
branch1 = Branch.open_containing(branch)[0]
3692
3968
branch2 = Branch.open_containing(other)[0]
3694
self.add_cleanup(branch1.unlock)
3696
self.add_cleanup(branch2.unlock)
3969
self.add_cleanup(branch1.lock_read().unlock)
3970
self.add_cleanup(branch2.lock_read().unlock)
3697
3971
last1 = ensure_null(branch1.last_revision())
3698
3972
last2 = ensure_null(branch2.last_revision())
3700
3974
graph = branch1.repository.get_graph(branch2.repository)
3701
3975
base_rev_id = graph.find_unique_lca(last1, last2)
3703
self.outf.write('merge base is revision %s\n' % base_rev_id)
3977
self.outf.write(gettext('merge base is revision %s\n') % base_rev_id)
3706
3980
class cmd_merge(Command):
3709
3983
The source of the merge can be specified either in the form of a branch,
3710
3984
or in the form of a path to a file containing a merge directive generated
3711
3985
with bzr send. If neither is specified, the default is the upstream branch
3712
or the branch most recently merged using --remember.
3714
When merging a branch, by default the tip will be merged. To pick a different
3715
revision, pass --revision. If you specify two values, the first will be used as
3716
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3717
available revisions, like this is commonly referred to as "cherrypicking".
3719
Revision numbers are always relative to the branch being merged.
3721
By default, bzr will try to merge in all new work from the other
3722
branch, automatically determining an appropriate base. If this
3723
fails, you may need to give an explicit base.
3986
or the branch most recently merged using --remember. The source of the
3987
merge may also be specified in the form of a path to a file in another
3988
branch: in this case, only the modifications to that file are merged into
3989
the current working tree.
3991
When merging from a branch, by default bzr will try to merge in all new
3992
work from the other branch, automatically determining an appropriate base
3993
revision. If this fails, you may need to give an explicit base.
3995
To pick a different ending revision, pass "--revision OTHER". bzr will
3996
try to merge in all new work up to and including revision OTHER.
3998
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3999
through OTHER, excluding BASE but including OTHER, will be merged. If this
4000
causes some revisions to be skipped, i.e. if the destination branch does
4001
not already contain revision BASE, such a merge is commonly referred to as
4002
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4003
cherrypicks. The changes look like a normal commit, and the history of the
4004
changes from the other branch is not stored in the commit.
4006
Revision numbers are always relative to the source branch.
3725
4008
Merge will do its best to combine the changes in two branches, but there
3726
4009
are some kinds of problems only a human can fix. When it encounters those,
3730
4013
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3732
If there is no default branch set, the first merge will set it. After
3733
that, you can omit the branch to use the default. To change the
3734
default, use --remember. The value will only be saved if the remote
3735
location can be accessed.
4015
If there is no default branch set, the first merge will set it (use
4016
--no-remember to avoid setting it). After that, you can omit the branch
4017
to use the default. To change the default, use --remember. The value will
4018
only be saved if the remote location can be accessed.
3737
4020
The results of the merge are placed into the destination working
3738
4021
directory, where they can be reviewed (with bzr diff), tested, and then
3739
4022
committed to record the result of the merge.
3741
4024
merge refuses to run if there are any uncommitted changes, unless
3742
--force is given. The --force option can also be used to create a
4025
--force is given. If --force is given, then the changes from the source
4026
will be merged with the current working tree, including any uncommitted
4027
changes in the tree. The --force option can also be used to create a
3743
4028
merge revision which has more than two parents.
3745
4030
If one would like to merge changes from the working tree of the other
3793
4078
' completely merged into the source, pull from the'
3794
4079
' source rather than merging. When this happens,'
3795
4080
' you do not need to commit the result.'),
4081
custom_help('directory',
3797
4082
help='Branch to merge into, '
3798
'rather than the one containing the working directory.',
4083
'rather than the one containing the working directory.'),
3802
4084
Option('preview', help='Instead of merging, show a diff of the'
3804
4086
Option('interactive', help='Select changes interactively.',
3808
4090
def run(self, location=None, revision=None, force=False,
3809
merge_type=None, show_base=False, reprocess=None, remember=False,
4091
merge_type=None, show_base=False, reprocess=None, remember=None,
3810
4092
uncommitted=False, pull=False,
3811
4093
directory=None,
3847
4132
mergeable = None
3849
4134
if uncommitted:
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
4135
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4136
' with bundles or merge directives.'))
3853
4138
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
4139
raise errors.BzrCommandError(gettext(
4140
'Cannot use -r with merge directives or bundles'))
3856
4141
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3857
4142
mergeable, None)
3859
4144
if merger is None and uncommitted:
3860
4145
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
4146
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4147
' --revision at the same time.'))
3863
4148
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
4149
allow_pending = False
3873
4158
self.sanity_check_merger(merger)
3874
4159
if (merger.base_rev_id == merger.other_rev_id and
3875
4160
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4161
# check if location is a nonexistent file (and not a branch) to
4162
# disambiguate the 'Nothing to do'
4163
if merger.interesting_files:
4164
if not merger.other_tree.has_filename(
4165
merger.interesting_files[0]):
4166
note(gettext("merger: ") + str(merger))
4167
raise errors.PathsDoNotExist([location])
4168
note(gettext('Nothing to do.'))
4170
if pull and not preview:
3879
4171
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4172
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4173
if (merger.base_rev_id == tree.last_revision()):
3882
4174
result = tree.pull(merger.other_branch, False,
3883
4175
merger.other_rev_id)
3884
4176
result.report(self.outf)
3886
4178
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4179
raise errors.BzrCommandError(gettext(
3888
4180
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4181
" (perhaps you would prefer 'bzr pull')"))
3891
4183
return self._do_preview(merger)
3892
4184
elif interactive:
3905
4197
def _do_preview(self, merger):
3906
4198
from bzrlib.diff import show_diff_trees
3907
4199
result_tree = self._get_preview(merger)
4200
path_encoding = osutils.get_diff_header_encoding()
3908
4201
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
4202
old_label='', new_label='',
4203
path_encoding=path_encoding)
3911
4205
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
4206
merger.change_reporter = change_reporter
3950
4244
# Use reprocess if the merger supports it
3951
4245
merger.reprocess = merger.merge_type.supports_reprocess
3952
4246
if merger.reprocess and not merger.merge_type.supports_reprocess:
3953
raise errors.BzrCommandError("Conflict reduction is not supported"
3954
" for merge type %s." %
4247
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4248
" for merge type %s.") %
3955
4249
merger.merge_type)
3956
4250
if merger.reprocess and merger.show_base:
3957
raise errors.BzrCommandError("Cannot do conflict reduction and"
4251
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
3960
4254
def _get_merger_from_branch(self, tree, location, revision, remember,
3961
4255
possible_transports, pb):
3988
4282
if other_revision_id is None:
3989
4283
other_revision_id = _mod_revision.ensure_null(
3990
4284
other_branch.last_revision())
3991
# Remember where we merge from
3992
if ((remember or tree.branch.get_submit_branch() is None) and
3993
user_location is not None):
4285
# Remember where we merge from. We need to remember if:
4286
# - user specify a location (and we don't merge from the parent
4288
# - user ask to remember or there is no previous location set to merge
4289
# from and user didn't ask to *not* remember
4290
if (user_location is not None
4292
or (remember is None
4293
and tree.branch.get_submit_branch() is None)))):
3994
4294
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4295
# Merge tags (but don't set them in the master branch yet, the user
4296
# might revert this merge). Commit will propagate them.
4297
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4298
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4299
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4300
if other_path != '':
4057
4359
stored_location_type = "parent"
4058
4360
mutter("%s", stored_location)
4059
4361
if stored_location is None:
4060
raise errors.BzrCommandError("No location specified or remembered")
4362
raise errors.BzrCommandError(gettext("No location specified or remembered"))
4061
4363
display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
4062
note(u"%s remembered %s location %s", verb_string,
4063
stored_location_type, display_url)
4364
note(gettext("{0} remembered {1} location {2}").format(verb_string,
4365
stored_location_type, display_url))
4064
4366
return stored_location
4099
4401
from bzrlib.conflicts import restore
4100
4402
if merge_type is None:
4101
4403
merge_type = _mod_merge.Merge3Merger
4102
tree, file_list = tree_files(file_list)
4104
self.add_cleanup(tree.unlock)
4404
tree, file_list = WorkingTree.open_containing_paths(file_list)
4405
self.add_cleanup(tree.lock_write().unlock)
4105
4406
parents = tree.get_parent_ids()
4106
4407
if len(parents) != 2:
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4408
raise errors.BzrCommandError(gettext("Sorry, remerge only works after normal"
4108
4409
" merges. Not cherrypicking or"
4110
4411
repository = tree.branch.repository
4111
4412
interesting_ids = None
4112
4413
new_conflicts = []
4167
4468
last committed revision is used.
4169
4470
To remove only some changes, without reverting to a prior version, use
4170
merge instead. For example, "merge . --revision -2..-3" will remove the
4171
changes introduced by -2, without affecting the changes introduced by -1.
4172
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4471
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4472
will remove the changes introduced by the second last commit (-2), without
4473
affecting the changes introduced by the last commit (-1). To remove
4474
certain changes on a hunk-by-hunk basis, see the shelve command.
4174
4476
By default, any files that have been manually changed will be backed up
4175
4477
first. (Files changed only by merge are not backed up.) Backup files have
4340
4644
theirs_only=False,
4341
4645
log_format=None, long=False, short=False, line=False,
4342
4646
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4647
include_merged=None, revision=None, my_revision=None,
4649
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4344
4650
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4651
def message(s):
4346
4652
if not is_quiet():
4347
4653
self.outf.write(s)
4655
if symbol_versioning.deprecated_passed(include_merges):
4656
ui.ui_factory.show_user_warning(
4657
'deprecated_command_option',
4658
deprecated_name='--include-merges',
4659
recommended_name='--include-merged',
4660
deprecated_in_version='2.5',
4661
command=self.invoked_as)
4662
if include_merged is None:
4663
include_merged = include_merges
4665
raise errors.BzrCommandError(gettext(
4666
'{0} and {1} are mutually exclusive').format(
4667
'--include-merges', '--include-merged'))
4668
if include_merged is None:
4669
include_merged = False
4350
4671
mine_only = this
4359
4680
elif theirs_only:
4360
4681
restrict = 'remote'
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4683
local_branch = Branch.open_containing(directory)[0]
4684
self.add_cleanup(local_branch.lock_read().unlock)
4366
4686
parent = local_branch.get_parent()
4367
4687
if other_branch is None:
4368
4688
other_branch = parent
4369
4689
if other_branch is None:
4370
raise errors.BzrCommandError("No peer location known"
4690
raise errors.BzrCommandError(gettext("No peer location known"
4372
4692
display_url = urlutils.unescape_for_display(parent,
4373
4693
self.outf.encoding)
4374
message("Using saved parent location: "
4375
+ display_url + "\n")
4694
message(gettext("Using saved parent location: {0}\n").format(
4377
4697
remote_branch = Branch.open(other_branch)
4378
4698
if remote_branch.base == local_branch.base:
4379
4699
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4701
self.add_cleanup(remote_branch.lock_read().unlock)
4384
4703
local_revid_range = _revision_range_to_revid_range(
4385
4704
_get_revision_range(my_revision, local_branch,
4430
4753
if mine_only and not local_extra:
4431
4754
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4755
message(gettext('This branch has no new revisions.\n'))
4433
4756
elif theirs_only and not remote_extra:
4434
4757
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4758
message(gettext('Other branch has no new revisions.\n'))
4436
4759
elif not (mine_only or theirs_only or local_extra or
4438
4761
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
4763
message(gettext("Branches are up to date.\n"))
4441
4764
self.cleanup_now()
4442
4765
if not status_code and parent is None and other_branch is not None:
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4766
self.add_cleanup(local_branch.lock_write().unlock)
4445
4767
# handle race conditions - a parent might be set while we run.
4446
4768
if local_branch.get_parent() is None:
4447
4769
local_branch.set_parent(remote_branch.base)
4507
4829
@display_command
4508
4830
def run(self, verbose=False):
4509
import bzrlib.plugin
4510
from inspect import getdoc
4512
for name, plugin in bzrlib.plugin.plugins().items():
4513
version = plugin.__version__
4514
if version == 'unknown':
4516
name_ver = '%s %s' % (name, version)
4517
d = getdoc(plugin.module)
4519
doc = d.split('\n')[0]
4521
doc = '(no description)'
4522
result.append((name_ver, doc, plugin.path()))
4523
for name_ver, doc, path in sorted(result):
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
4831
from bzrlib import plugin
4832
# Don't give writelines a generator as some codecs don't like that
4833
self.outf.writelines(
4834
list(plugin.describe_plugins(show_paths=verbose)))
4531
4837
class cmd_testament(Command):
4578
4883
Option('long', help='Show commit date in annotations.'),
4582
4888
encoding_type = 'exact'
4584
4890
@display_command
4585
4891
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4892
show_ids=False, directory=None):
4893
from bzrlib.annotate import (
4588
4896
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4897
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
4898
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4899
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4901
self.add_cleanup(branch.lock_read().unlock)
4596
4902
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4903
self.add_cleanup(tree.lock_read().unlock)
4904
if wt is not None and revision is None:
4600
4905
file_id = wt.path2id(relpath)
4602
4907
file_id = tree.path2id(relpath)
4603
4908
if file_id is None:
4604
4909
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
4910
if wt is not None and revision is None:
4607
4911
# If there is a tree and we're not annotating historical
4608
4912
# versions, annotate the working tree's content.
4609
4913
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
4914
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4916
annotate_file_tree(tree, file_id, self.outf, long, all,
4917
show_ids=show_ids, branch=branch)
4616
4920
class cmd_re_sign(Command):
4620
4924
hidden = True # is this right ?
4621
4925
takes_args = ['revision_id*']
4622
takes_options = ['revision']
4926
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
4928
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
4929
if revision_id_list is not None and revision is not None:
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4930
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
4931
if revision_id_list is None and revision is None:
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
4932
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
4933
b = WorkingTree.open_containing(directory)[0].branch
4934
self.add_cleanup(b.lock_write().unlock)
4632
4935
return self._run(b, revision_id_list, revision)
4634
4937
def _run(self, b, revision_id_list, revision):
4694
4997
_see_also = ['checkouts', 'unbind']
4695
4998
takes_args = ['location?']
4999
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5001
def run(self, location=None, directory=u'.'):
5002
b, relpath = Branch.open_containing(directory)
4700
5003
if location is None:
4702
5005
location = b.get_old_bound_location()
4703
5006
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5007
raise errors.BzrCommandError(gettext('No location supplied. '
5008
'This format does not remember old locations.'))
4707
5010
if location is None:
4708
5011
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5012
raise errors.BzrCommandError(gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5014
raise errors.BzrCommandError(gettext('No location supplied '
5015
'and no previous location known'))
4713
5016
b_other = Branch.open(location)
4715
5018
b.bind(b_other)
4716
5019
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5020
raise errors.BzrCommandError(gettext('These branches have diverged.'
5021
' Try merging, and then bind again.'))
4719
5022
if b.get_config().has_explicit_nickname():
4720
5023
b.nick = b_other.nick
4771
5076
encoding_type = 'replace'
4773
def run(self, location=None,
4774
dry_run=False, verbose=False,
4775
revision=None, force=False, local=False):
5078
def run(self, location=None, dry_run=False, verbose=False,
5079
revision=None, force=False, local=False, keep_tags=False):
4776
5080
if location is None:
4777
5081
location = u'.'
4778
5082
control, relpath = bzrdir.BzrDir.open_containing(location)
4784
5088
b = control.open_branch()
4786
5090
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5091
self.add_cleanup(tree.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5093
self.add_cleanup(b.lock_write().unlock)
5094
return self._run(b, tree, dry_run, verbose, revision, force,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5097
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4795
5099
from bzrlib.log import log_formatter, show_log
4796
5100
from bzrlib.uncommit import uncommit
4827
5131
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5134
self.outf.write(gettext('Dry-run, pretending to remove'
5135
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5137
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5140
if not ui.ui_factory.confirm_action(
5141
gettext(u'Uncommit these revisions'),
5142
'bzrlib.builtins.uncommit',
5144
self.outf.write(gettext('Canceled\n'))
4840
5147
mutter('Uncommitting from {%s} to {%s}',
4841
5148
last_rev_id, rev_id)
4842
5149
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
5150
revno=revno, local=local, keep_tags=keep_tags)
5151
self.outf.write(gettext('You can restore the old tip by running:\n'
5152
' bzr pull . -r revid:%s\n') % last_rev_id)
4848
5155
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5156
__doc__ = """Break a dead lock.
5158
This command breaks a lock on a repository, branch, working directory or
4851
5161
CAUTION: Locks should only be broken when you are sure that the process
4852
5162
holding the lock has been stopped.
4859
5169
bzr break-lock bzr+ssh://example.com/bzr/foo
5170
bzr break-lock --conf ~/.bazaar
4861
5173
takes_args = ['location?']
5176
help='LOCATION is the directory where the config lock is.'),
5178
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5181
def run(self, location=None, config=False, force=False):
4864
5182
if location is None:
4865
5183
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5185
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5187
{'bzrlib.lockdir.break': True})
5189
conf = _mod_config.LockableConfig(file_name=location)
5192
control, relpath = bzrdir.BzrDir.open_containing(location)
5194
control.break_lock()
5195
except NotImplementedError:
4873
5199
class cmd_wait_until_signalled(Command):
4936
5263
return host, port
4938
5265
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5266
protocol=None, client_timeout=None):
5267
from bzrlib import transport
4941
5268
if directory is None:
4942
5269
directory = os.getcwd()
4943
5270
if protocol is None:
4944
protocol = transport_server_registry.get()
5271
protocol = transport.transport_server_registry.get()
4945
5272
host, port = self.get_host_and_port(port)
4946
5273
url = urlutils.local_path_to_url(directory)
4947
5274
if not allow_writes:
4948
5275
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5276
t = transport.get_transport(url)
5278
protocol(t, host, port, inet, client_timeout)
5279
except TypeError, e:
5280
# We use symbol_versioning.deprecated_in just so that people
5281
# grepping can find it here.
5282
# symbol_versioning.deprecated_in((2, 5, 0))
5283
symbol_versioning.warn(
5284
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5285
'Most likely it needs to be updated to support a'
5286
' "timeout" parameter (added in bzr 2.5.0)'
5287
% (e, protocol.__module__, protocol),
5289
protocol(t, host, port, inet)
4953
5292
class cmd_join(Command):
4986
5325
except errors.BadReferenceTarget, e:
4987
5326
# XXX: Would be better to just raise a nicely printable
4988
5327
# exception from the real origin. Also below. mbp 20070306
4989
raise errors.BzrCommandError("Cannot join %s. %s" %
5328
raise errors.BzrCommandError(
5329
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4993
5332
containing_tree.subsume(sub_tree)
4994
5333
except errors.BadSubsumeSource, e:
4995
raise errors.BzrCommandError("Cannot join %s. %s" %
5334
raise errors.BzrCommandError(
5335
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4999
5338
class cmd_split(Command):
5064
5404
encoding_type = 'exact'
5066
5406
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5067
sign=False, revision=None, mail_to=None, message=None):
5407
sign=False, revision=None, mail_to=None, message=None,
5068
5409
from bzrlib.revision import ensure_null, NULL_REVISION
5069
5410
include_patch, include_bundle = {
5070
5411
'plain': (False, False),
5071
5412
'diff': (True, False),
5072
5413
'bundle': (True, True),
5074
branch = Branch.open('.')
5415
branch = Branch.open(directory)
5075
5416
stored_submit_branch = branch.get_submit_branch()
5076
5417
if submit_branch is None:
5077
5418
submit_branch = stored_submit_branch
5089
5430
elif stored_public_branch is None:
5090
5431
branch.set_public_branch(public_branch)
5091
5432
if not include_bundle and public_branch is None:
5092
raise errors.BzrCommandError('No public branch specified or'
5433
raise errors.BzrCommandError(gettext('No public branch specified or'
5094
5435
base_revision_id = None
5095
5436
if revision is not None:
5096
5437
if len(revision) > 2:
5097
raise errors.BzrCommandError('bzr merge-directive takes '
5098
'at most two one revision identifiers')
5438
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5439
'at most two one revision identifiers'))
5099
5440
revision_id = revision[-1].as_revision_id(branch)
5100
5441
if len(revision) == 2:
5101
5442
base_revision_id = revision[0].as_revision_id(branch)
5103
5444
revision_id = branch.last_revision()
5104
5445
revision_id = ensure_null(revision_id)
5105
5446
if revision_id == NULL_REVISION:
5106
raise errors.BzrCommandError('No revisions to bundle.')
5447
raise errors.BzrCommandError(gettext('No revisions to bundle.'))
5107
5448
directive = merge_directive.MergeDirective2.from_objects(
5108
5449
branch.repository, revision_id, time.time(),
5109
5450
osutils.local_time_offset(), submit_branch,
5153
5494
source branch defaults to that containing the working directory, but can
5154
5495
be changed using --from.
5497
Both the submit branch and the public branch follow the usual behavior with
5498
respect to --remember: If there is no default location set, the first send
5499
will set it (use --no-remember to avoid setting it). After that, you can
5500
omit the location to use the default. To change the default, use
5501
--remember. The value will only be saved if the location can be accessed.
5156
5503
In order to calculate those changes, bzr must analyse the submit branch.
5157
5504
Therefore it is most efficient for the submit branch to be a local mirror.
5158
5505
If a public location is known for the submit_branch, that location is used
5229
5576
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
no_patch=False, revision=None, remember=False, output=None,
5577
no_patch=False, revision=None, remember=None, output=None,
5231
5578
format=None, mail_to=None, message=None, body=None,
5232
5579
strict=None, **kwargs):
5233
5580
from bzrlib.send import send
5359
5703
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5704
self.add_cleanup(branch.lock_write().unlock)
5363
5706
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5707
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5708
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5709
note(gettext('Deleted tag %s.') % tag_name)
5369
5712
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5713
raise errors.BzrCommandError(gettext(
5371
5714
"Tags can only be placed on a single revision, "
5373
5716
revision_id = revision[0].as_revision_id(branch)
5375
5718
revision_id = branch.last_revision()
5376
5719
if tag_name is None:
5377
5720
tag_name = branch.automatic_tag_name(revision_id)
5378
5721
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5722
raise errors.BzrCommandError(gettext(
5723
"Please specify a tag name."))
5725
existing_target = branch.tags.lookup_tag(tag_name)
5726
except errors.NoSuchTag:
5727
existing_target = None
5728
if not force and existing_target not in (None, revision_id):
5382
5729
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5730
if existing_target == revision_id:
5731
note(gettext('Tag %s already exists for that revision.') % tag_name)
5733
branch.tags.set_tag(tag_name, revision_id)
5734
if existing_target is None:
5735
note(gettext('Created tag %s.') % tag_name)
5737
note(gettext('Updated tag %s.') % tag_name)
5387
5740
class cmd_tags(Command):
5393
5746
_see_also = ['tag']
5394
5747
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5748
custom_help('directory',
5749
help='Branch whose tags should be displayed.'),
5750
RegistryOption('sort',
5401
5751
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5752
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
5758
@display_command
5759
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5760
from bzrlib.tag import tag_sort_methods
5416
5761
branch, relpath = Branch.open_containing(directory)
5418
5763
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
5767
self.add_cleanup(branch.lock_read().unlock)
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
5433
elif sort == 'time':
5435
for tag, revid in tags:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
5769
# Restrict to the specified range
5770
tags = self._tags_for_range(branch, revision)
5772
sort = tag_sort_methods.get()
5444
5774
if not show_ids:
5445
5775
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
5776
for index, (tag, revid) in enumerate(tags):
5457
5788
for tag, revspec in tags:
5458
5789
self.outf.write('%-20s %s\n' % (tag, revspec))
5791
def _tags_for_range(self, branch, revision):
5793
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5794
revid1, revid2 = rev1.rev_id, rev2.rev_id
5795
# _get_revision_range will always set revid2 if it's not specified.
5796
# If revid1 is None, it means we want to start from the branch
5797
# origin which is always a valid ancestor. If revid1 == revid2, the
5798
# ancestry check is useless.
5799
if revid1 and revid1 != revid2:
5800
# FIXME: We really want to use the same graph than
5801
# branch.iter_merge_sorted_revisions below, but this is not
5802
# easily available -- vila 2011-09-23
5803
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5804
# We don't want to output anything in this case...
5806
# only show revisions between revid1 and revid2 (inclusive)
5807
tagged_revids = branch.tags.get_reverse_tag_dict()
5809
for r in branch.iter_merge_sorted_revisions(
5810
start_revision_id=revid2, stop_revision_id=revid1,
5811
stop_rule='include'):
5812
revid_tags = tagged_revids.get(r[0], None)
5814
found.extend([(tag, r[0]) for tag in revid_tags])
5461
5818
class cmd_reconfigure(Command):
5462
5819
__doc__ = """Reconfigure the type of a bzr directory.
5476
5833
takes_args = ['location?']
5477
5834
takes_options = [
5478
5835
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
5838
help='The relation between branch and tree.',
5482
5839
value_switches=True, enum_switch=False,
5483
5840
branch='Reconfigure to be an unbound branch with no working tree.',
5484
5841
tree='Reconfigure to be an unbound branch with a working tree.',
5485
5842
checkout='Reconfigure to be a bound branch with a working tree.',
5486
5843
lightweight_checkout='Reconfigure to be a lightweight'
5487
5844
' checkout (with no local history).',
5846
RegistryOption.from_kwargs(
5848
title='Repository type',
5849
help='Location fo the repository.',
5850
value_switches=True, enum_switch=False,
5488
5851
standalone='Reconfigure to be a standalone branch '
5489
5852
'(i.e. stop using shared repository).',
5490
5853
use_shared='Reconfigure to use a shared repository.',
5855
RegistryOption.from_kwargs(
5857
title='Trees in Repository',
5858
help='Whether new branches in the repository have trees.',
5859
value_switches=True, enum_switch=False,
5491
5860
with_trees='Reconfigure repository to create '
5492
5861
'working trees on branches by default.',
5493
5862
with_no_trees='Reconfigure repository to not create '
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5879
def run(self, location=None, bind_to=None, force=False,
5880
tree_type=None, repository_type=None, repository_trees=None,
5881
stacked_on=None, unstacked=None):
5513
5882
directory = bzrdir.BzrDir.open(location)
5514
5883
if stacked_on and unstacked:
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5884
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5516
5885
elif stacked_on is not None:
5517
5886
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5518
5887
elif unstacked:
5520
5889
# At the moment you can use --stacked-on and a different
5521
5890
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
5892
if (tree_type is None and
5893
repository_type is None and
5894
repository_trees is None):
5524
5895
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
5898
raise errors.BzrCommandError(gettext('No target configuration '
5900
reconfiguration = None
5901
if tree_type == 'branch':
5530
5902
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
5903
elif tree_type == 'tree':
5532
5904
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
5905
elif tree_type == 'checkout':
5534
5906
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
5907
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
5908
elif tree_type == 'lightweight-checkout':
5537
5909
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
5910
directory, bind_to)
5539
elif target_type == 'use-shared':
5912
reconfiguration.apply(force)
5913
reconfiguration = None
5914
if repository_type == 'use-shared':
5540
5915
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
5916
elif repository_type == 'standalone':
5542
5917
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
5919
reconfiguration.apply(force)
5920
reconfiguration = None
5921
if repository_trees == 'with-trees':
5544
5922
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
5923
directory, True)
5546
elif target_type == 'with-no-trees':
5924
elif repository_trees == 'with-no-trees':
5547
5925
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
5926
directory, False)
5549
reconfiguration.apply(force)
5928
reconfiguration.apply(force)
5929
reconfiguration = None
5552
5932
class cmd_switch(Command):
5584
5965
def run(self, to_location=None, force=False, create_branch=False,
5966
revision=None, directory=u'.'):
5586
5967
from bzrlib import switch
5968
tree_location = directory
5588
5969
revision = _get_one_revision('switch', revision)
5589
5970
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
5971
if to_location is None:
5591
5972
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
5973
raise errors.BzrCommandError(gettext('You must supply either a'
5974
' revision or a location'))
5975
to_location = tree_location
5596
5977
branch = control_dir.open_branch()
5597
5978
had_explicit_nick = branch.get_config().has_explicit_nickname()
5735
tree, file_list = tree_files(file_list, apply_view=False)
6116
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6118
current_view, view_dict = tree.views.get_view_info()
5737
6119
if name is None:
5738
6120
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6123
raise errors.BzrCommandError(gettext(
6124
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6126
raise errors.BzrCommandError(gettext(
6127
"Both --delete and --switch specified"))
5747
6129
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6130
self.outf.write(gettext("Deleted all views.\n"))
5749
6131
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6132
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6134
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6135
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6138
raise errors.BzrCommandError(gettext(
6139
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6141
raise errors.BzrCommandError(gettext(
6142
"Both --switch and --all specified"))
5761
6143
elif switch == 'off':
5762
6144
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6145
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6146
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6147
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6149
tree.views.set_view_info(switch, view_dict)
5768
6150
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6151
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6154
self.outf.write(gettext('Views defined:\n'))
5773
6155
for view in sorted(view_dict):
5774
6156
if view == current_view:
5778
6160
view_str = views.view_display_str(view_dict[view])
5779
6161
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6163
self.outf.write(gettext('No views defined.\n'))
5782
6164
elif file_list:
5783
6165
if name is None:
5784
6166
# No name given and no current view set
5786
6168
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6169
raise errors.BzrCommandError(gettext(
6170
"Cannot change the 'off' pseudo view"))
5789
6171
tree.views.set_view(name, sorted(file_list))
5790
6172
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6173
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6175
# list the files
5794
6176
if name is None:
5795
6177
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6178
self.outf.write(gettext('No current view.\n'))
5798
6180
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6181
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6184
class cmd_hooks(Command):
5868
6250
You can put multiple items on the shelf, and by default, 'unshelve' will
5869
6251
restore the most recently shelved changes.
6253
For complicated changes, it is possible to edit the changes in a separate
6254
editor program to decide what the file remaining in the working copy
6255
should look like. To do this, add the configuration option
6257
change_editor = PROGRAM @new_path @old_path
6259
where @new_path is replaced with the path of the new version of the
6260
file and @old_path is replaced with the path of the old version of
6261
the file. The PROGRAM should save the new file with the desired
6262
contents of the file in the working tree.
5872
6266
takes_args = ['file*']
5874
6268
takes_options = [
5876
6271
Option('all', help='Shelve all changes.'),
5883
6278
Option('destroy',
5884
6279
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6281
_see_also = ['unshelve', 'configuration']
5888
6283
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6284
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6286
return self.run_for_list(directory=directory)
5892
6287
from bzrlib.shelf_ui import Shelver
5893
6288
if writer is None:
5894
6289
writer = bzrlib.option.diff_writer_registry.get()
5896
6291
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6292
file_list, message, destroy=destroy, directory=directory)
5902
6297
except errors.UserAbort:
5905
def run_for_list(self):
5906
tree = WorkingTree.open_containing('.')[0]
5908
self.add_cleanup(tree.unlock)
6300
def run_for_list(self, directory=None):
6301
if directory is None:
6303
tree = WorkingTree.open_containing(directory)[0]
6304
self.add_cleanup(tree.lock_read().unlock)
5909
6305
manager = tree.get_shelf_manager()
5910
6306
shelves = manager.active_shelves()
5911
6307
if len(shelves) == 0:
5912
note('No shelved changes.')
6308
note(gettext('No shelved changes.'))
5914
6310
for shelf_id in reversed(shelves):
5915
6311
message = manager.get_metadata(shelf_id).get('message')
5967
6364
To check what clean-tree will do, use --dry-run.
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5970
Option('detritus', help='Delete conflict files, merge'
6366
takes_options = ['directory',
6367
Option('ignored', help='Delete all ignored files.'),
6368
Option('detritus', help='Delete conflict files, merge and revert'
5971
6369
' backups, and failed selftest dirs.'),
5972
6370
Option('unknown',
5973
6371
help='Delete files unknown to bzr (default).'),
5975
6373
' deleting them.'),
5976
6374
Option('force', help='Do not prompt before deleting.')]
5977
6375
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6376
force=False, directory=u'.'):
5979
6377
from bzrlib.clean_tree import clean_tree
5980
6378
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6382
clean_tree(directory, unknown=unknown, ignored=ignored,
6383
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6386
class cmd_reference(Command):
6032
6430
self.outf.write('%s %s\n' % (path, location))
6433
class cmd_export_pot(Command):
6434
__doc__ = """Export command helps and error messages in po format."""
6439
from bzrlib.export_pot import export_pot
6440
export_pot(self.outf)
6035
6443
def _register_lazy_builtins():
6036
6444
# register lazy builtins from other modules; called at startup and should
6037
6445
# be only called once.
6038
6446
for (name, aliases, module_name) in [
6039
6447
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6448
('cmd_config', [], 'bzrlib.config'),
6040
6449
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6450
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6451
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6452
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6453
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6454
('cmd_verify_signatures', [],
6455
'bzrlib.commit_signature_commands'),
6456
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6458
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
