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
1351
takes_args = ['location?']
1353
Option('recursive', short_name='R',
1354
help='Recursively scan for branches rather than '
1355
'just looking in the specified location.')]
1357
def run(self, location=".", recursive=False):
1359
t = transport.get_transport(location)
1360
if not t.listable():
1361
raise errors.BzrCommandError(
1362
"Can't scan this type of location.")
1363
for b in bzrdir.BzrDir.find_branches(t):
1364
self.outf.write("%s\n" % urlutils.unescape_for_display(
1365
urlutils.relative_url(t.base, b.base),
1366
self.outf.encoding).rstrip("/"))
1368
dir = bzrdir.BzrDir.open_containing(location)[0]
1369
for branch in dir.list_branches():
1370
if branch.name is None:
1371
self.outf.write(gettext(" (default)\n"))
1373
self.outf.write(" %s\n" % branch.name.encode(
1374
self.outf.encoding))
1288
1377
class cmd_checkout(Command):
1289
1378
__doc__ = """Create a new checkout of an existing branch.
1331
1420
to_location = branch_location
1332
1421
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1333
1422
branch_location)
1423
if not (hardlink or files_from):
1424
# accelerator_tree is usually slower because you have to read N
1425
# files (no readahead, lots of seeks, etc), but allow the user to
1426
# explicitly request it
1427
accelerator_tree = None
1334
1428
revision = _get_one_revision('checkout', revision)
1335
if files_from is not None:
1429
if files_from is not None and files_from != branch_location:
1336
1430
accelerator_tree = WorkingTree.open(files_from)
1337
1431
if revision is not None:
1338
1432
revision_id = revision.as_revision_id(source)
1389
1481
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1392
This will perform a merge into the working tree, and may generate
1393
conflicts. If you have any local changes, you will still
1394
need to commit them after the update for the update to be complete.
1396
If you want to discard your local changes, you can just do a
1397
'bzr revert' instead of 'bzr commit' after the update.
1399
If the tree's branch is bound to a master branch, it will also update
1482
__doc__ = """Update a working tree to a new revision.
1484
This will perform a merge of the destination revision (the tip of the
1485
branch, or the specified revision) into the working tree, and then make
1486
that revision the basis revision for the working tree.
1488
You can use this to visit an older revision, or to update a working tree
1489
that is out of date from its branch.
1491
If there are any uncommitted changes in the tree, they will be carried
1492
across and remain as uncommitted changes after the update. To discard
1493
these changes, use 'bzr revert'. The uncommitted changes may conflict
1494
with the changes brought in by the change in basis revision.
1496
If the tree's branch is bound to a master branch, bzr will also update
1400
1497
the branch from the master.
1499
You cannot update just a single file or directory, because each Bazaar
1500
working tree has just a single basis revision. If you want to restore a
1501
file that has been removed locally, use 'bzr revert' instead of 'bzr
1502
update'. If you want to restore a file to its state in a previous
1503
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1504
out the old content of that file to a new location.
1506
The 'dir' argument, if given, must be the location of the root of a
1507
working tree to update. By default, the working tree that contains the
1508
current working directory is used.
1403
1511
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1512
takes_args = ['dir?']
1405
takes_options = ['revision']
1513
takes_options = ['revision',
1515
help="Show base revision text in conflicts."),
1406
1517
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1519
def run(self, dir=None, revision=None, show_base=None):
1409
1520
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1412
tree = WorkingTree.open_containing(dir)[0]
1521
raise errors.BzrCommandError(gettext(
1522
"bzr update --revision takes exactly one revision"))
1524
tree = WorkingTree.open_containing('.')[0]
1526
tree, relpath = WorkingTree.open_containing(dir)
1529
raise errors.BzrCommandError(gettext(
1530
"bzr update can only update a whole tree, "
1531
"not a file or subdirectory"))
1413
1532
branch = tree.branch
1414
1533
possible_transports = []
1415
1534
master = branch.get_master_branch(
1416
1535
possible_transports=possible_transports)
1417
1536
if master is not None:
1419
1537
branch_location = master.base
1540
branch_location = tree.branch.base
1421
1541
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1542
self.add_cleanup(tree.unlock)
1424
1543
# get rid of the final '/' and be ready for display
1425
1544
branch_location = urlutils.unescape_for_display(
1439
1558
revision_id = branch.last_revision()
1440
1559
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1441
1560
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))
1561
note(gettext("Tree is up to date at revision {0} of branch {1}"
1562
).format('.'.join(map(str, revno)), branch_location))
1445
1564
view_info = _get_view_info_for_change_reporter(tree)
1446
1565
change_reporter = delta._ChangeReporter(
1451
1570
change_reporter,
1452
1571
possible_transports=possible_transports,
1453
1572
revision=revision_id,
1574
show_base=show_base)
1455
1575
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1576
raise errors.BzrCommandError(gettext(
1457
1577
"branch has no revision %s\n"
1458
1578
"bzr update --revision only works"
1459
" for a revision in the branch history"
1579
" for a revision in the branch history")
1460
1580
% (e.revision))
1461
1581
revno = tree.branch.revision_id_to_dotted_revno(
1462
1582
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1583
note(gettext('Updated to revision {0} of branch {1}').format(
1584
'.'.join(map(str, revno)), branch_location))
1465
1585
parent_ids = tree.get_parent_ids()
1466
1586
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'.")
1587
note(gettext('Your local commits will now show as pending merges with '
1588
"'bzr status', and can be committed with 'bzr commit'."))
1469
1589
if conflicts != 0:
1519
1639
class cmd_remove(Command):
1520
1640
__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.
1642
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1643
delete them if they can easily be recovered using revert otherwise they
1644
will be backed up (adding an extention of the form .~#~). If no options or
1645
parameters are given Bazaar will scan for files that are being tracked by
1646
Bazaar but missing in your tree and stop tracking them for you.
1527
1648
takes_args = ['file*']
1528
1649
takes_options = ['verbose',
1530
1651
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1652
'The file deletion mode to be used.',
1532
1653
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1654
safe='Backup changed files (default).',
1535
1655
keep='Delete from bzr but leave the working copy.',
1656
no_backup='Don\'t backup changed files.',
1536
1657
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1658
'recovered and even if they are non-empty directories. '
1659
'(deprecated, use no-backup)')]
1538
1660
aliases = ['rm', 'del']
1539
1661
encoding_type = 'replace'
1541
1663
def run(self, file_list, verbose=False, new=False,
1542
1664
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1665
if file_deletion_strategy == 'force':
1666
note(gettext("(The --force option is deprecated, rather use --no-backup "
1668
file_deletion_strategy = 'no-backup'
1670
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1672
if file_list is not None:
1546
1673
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1675
self.add_cleanup(tree.lock_write().unlock)
1550
1676
# Heuristics should probably all move into tree.remove_smart or
1678
1810
last_revision = wt.last_revision()
1680
revision_ids = b.repository.get_ancestry(last_revision)
1682
for revision_id in revision_ids:
1812
self.add_cleanup(b.repository.lock_read().unlock)
1813
graph = b.repository.get_graph()
1814
revisions = [revid for revid, parents in
1815
graph.iter_ancestry([last_revision])]
1816
for revision_id in reversed(revisions):
1817
if _mod_revision.is_null(revision_id):
1683
1819
self.outf.write(revision_id + '\n')
1723
1859
Option('append-revisions-only',
1724
1860
help='Never change revnos or the existing log.'
1725
' Append revisions to it only.')
1861
' Append revisions to it only.'),
1863
'Create a branch without a working tree.')
1727
1865
def run(self, location=None, format=None, append_revisions_only=False,
1728
create_prefix=False):
1866
create_prefix=False, no_tree=False):
1729
1867
if format is None:
1730
1868
format = bzrdir.format_registry.make_bzrdir('default')
1731
1869
if location is None:
1765
1908
raise errors.BranchExistsWithoutWorkingTree(location)
1766
1909
raise errors.AlreadyBranchError(location)
1767
1910
branch = a_bzrdir.create_branch()
1768
a_bzrdir.create_workingtree()
1912
a_bzrdir.create_workingtree()
1769
1913
if append_revisions_only:
1771
1915
branch.set_append_revisions_only(True)
1772
1916
except errors.UpgradeRequired:
1773
raise errors.BzrCommandError('This branch format cannot be set'
1774
' to append-revisions-only. Try --default.')
1917
raise errors.BzrCommandError(gettext('This branch format cannot be set'
1918
' to append-revisions-only. Try --default.'))
1775
1919
if not is_quiet():
1776
1920
from bzrlib.info import describe_layout, describe_format
1781
1925
repository = branch.repository
1782
1926
layout = describe_layout(repository, branch, tree).lower()
1783
1927
format = describe_format(a_bzrdir, repository, branch, tree)
1784
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
1928
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1785
1930
if repository.is_shared():
1786
1931
#XXX: maybe this can be refactored into transport.path_or_url()
1787
1932
url = repository.bzrdir.root_transport.external_url()
1969
2131
elif ':' in prefix:
1970
2132
old_label, new_label = prefix.split(":")
1972
raise errors.BzrCommandError(
2134
raise errors.BzrCommandError(gettext(
1973
2135
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2136
' (eg "old/:new/")'))
1976
2138
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2139
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2140
' one or two revision specifiers'))
1980
2142
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2143
raise errors.BzrCommandError(gettext(
2144
'{0} and {1} are mutually exclusive').format(
2145
'--using', '--format'))
1984
2147
(old_tree, new_tree,
1985
2148
old_branch, new_branch,
1986
2149
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2150
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2151
# GNU diff on Windows uses ANSI encoding for filenames
2152
path_encoding = osutils.get_diff_header_encoding()
1988
2153
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2154
specific_files=specific_files,
1990
2155
external_diff_options=diff_options,
1991
2156
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2157
extra_trees=extra_trees,
2158
path_encoding=path_encoding,
1993
2160
format_cls=format)
2003
2170
# level of effort but possibly much less IO. (Or possibly not,
2004
2171
# if the directories are very large...)
2005
2172
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
2173
takes_options = ['directory', 'show-ids']
2008
2175
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2176
def run(self, show_ids=False, directory=u'.'):
2177
tree = WorkingTree.open_containing(directory)[0]
2178
self.add_cleanup(tree.lock_read().unlock)
2013
2179
old = tree.basis_tree()
2015
self.add_cleanup(old.unlock)
2180
self.add_cleanup(old.lock_read().unlock)
2016
2181
for path, ie in old.inventory.iter_entries():
2017
2182
if not tree.has_id(ie.file_id):
2018
2183
self.outf.write(path)
2030
2195
_see_also = ['status', 'ls']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2196
takes_options = ['directory', 'null']
2037
2198
@display_command
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2199
def run(self, null=False, directory=u'.'):
2200
tree = WorkingTree.open_containing(directory)[0]
2201
self.add_cleanup(tree.lock_read().unlock)
2040
2202
td = tree.changes_from(tree.basis_tree())
2041
2204
for path, id, kind, text_modified, meta_modified in td.modified:
2043
2206
self.outf.write(path + '\0')
2053
2216
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2217
takes_options = ['directory', 'null']
2060
2219
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2220
def run(self, null=False, directory=u'.'):
2221
wt = WorkingTree.open_containing(directory)[0]
2222
self.add_cleanup(wt.lock_read().unlock)
2065
2223
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2224
self.add_cleanup(basis.lock_read().unlock)
2068
2225
basis_inv = basis.inventory
2069
2226
inv = wt.inventory
2070
2227
for file_id in inv:
2071
if file_id in basis_inv:
2228
if basis_inv.has_id(file_id):
2073
2230
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2232
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2233
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2236
self.outf.write(path + '\0')
2279
2439
help='Show just the specified revision.'
2280
2440
' See also "help revisionspec".'),
2442
RegistryOption('authors',
2443
'What names to list as authors - first, all or committer.',
2445
lazy_registry=('bzrlib.log', 'author_list_registry'),
2282
2447
Option('levels',
2283
2448
short_name='n',
2284
2449
help='Number of levels to display - 0 for all, 1 for flat.',
2286
2451
type=_parse_levels),
2287
2452
Option('message',
2289
2453
help='Show revisions whose message matches this '
2290
2454
'regular expression.',
2292
2457
Option('limit',
2293
2458
short_name='l',
2294
2459
help='Limit the output to the first N revisions.',
2297
2462
Option('show-diff',
2298
2463
short_name='p',
2299
2464
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2465
Option('include-merged',
2301
2466
help='Show merged revisions like --levels 0 does.'),
2467
Option('include-merges', hidden=True,
2468
help='Historical alias for --include-merged.'),
2469
Option('omit-merges',
2470
help='Do not report commits with more than one parent.'),
2302
2471
Option('exclude-common-ancestry',
2303
2472
help='Display only the revisions that are not part'
2304
2473
' of both ancestries (require -rX..Y)'
2475
Option('signatures',
2476
help='Show digital signature validity'),
2479
help='Show revisions whose properties match this '
2482
ListOption('match-message',
2483
help='Show revisions whose message matches this '
2486
ListOption('match-committer',
2487
help='Show revisions whose committer matches this '
2490
ListOption('match-author',
2491
help='Show revisions whose authors match this '
2494
ListOption('match-bugs',
2495
help='Show revisions whose bugs match this '
2307
2499
encoding_type = 'replace'
2327
2528
_get_info_for_log_files,
2329
2530
direction = (forward and 'forward') or 'reverse'
2531
if symbol_versioning.deprecated_passed(include_merges):
2532
ui.ui_factory.show_user_warning(
2533
'deprecated_command_option',
2534
deprecated_name='--include-merges',
2535
recommended_name='--include-merged',
2536
deprecated_in_version='2.5',
2537
command=self.invoked_as)
2538
if include_merged is None:
2539
include_merged = include_merges
2541
raise errors.BzrCommandError(gettext(
2542
'{0} and {1} are mutually exclusive').format(
2543
'--include-merges', '--include-merged'))
2544
if include_merged is None:
2545
include_merged = False
2330
2546
if (exclude_common_ancestry
2331
2547
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2548
raise errors.BzrCommandError(gettext(
2549
'--exclude-common-ancestry requires -r with two revisions'))
2335
2551
if levels is None:
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2554
raise errors.BzrCommandError(gettext(
2555
'{0} and {1} are mutually exclusive').format(
2556
'--levels', '--include-merged'))
2341
2558
if change is not None:
2342
2559
if len(change) > 1:
2343
2560
raise errors.RangeInChangeOption()
2344
2561
if revision is not None:
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2562
raise errors.BzrCommandError(gettext(
2563
'{0} and {1} are mutually exclusive').format(
2564
'--revision', '--change'))
2348
2566
revision = change
2353
2571
# find the file ids to log and check for directory filtering
2354
2572
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2573
revision, file_list, self.add_cleanup)
2357
2574
for relpath, file_id, kind in file_info_list:
2358
2575
if file_id is None:
2359
raise errors.BzrCommandError(
2360
"Path unknown at end or start of revision range: %s" %
2576
raise errors.BzrCommandError(gettext(
2577
"Path unknown at end or start of revision range: %s") %
2362
2579
# If the relpath is the top of the tree, we log everything
2363
2580
if relpath == '':
2378
2595
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
2596
b = dir.open_branch()
2381
self.add_cleanup(b.unlock)
2597
self.add_cleanup(b.lock_read().unlock)
2382
2598
rev1, rev2 = _get_revision_range(revision, b, self.name())
2600
if b.get_config().validate_signatures_in_log():
2604
if not gpg.GPGStrategy.verify_signatures_available():
2605
raise errors.GpgmeNotInstalled(None)
2384
2607
# Decide on the type of delta & diff filtering to use
2385
2608
# TODO: add an --all-files option to make this configurable & consistent
2386
2609
if not verbose:
2430
2666
start_revision=rev1, end_revision=rev2, limit=limit,
2431
2667
message_search=message, delta_type=delta_type,
2432
2668
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2433
exclude_common_ancestry=exclude_common_ancestry,
2669
exclude_common_ancestry=exclude_common_ancestry, match=match_dict,
2670
signature=signatures, omit_merges=omit_merges,
2435
2672
Logger(b, rqst).show(lf)
2453
2690
# b is taken from revision[0].get_branch(), and
2454
2691
# show_log will use its revision_history. Having
2455
2692
# different branches will lead to weird behaviors.
2456
raise errors.BzrCommandError(
2693
raise errors.BzrCommandError(gettext(
2457
2694
"bzr %s doesn't accept two revisions in different"
2458
" branches." % command_name)
2695
" branches.") % command_name)
2459
2696
if start_spec.spec is None:
2460
2697
# Avoid loading all the history.
2461
2698
rev1 = RevisionInfo(branch, None, None)
2528
2764
help='Recurse into subdirectories.'),
2529
2765
Option('from-root',
2530
2766
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2767
Option('unknown', short_name='u',
2768
help='Print unknown files.'),
2532
2769
Option('versioned', help='Print versioned files.',
2533
2770
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.'),
2771
Option('ignored', short_name='i',
2772
help='Print ignored files.'),
2773
Option('kind', short_name='k',
2539
2774
help='List entries of a particular kind: file, directory, symlink.',
2543
2780
@display_command
2544
2781
def run(self, revision=None, verbose=False,
2545
2782
recursive=False, from_root=False,
2546
2783
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2784
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2786
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2787
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
2789
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2790
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
2791
all = not (unknown or versioned or ignored)
2556
2793
selection = {'I':ignored, '?':unknown, 'V':versioned}
2583
2820
apply_view = True
2584
2821
view_str = views.view_display_str(view_files)
2585
note("Ignoring files outside view. View is %s" % view_str)
2822
note(gettext("Ignoring files outside view. View is %s") % view_str)
2588
self.add_cleanup(tree.unlock)
2824
self.add_cleanup(tree.lock_read().unlock)
2589
2825
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
2826
from_dir=relpath, recursive=recursive):
2591
2827
# Apply additional masking
2713
2959
_see_also = ['status', 'ignored', 'patterns']
2714
2960
takes_args = ['name_pattern*']
2961
takes_options = ['directory',
2716
2962
Option('default-rules',
2717
2963
help='Display the default ignore rules that bzr uses.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2966
def run(self, name_pattern_list=None, default_rules=None,
2721
2968
from bzrlib import ignores
2722
2969
if default_rules is not None:
2723
2970
# dump the default rules and exit
2725
2972
self.outf.write("%s\n" % pattern)
2727
2974
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2975
raise errors.BzrCommandError(gettext("ignore requires at least one "
2976
"NAME_PATTERN or --default-rules."))
2730
2977
name_pattern_list = [globbing.normalize_pattern(p)
2731
2978
for p in name_pattern_list]
2980
bad_patterns_count = 0
2981
for p in name_pattern_list:
2982
if not globbing.Globster.is_pattern_valid(p):
2983
bad_patterns_count += 1
2984
bad_patterns += ('\n %s' % p)
2986
msg = (ngettext('Invalid ignore pattern found. %s',
2987
'Invalid ignore patterns found. %s',
2988
bad_patterns_count) % bad_patterns)
2989
ui.ui_factory.show_error(msg)
2990
raise errors.InvalidPattern('')
2732
2991
for name_pattern in name_pattern_list:
2733
2992
if (name_pattern[0] == '/' or
2734
2993
(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'.')
2994
raise errors.BzrCommandError(gettext(
2995
"NAME_PATTERN should not be an absolute path"))
2996
tree, relpath = WorkingTree.open_containing(directory)
2738
2997
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
2998
ignored = globbing.Globster(name_pattern_list)
3000
self.add_cleanup(tree.lock_read().unlock)
2742
3001
for entry in tree.list_files():
2744
3003
if id is not None:
2745
3004
filename = entry[0]
2746
3005
if ignored.match(filename):
2747
3006
matches.append(filename)
2749
3007
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3008
self.outf.write(gettext("Warning: the following files are version "
3009
"controlled and match your ignore pattern:\n%s"
2752
3010
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3011
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2756
3014
class cmd_ignored(Command):
2767
3025
encoding_type = 'replace'
2768
3026
_see_also = ['ignore', 'ls']
3027
takes_options = ['directory']
2770
3029
@display_command
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
3030
def run(self, directory=u'.'):
3031
tree = WorkingTree.open_containing(directory)[0]
3032
self.add_cleanup(tree.lock_read().unlock)
2775
3033
for path, file_class, kind, file_id, entry in tree.list_files():
2776
3034
if file_class != 'I':
2844
3104
'revision in which it was changed.'),
2846
3106
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
3107
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2848
3108
from bzrlib.export import export
2850
3110
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
3111
tree = WorkingTree.open_containing(directory)[0]
2852
3112
b = tree.branch
2885
3145
@display_command
2886
3146
def run(self, filename, revision=None, name_from_revision=False,
3147
filters=False, directory=None):
2888
3148
if revision is not None and len(revision) != 1:
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3149
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3150
" one revision specifier"))
2891
3151
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3152
_open_directory_or_containing_tree_or_branch(filename, directory)
3153
self.add_cleanup(branch.lock_read().unlock)
2895
3154
return self._run(tree, branch, relpath, filename, revision,
2896
3155
name_from_revision, filters)
2900
3159
if tree is None:
2901
3160
tree = b.basis_tree()
2902
3161
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3162
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3164
old_file_id = rev_tree.path2id(relpath)
3166
# TODO: Split out this code to something that generically finds the
3167
# best id for a path across one or more trees; it's like
3168
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3170
if name_from_revision:
2909
3171
# Try in revision if requested
2910
3172
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3173
raise errors.BzrCommandError(gettext(
3174
"{0!r} is not present in revision {1}").format(
2913
3175
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3177
actual_file_id = old_file_id
2917
3179
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" % (
3180
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3181
actual_file_id = cur_file_id
3182
elif old_file_id is not None:
3183
actual_file_id = old_file_id
3185
raise errors.BzrCommandError(gettext(
3186
"{0!r} is not present in revision {1}").format(
2935
3187
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)
3189
from bzrlib.filter_tree import ContentFilterTree
3190
filter_tree = ContentFilterTree(rev_tree,
3191
rev_tree._content_filter_stack)
3192
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3194
content = rev_tree.get_file_text(actual_file_id)
3196
self.outf.write(content)
2952
3199
class cmd_local_time_offset(Command):
3013
3260
to trigger updates to external systems like bug trackers. The --fixes
3014
3261
option can be used to record the association between a revision and
3015
3262
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
3265
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3266
takes_args = ['selected*']
3076
3298
Option('show-diff', short_name='p',
3077
3299
help='When no message is supplied, show the diff along'
3078
3300
' with the status summary in the message editor.'),
3302
help='When committing to a foreign version control '
3303
'system do not push data that can not be natively '
3080
3306
aliases = ['ci', 'checkin']
3082
3308
def _iter_bug_fix_urls(self, fixes, branch):
3309
default_bugtracker = None
3083
3310
# Configure the properties for bug fixing attributes.
3084
3311
for fixed_bug in fixes:
3085
3312
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3313
if len(tokens) == 1:
3314
if default_bugtracker is None:
3315
branch_config = branch.get_config()
3316
default_bugtracker = branch_config.get_user_option(
3318
if default_bugtracker is None:
3319
raise errors.BzrCommandError(gettext(
3320
"No tracker specified for bug %s. Use the form "
3321
"'tracker:id' or specify a default bug tracker "
3322
"using the `bugtracker` option.\nSee "
3323
"\"bzr help bugs\" for more information on this "
3324
"feature. Commit refused.") % fixed_bug)
3325
tag = default_bugtracker
3327
elif len(tokens) != 2:
3328
raise errors.BzrCommandError(gettext(
3088
3329
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
3330
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3331
"feature.\nCommit refused.") % fixed_bug)
3333
tag, bug_id = tokens
3093
3335
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
3336
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3337
raise errors.BzrCommandError(gettext(
3338
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3097
3339
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3340
raise errors.BzrCommandError(gettext(
3341
"%s\nCommit refused.") % (str(e),))
3101
3343
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3344
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3345
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3347
from bzrlib.errors import (
3105
3348
PointlessCommit,
3106
3349
ConflictsInTree,
3118
3362
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3119
3363
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.
3364
raise errors.BzrCommandError(gettext(
3365
"Could not parse --commit-time: " + str(e)))
3129
3367
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3369
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3370
if selected_list == ['']:
3133
3371
# workaround - commit of root of tree should be exactly the same
3134
3372
# as just default commit in that tree, and succeed even though
3163
3401
message = message.replace('\r\n', '\n')
3164
3402
message = message.replace('\r', '\n')
3166
raise errors.BzrCommandError(
3167
"please specify either --message or --file")
3404
raise errors.BzrCommandError(gettext(
3405
"please specify either --message or --file"))
3169
3407
def get_message(commit_obj):
3170
3408
"""Callback to get commit message"""
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3412
my_message = f.read().decode(osutils.get_user_encoding())
3174
3415
elif message is not None:
3175
3416
my_message = message
3184
3425
# make_commit_message_template_encoded returns user encoding.
3185
3426
# 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")
3428
my_message = set_commit_message(commit_obj)
3429
if my_message is None:
3430
start_message = generate_commit_message_template(commit_obj)
3431
my_message = edit_commit_message_encoded(text,
3432
start_message=start_message)
3433
if my_message is None:
3434
raise errors.BzrCommandError(gettext("please specify a commit"
3435
" message with either --message or --file"))
3436
if my_message == "":
3437
raise errors.BzrCommandError(gettext("Empty commit message specified."
3438
" Please specify a commit message with either"
3439
" --message or --file or leave a blank message"
3440
" with --message \"\"."))
3195
3441
return my_message
3197
3443
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3451
reporter=None, verbose=verbose, revprops=properties,
3206
3452
authors=author, timestamp=commit_stamp,
3207
3453
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3454
exclude=tree.safe_relpath_files(exclude),
3209
3456
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3457
raise errors.BzrCommandError(gettext("No changes to commit."
3458
" Please 'bzr add' the files you want to commit, or use"
3459
" --unchanged to force an empty commit."))
3212
3460
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3461
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3214
3462
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3216
3464
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3465
raise errors.BzrCommandError(gettext("Commit refused because there are"
3466
" unknown files in the working tree."))
3219
3467
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3468
e.extra_help = (gettext("\n"
3221
3469
'To commit to master branch, run update and then commit.\n'
3222
3470
'You can also pass --local to commit to continue working '
3297
3545
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.
3546
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3548
When the default format has changed after a major new release of
3549
Bazaar, you may be informed during certain operations that you
3550
should upgrade. Upgrading to a newer format may improve performance
3551
or make new features available. It may however limit interoperability
3552
with older repositories or with older versions of Bazaar.
3554
If you wish to upgrade to a particular format rather than the
3555
current default, that can be specified using the --format option.
3556
As a consequence, you can use the upgrade command this way to
3557
"downgrade" to an earlier format, though some conversions are
3558
a one way process (e.g. changing from the 1.x default to the
3559
2.x default) so downgrading is not always possible.
3561
A backup.bzr.~#~ directory is created at the start of the conversion
3562
process (where # is a number). By default, this is left there on
3563
completion. If the conversion fails, delete the new .bzr directory
3564
and rename this one back in its place. Use the --clean option to ask
3565
for the backup.bzr directory to be removed on successful conversion.
3566
Alternatively, you can delete it by hand if everything looks good
3569
If the location given is a shared repository, dependent branches
3570
are also converted provided the repository converts successfully.
3571
If the conversion of a branch fails, remaining branches are still
3574
For more information on upgrades, see the Bazaar Upgrade Guide,
3575
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3578
_see_also = ['check', 'reconcile', 'formats']
3306
3579
takes_args = ['url?']
3307
3580
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'),
3581
RegistryOption('format',
3582
help='Upgrade to a specific format. See "bzr help'
3583
' formats" for details.',
3584
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3585
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3586
value_switches=True, title='Branch format'),
3588
help='Remove the backup.bzr directory if successful.'),
3590
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3593
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3594
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3595
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3597
if len(exceptions) == 1:
3598
# Compatibility with historical behavior
3321
3604
class cmd_whoami(Command):
3340
3624
encoding_type = 'replace'
3342
3626
@display_command
3343
def run(self, email=False, branch=False, name=None):
3627
def run(self, email=False, branch=False, name=None, directory=None):
3344
3628
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()
3629
if directory is None:
3630
# use branch if we're inside one; otherwise global config
3632
c = Branch.open_containing(u'.')[0].get_config()
3633
except errors.NotBranchError:
3634
c = _mod_config.GlobalConfig()
3636
c = Branch.open(directory).get_config()
3351
3638
self.outf.write(c.user_email() + '\n')
3353
3640
self.outf.write(c.username() + '\n')
3644
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3647
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3649
_mod_config.extract_email_address(name)
3359
3650
except errors.NoEmailInUsername, e:
3360
3651
warning('"%s" does not seem to contain an email address. '
3361
3652
'This is allowed, but not recommended.', name)
3363
3654
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3656
if directory is None:
3657
c = Branch.open_containing(u'.')[0].get_config()
3659
c = Branch.open(directory).get_config()
3367
c = config.GlobalConfig()
3661
c = _mod_config.GlobalConfig()
3368
3662
c.set_user_option('email', name)
3433
3728
def remove_alias(self, alias_name):
3434
3729
if alias_name is None:
3435
raise errors.BzrCommandError(
3436
'bzr alias --remove expects an alias to remove.')
3730
raise errors.BzrCommandError(gettext(
3731
'bzr alias --remove expects an alias to remove.'))
3437
3732
# If alias is not found, print something like:
3438
3733
# unalias: foo: not found
3439
c = config.GlobalConfig()
3734
c = _mod_config.GlobalConfig()
3440
3735
c.unset_alias(alias_name)
3442
3737
@display_command
3443
3738
def print_aliases(self):
3444
3739
"""Print out the defined aliases in a similar format to bash."""
3445
aliases = config.GlobalConfig().get_aliases()
3740
aliases = _mod_config.GlobalConfig().get_aliases()
3446
3741
for key, value in sorted(aliases.iteritems()):
3447
3742
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3515
3813
if typestring == "sftp":
3516
3814
from bzrlib.tests import stub_sftp
3517
3815
return stub_sftp.SFTPAbsoluteServer
3518
if typestring == "memory":
3816
elif typestring == "memory":
3519
3817
from bzrlib.tests import test_server
3520
3818
return memory.MemoryServer
3521
if typestring == "fakenfs":
3819
elif typestring == "fakenfs":
3522
3820
from bzrlib.tests import test_server
3523
3821
return test_server.FakeNFSServer
3524
3822
msg = "No known transport type %s. Supported types are: sftp\n" %\
3537
3835
'throughout the test suite.',
3538
3836
type=get_transport_type),
3539
3837
Option('benchmark',
3540
help='Run the benchmarks rather than selftests.'),
3838
help='Run the benchmarks rather than selftests.',
3541
3840
Option('lsprof-timed',
3542
3841
help='Generate lsprof output for benchmarked'
3543
3842
' sections of code.'),
3544
3843
Option('lsprof-tests',
3545
3844
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3549
3845
Option('first',
3550
3846
help='Run all tests, but run specified tests first.',
3551
3847
short_name='f',
3560
3856
Option('randomize', type=str, argname="SEED",
3561
3857
help='Randomize the order of tests using the given'
3562
3858
' seed or "now" for the current time.'),
3563
Option('exclude', type=str, argname="PATTERN",
3565
help='Exclude tests that match this regular'
3859
ListOption('exclude', type=str, argname="PATTERN",
3861
help='Exclude tests that match this regular'
3567
3863
Option('subunit',
3568
3864
help='Output test progress via subunit.'),
3569
3865
Option('strict', help='Fail on missing dependencies or '
3586
3885
def run(self, testspecs_list=None, verbose=False, one=False,
3587
3886
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
3888
first=False, list_only=False,
3590
3889
randomize=None, exclude=None, strict=False,
3591
3890
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)
3891
parallel=None, lsprof_tests=False,
3893
from bzrlib import tests
3602
3895
if testspecs_list is not None:
3603
3896
pattern = '|'.join(testspecs_list)
3608
3901
from bzrlib.tests import SubUnitBzrRunner
3609
3902
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3903
raise errors.BzrCommandError(gettext("subunit not available. subunit "
3904
"needs to be installed to use --subunit."))
3612
3905
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3906
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3907
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3908
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3909
# following code can be deleted when it's sufficiently deployed
3910
# -- vila/mgz 20100514
3911
if (sys.platform == "win32"
3912
and getattr(sys.stdout, 'fileno', None) is not None):
3617
3914
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
3916
self.additional_selftest_args.setdefault(
3620
3917
'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)
3919
raise errors.BzrCommandError(gettext(
3920
"--benchmark is no longer supported from bzr 2.2; "
3921
"use bzr-usertest instead"))
3922
test_suite_factory = None
3924
exclude_pattern = None
3629
test_suite_factory = None
3926
exclude_pattern = '(' + '|'.join(exclude) + ')'
3928
self._disable_fsync()
3631
3929
selftest_kwargs = {"verbose": verbose,
3632
3930
"pattern": pattern,
3633
3931
"stop_on_failure": one,
3635
3933
"test_suite_factory": test_suite_factory,
3636
3934
"lsprof_timed": lsprof_timed,
3637
3935
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
3936
"matching_tests_first": first,
3640
3937
"list_only": list_only,
3641
3938
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3939
"exclude_pattern": exclude_pattern,
3643
3940
"strict": strict,
3644
3941
"load_list": load_list,
3645
3942
"debug_flags": debugflag,
3646
3943
"starting_with": starting_with
3648
3945
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3947
# Make deprecation warnings visible, unless -Werror is set
3948
cleanup = symbol_versioning.activate_deprecation_warnings(
3951
result = tests.selftest(**selftest_kwargs)
3650
3954
return int(not result)
3956
def _disable_fsync(self):
3957
"""Change the 'os' functionality to not synchronize."""
3958
self._orig_fsync = getattr(os, 'fsync', None)
3959
if self._orig_fsync is not None:
3960
os.fsync = lambda filedes: None
3961
self._orig_fdatasync = getattr(os, 'fdatasync', None)
3962
if self._orig_fdatasync is not None:
3963
os.fdatasync = lambda filedes: None
3653
3966
class cmd_version(Command):
3654
3967
__doc__ = """Show version of bzr."""
3691
4004
branch1 = Branch.open_containing(branch)[0]
3692
4005
branch2 = Branch.open_containing(other)[0]
3694
self.add_cleanup(branch1.unlock)
3696
self.add_cleanup(branch2.unlock)
4006
self.add_cleanup(branch1.lock_read().unlock)
4007
self.add_cleanup(branch2.lock_read().unlock)
3697
4008
last1 = ensure_null(branch1.last_revision())
3698
4009
last2 = ensure_null(branch2.last_revision())
3700
4011
graph = branch1.repository.get_graph(branch2.repository)
3701
4012
base_rev_id = graph.find_unique_lca(last1, last2)
3703
self.outf.write('merge base is revision %s\n' % base_rev_id)
4014
self.outf.write(gettext('merge base is revision %s\n') % base_rev_id)
3706
4017
class cmd_merge(Command):
3709
4020
The source of the merge can be specified either in the form of a branch,
3710
4021
or in the form of a path to a file containing a merge directive generated
3711
4022
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.
4023
or the branch most recently merged using --remember. The source of the
4024
merge may also be specified in the form of a path to a file in another
4025
branch: in this case, only the modifications to that file are merged into
4026
the current working tree.
4028
When merging from a branch, by default bzr will try to merge in all new
4029
work from the other branch, automatically determining an appropriate base
4030
revision. If this fails, you may need to give an explicit base.
4032
To pick a different ending revision, pass "--revision OTHER". bzr will
4033
try to merge in all new work up to and including revision OTHER.
4035
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4036
through OTHER, excluding BASE but including OTHER, will be merged. If this
4037
causes some revisions to be skipped, i.e. if the destination branch does
4038
not already contain revision BASE, such a merge is commonly referred to as
4039
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4040
cherrypicks. The changes look like a normal commit, and the history of the
4041
changes from the other branch is not stored in the commit.
4043
Revision numbers are always relative to the source branch.
3725
4045
Merge will do its best to combine the changes in two branches, but there
3726
4046
are some kinds of problems only a human can fix. When it encounters those,
3730
4050
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.
4052
If there is no default branch set, the first merge will set it (use
4053
--no-remember to avoid setting it). After that, you can omit the branch
4054
to use the default. To change the default, use --remember. The value will
4055
only be saved if the remote location can be accessed.
3737
4057
The results of the merge are placed into the destination working
3738
4058
directory, where they can be reviewed (with bzr diff), tested, and then
3739
4059
committed to record the result of the merge.
3741
4061
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
4062
--force is given. If --force is given, then the changes from the source
4063
will be merged with the current working tree, including any uncommitted
4064
changes in the tree. The --force option can also be used to create a
3743
4065
merge revision which has more than two parents.
3745
4067
If one would like to merge changes from the working tree of the other
3793
4115
' completely merged into the source, pull from the'
3794
4116
' source rather than merging. When this happens,'
3795
4117
' you do not need to commit the result.'),
4118
custom_help('directory',
3797
4119
help='Branch to merge into, '
3798
'rather than the one containing the working directory.',
4120
'rather than the one containing the working directory.'),
3802
4121
Option('preview', help='Instead of merging, show a diff of the'
3804
4123
Option('interactive', help='Select changes interactively.',
3847
4169
mergeable = None
3849
4171
if uncommitted:
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
4172
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4173
' with bundles or merge directives.'))
3853
4175
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
4176
raise errors.BzrCommandError(gettext(
4177
'Cannot use -r with merge directives or bundles'))
3856
4178
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3857
4179
mergeable, None)
3859
4181
if merger is None and uncommitted:
3860
4182
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
4183
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4184
' --revision at the same time.'))
3863
4185
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
4186
allow_pending = False
3873
4195
self.sanity_check_merger(merger)
3874
4196
if (merger.base_rev_id == merger.other_rev_id and
3875
4197
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4198
# check if location is a nonexistent file (and not a branch) to
4199
# disambiguate the 'Nothing to do'
4200
if merger.interesting_files:
4201
if not merger.other_tree.has_filename(
4202
merger.interesting_files[0]):
4203
note(gettext("merger: ") + str(merger))
4204
raise errors.PathsDoNotExist([location])
4205
note(gettext('Nothing to do.'))
4207
if pull and not preview:
3879
4208
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4209
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4210
if (merger.base_rev_id == tree.last_revision()):
3882
4211
result = tree.pull(merger.other_branch, False,
3883
4212
merger.other_rev_id)
3884
4213
result.report(self.outf)
3886
4215
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4216
raise errors.BzrCommandError(gettext(
3888
4217
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4218
" (perhaps you would prefer 'bzr pull')"))
3891
4220
return self._do_preview(merger)
3892
4221
elif interactive:
3905
4234
def _do_preview(self, merger):
3906
4235
from bzrlib.diff import show_diff_trees
3907
4236
result_tree = self._get_preview(merger)
4237
path_encoding = osutils.get_diff_header_encoding()
3908
4238
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
4239
old_label='', new_label='',
4240
path_encoding=path_encoding)
3911
4242
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
4243
merger.change_reporter = change_reporter
3950
4281
# Use reprocess if the merger supports it
3951
4282
merger.reprocess = merger.merge_type.supports_reprocess
3952
4283
if merger.reprocess and not merger.merge_type.supports_reprocess:
3953
raise errors.BzrCommandError("Conflict reduction is not supported"
3954
" for merge type %s." %
4284
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4285
" for merge type %s.") %
3955
4286
merger.merge_type)
3956
4287
if merger.reprocess and merger.show_base:
3957
raise errors.BzrCommandError("Cannot do conflict reduction and"
4288
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
3960
4291
def _get_merger_from_branch(self, tree, location, revision, remember,
3961
4292
possible_transports, pb):
3988
4319
if other_revision_id is None:
3989
4320
other_revision_id = _mod_revision.ensure_null(
3990
4321
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):
4322
# Remember where we merge from. We need to remember if:
4323
# - user specify a location (and we don't merge from the parent
4325
# - user ask to remember or there is no previous location set to merge
4326
# from and user didn't ask to *not* remember
4327
if (user_location is not None
4329
or (remember is None
4330
and tree.branch.get_submit_branch() is None)))):
3994
4331
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4332
# Merge tags (but don't set them in the master branch yet, the user
4333
# might revert this merge). Commit will propagate them.
4334
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4335
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4336
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4337
if other_path != '':
4057
4396
stored_location_type = "parent"
4058
4397
mutter("%s", stored_location)
4059
4398
if stored_location is None:
4060
raise errors.BzrCommandError("No location specified or remembered")
4399
raise errors.BzrCommandError(gettext("No location specified or remembered"))
4061
4400
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)
4401
note(gettext("{0} remembered {1} location {2}").format(verb_string,
4402
stored_location_type, display_url))
4064
4403
return stored_location
4099
4438
from bzrlib.conflicts import restore
4100
4439
if merge_type is None:
4101
4440
merge_type = _mod_merge.Merge3Merger
4102
tree, file_list = tree_files(file_list)
4104
self.add_cleanup(tree.unlock)
4441
tree, file_list = WorkingTree.open_containing_paths(file_list)
4442
self.add_cleanup(tree.lock_write().unlock)
4105
4443
parents = tree.get_parent_ids()
4106
4444
if len(parents) != 2:
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4445
raise errors.BzrCommandError(gettext("Sorry, remerge only works after normal"
4108
4446
" merges. Not cherrypicking or"
4110
4448
repository = tree.branch.repository
4111
4449
interesting_ids = None
4112
4450
new_conflicts = []
4167
4505
last committed revision is used.
4169
4507
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.
4508
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4509
will remove the changes introduced by the second last commit (-2), without
4510
affecting the changes introduced by the last commit (-1). To remove
4511
certain changes on a hunk-by-hunk basis, see the shelve command.
4174
4513
By default, any files that have been manually changed will be backed up
4175
4514
first. (Files changed only by merge are not backed up.) Backup files have
4340
4681
theirs_only=False,
4341
4682
log_format=None, long=False, short=False, line=False,
4342
4683
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4684
include_merged=None, revision=None, my_revision=None,
4686
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4344
4687
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4688
def message(s):
4346
4689
if not is_quiet():
4347
4690
self.outf.write(s)
4692
if symbol_versioning.deprecated_passed(include_merges):
4693
ui.ui_factory.show_user_warning(
4694
'deprecated_command_option',
4695
deprecated_name='--include-merges',
4696
recommended_name='--include-merged',
4697
deprecated_in_version='2.5',
4698
command=self.invoked_as)
4699
if include_merged is None:
4700
include_merged = include_merges
4702
raise errors.BzrCommandError(gettext(
4703
'{0} and {1} are mutually exclusive').format(
4704
'--include-merges', '--include-merged'))
4705
if include_merged is None:
4706
include_merged = False
4350
4708
mine_only = this
4359
4717
elif theirs_only:
4360
4718
restrict = 'remote'
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4720
local_branch = Branch.open_containing(directory)[0]
4721
self.add_cleanup(local_branch.lock_read().unlock)
4366
4723
parent = local_branch.get_parent()
4367
4724
if other_branch is None:
4368
4725
other_branch = parent
4369
4726
if other_branch is None:
4370
raise errors.BzrCommandError("No peer location known"
4727
raise errors.BzrCommandError(gettext("No peer location known"
4372
4729
display_url = urlutils.unescape_for_display(parent,
4373
4730
self.outf.encoding)
4374
message("Using saved parent location: "
4375
+ display_url + "\n")
4731
message(gettext("Using saved parent location: {0}\n").format(
4377
4734
remote_branch = Branch.open(other_branch)
4378
4735
if remote_branch.base == local_branch.base:
4379
4736
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4738
self.add_cleanup(remote_branch.lock_read().unlock)
4384
4740
local_revid_range = _revision_range_to_revid_range(
4385
4741
_get_revision_range(my_revision, local_branch,
4430
4790
if mine_only and not local_extra:
4431
4791
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4792
message(gettext('This branch has no new revisions.\n'))
4433
4793
elif theirs_only and not remote_extra:
4434
4794
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4795
message(gettext('Other branch has no new revisions.\n'))
4436
4796
elif not (mine_only or theirs_only or local_extra or
4438
4798
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
4800
message(gettext("Branches are up to date.\n"))
4441
4801
self.cleanup_now()
4442
4802
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)
4803
self.add_cleanup(local_branch.lock_write().unlock)
4445
4804
# handle race conditions - a parent might be set while we run.
4446
4805
if local_branch.get_parent() is None:
4447
4806
local_branch.set_parent(remote_branch.base)
4507
4866
@display_command
4508
4867
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")
4868
from bzrlib import plugin
4869
# Don't give writelines a generator as some codecs don't like that
4870
self.outf.writelines(
4871
list(plugin.describe_plugins(show_paths=verbose)))
4531
4874
class cmd_testament(Command):
4578
4920
Option('long', help='Show commit date in annotations.'),
4582
4925
encoding_type = 'exact'
4584
4927
@display_command
4585
4928
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4929
show_ids=False, directory=None):
4930
from bzrlib.annotate import (
4588
4933
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4934
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
4935
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4936
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4938
self.add_cleanup(branch.lock_read().unlock)
4596
4939
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4940
self.add_cleanup(tree.lock_read().unlock)
4941
if wt is not None and revision is None:
4600
4942
file_id = wt.path2id(relpath)
4602
4944
file_id = tree.path2id(relpath)
4603
4945
if file_id is None:
4604
4946
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
4947
if wt is not None and revision is None:
4607
4948
# If there is a tree and we're not annotating historical
4608
4949
# versions, annotate the working tree's content.
4609
4950
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
4951
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4953
annotate_file_tree(tree, file_id, self.outf, long, all,
4954
show_ids=show_ids, branch=branch)
4616
4957
class cmd_re_sign(Command):
4620
4961
hidden = True # is this right ?
4621
4962
takes_args = ['revision_id*']
4622
takes_options = ['revision']
4963
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
4965
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
4966
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')
4967
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
4968
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)
4969
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
4970
b = WorkingTree.open_containing(directory)[0].branch
4971
self.add_cleanup(b.lock_write().unlock)
4632
4972
return self._run(b, revision_id_list, revision)
4634
4974
def _run(self, b, revision_id_list, revision):
4694
5034
_see_also = ['checkouts', 'unbind']
4695
5035
takes_args = ['location?']
5036
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5038
def run(self, location=None, directory=u'.'):
5039
b, relpath = Branch.open_containing(directory)
4700
5040
if location is None:
4702
5042
location = b.get_old_bound_location()
4703
5043
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5044
raise errors.BzrCommandError(gettext('No location supplied. '
5045
'This format does not remember old locations.'))
4707
5047
if location is None:
4708
5048
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5049
raise errors.BzrCommandError(gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5051
raise errors.BzrCommandError(gettext('No location supplied '
5052
'and no previous location known'))
4713
5053
b_other = Branch.open(location)
4715
5055
b.bind(b_other)
4716
5056
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5057
raise errors.BzrCommandError(gettext('These branches have diverged.'
5058
' Try merging, and then bind again.'))
4719
5059
if b.get_config().has_explicit_nickname():
4720
5060
b.nick = b_other.nick
4771
5113
encoding_type = 'replace'
4773
def run(self, location=None,
4774
dry_run=False, verbose=False,
4775
revision=None, force=False, local=False):
5115
def run(self, location=None, dry_run=False, verbose=False,
5116
revision=None, force=False, local=False, keep_tags=False):
4776
5117
if location is None:
4777
5118
location = u'.'
4778
5119
control, relpath = bzrdir.BzrDir.open_containing(location)
4784
5125
b = control.open_branch()
4786
5127
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5128
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)
5130
self.add_cleanup(b.lock_write().unlock)
5131
return self._run(b, tree, dry_run, verbose, revision, force,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5134
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4795
5136
from bzrlib.log import log_formatter, show_log
4796
5137
from bzrlib.uncommit import uncommit
4827
5168
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5171
self.outf.write(gettext('Dry-run, pretending to remove'
5172
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5174
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')
5177
if not ui.ui_factory.confirm_action(
5178
gettext(u'Uncommit these revisions'),
5179
'bzrlib.builtins.uncommit',
5181
self.outf.write(gettext('Canceled\n'))
4840
5184
mutter('Uncommitting from {%s} to {%s}',
4841
5185
last_rev_id, rev_id)
4842
5186
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)
5187
revno=revno, local=local, keep_tags=keep_tags)
5188
self.outf.write(gettext('You can restore the old tip by running:\n'
5189
' bzr pull . -r revid:%s\n') % last_rev_id)
4848
5192
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5193
__doc__ = """Break a dead lock.
5195
This command breaks a lock on a repository, branch, working directory or
4851
5198
CAUTION: Locks should only be broken when you are sure that the process
4852
5199
holding the lock has been stopped.
4859
5206
bzr break-lock bzr+ssh://example.com/bzr/foo
5207
bzr break-lock --conf ~/.bazaar
4861
5210
takes_args = ['location?']
5213
help='LOCATION is the directory where the config lock is.'),
5215
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5218
def run(self, location=None, config=False, force=False):
4864
5219
if location is None:
4865
5220
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5222
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5224
{'bzrlib.lockdir.break': True})
5226
conf = _mod_config.LockableConfig(file_name=location)
5229
control, relpath = bzrdir.BzrDir.open_containing(location)
5231
control.break_lock()
5232
except NotImplementedError:
4873
5236
class cmd_wait_until_signalled(Command):
4936
5300
return host, port
4938
5302
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5303
protocol=None, client_timeout=None):
5304
from bzrlib import transport
4941
5305
if directory is None:
4942
5306
directory = os.getcwd()
4943
5307
if protocol is None:
4944
protocol = transport_server_registry.get()
5308
protocol = transport.transport_server_registry.get()
4945
5309
host, port = self.get_host_and_port(port)
4946
5310
url = urlutils.local_path_to_url(directory)
4947
5311
if not allow_writes:
4948
5312
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5313
t = transport.get_transport(url)
5315
protocol(t, host, port, inet, client_timeout)
5316
except TypeError, e:
5317
# We use symbol_versioning.deprecated_in just so that people
5318
# grepping can find it here.
5319
# symbol_versioning.deprecated_in((2, 5, 0))
5320
symbol_versioning.warn(
5321
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5322
'Most likely it needs to be updated to support a'
5323
' "timeout" parameter (added in bzr 2.5.0)'
5324
% (e, protocol.__module__, protocol),
5326
protocol(t, host, port, inet)
4953
5329
class cmd_join(Command):
4986
5362
except errors.BadReferenceTarget, e:
4987
5363
# XXX: Would be better to just raise a nicely printable
4988
5364
# exception from the real origin. Also below. mbp 20070306
4989
raise errors.BzrCommandError("Cannot join %s. %s" %
5365
raise errors.BzrCommandError(
5366
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4993
5369
containing_tree.subsume(sub_tree)
4994
5370
except errors.BadSubsumeSource, e:
4995
raise errors.BzrCommandError("Cannot join %s. %s" %
5371
raise errors.BzrCommandError(
5372
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4999
5375
class cmd_split(Command):
5064
5441
encoding_type = 'exact'
5066
5443
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5067
sign=False, revision=None, mail_to=None, message=None):
5444
sign=False, revision=None, mail_to=None, message=None,
5068
5446
from bzrlib.revision import ensure_null, NULL_REVISION
5069
5447
include_patch, include_bundle = {
5070
5448
'plain': (False, False),
5071
5449
'diff': (True, False),
5072
5450
'bundle': (True, True),
5074
branch = Branch.open('.')
5452
branch = Branch.open(directory)
5075
5453
stored_submit_branch = branch.get_submit_branch()
5076
5454
if submit_branch is None:
5077
5455
submit_branch = stored_submit_branch
5089
5467
elif stored_public_branch is None:
5090
5468
branch.set_public_branch(public_branch)
5091
5469
if not include_bundle and public_branch is None:
5092
raise errors.BzrCommandError('No public branch specified or'
5470
raise errors.BzrCommandError(gettext('No public branch specified or'
5094
5472
base_revision_id = None
5095
5473
if revision is not None:
5096
5474
if len(revision) > 2:
5097
raise errors.BzrCommandError('bzr merge-directive takes '
5098
'at most two one revision identifiers')
5475
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5476
'at most two one revision identifiers'))
5099
5477
revision_id = revision[-1].as_revision_id(branch)
5100
5478
if len(revision) == 2:
5101
5479
base_revision_id = revision[0].as_revision_id(branch)
5153
5531
source branch defaults to that containing the working directory, but can
5154
5532
be changed using --from.
5534
Both the submit branch and the public branch follow the usual behavior with
5535
respect to --remember: If there is no default location set, the first send
5536
will set it (use --no-remember to avoid setting it). After that, you can
5537
omit the location to use the default. To change the default, use
5538
--remember. The value will only be saved if the location can be accessed.
5156
5540
In order to calculate those changes, bzr must analyse the submit branch.
5157
5541
Therefore it is most efficient for the submit branch to be a local mirror.
5158
5542
If a public location is known for the submit_branch, that location is used
5229
5613
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
no_patch=False, revision=None, remember=False, output=None,
5614
no_patch=False, revision=None, remember=None, output=None,
5231
5615
format=None, mail_to=None, message=None, body=None,
5232
5616
strict=None, **kwargs):
5233
5617
from bzrlib.send import send
5359
5740
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5741
self.add_cleanup(branch.lock_write().unlock)
5363
5743
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5744
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5745
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5746
note(gettext('Deleted tag %s.') % tag_name)
5369
5749
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5750
raise errors.BzrCommandError(gettext(
5371
5751
"Tags can only be placed on a single revision, "
5373
5753
revision_id = revision[0].as_revision_id(branch)
5375
5755
revision_id = branch.last_revision()
5376
5756
if tag_name is None:
5377
5757
tag_name = branch.automatic_tag_name(revision_id)
5378
5758
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):
5759
raise errors.BzrCommandError(gettext(
5760
"Please specify a tag name."))
5762
existing_target = branch.tags.lookup_tag(tag_name)
5763
except errors.NoSuchTag:
5764
existing_target = None
5765
if not force and existing_target not in (None, revision_id):
5382
5766
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5767
if existing_target == revision_id:
5768
note(gettext('Tag %s already exists for that revision.') % tag_name)
5770
branch.tags.set_tag(tag_name, revision_id)
5771
if existing_target is None:
5772
note(gettext('Created tag %s.') % tag_name)
5774
note(gettext('Updated tag %s.') % tag_name)
5387
5777
class cmd_tags(Command):
5393
5783
_see_also = ['tag']
5394
5784
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5785
custom_help('directory',
5786
help='Branch whose tags should be displayed.'),
5787
RegistryOption('sort',
5401
5788
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5789
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
5795
@display_command
5796
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5797
from bzrlib.tag import tag_sort_methods
5416
5798
branch, relpath = Branch.open_containing(directory)
5418
5800
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
5804
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]])
5806
# Restrict to the specified range
5807
tags = self._tags_for_range(branch, revision)
5809
sort = tag_sort_methods.get()
5444
5811
if not show_ids:
5445
5812
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
5813
for index, (tag, revid) in enumerate(tags):
5448
5815
revno = branch.revision_id_to_dotted_revno(revid)
5449
5816
if isinstance(revno, tuple):
5450
5817
revno = '.'.join(map(str, revno))
5451
except errors.NoSuchRevision:
5818
except (errors.NoSuchRevision,
5819
errors.GhostRevisionsHaveNoRevno,
5820
errors.UnsupportedOperation):
5452
5821
# Bad tag data/merges can lead to tagged revisions
5453
5822
# which are not in this branch. Fail gracefully ...
5457
5826
for tag, revspec in tags:
5458
5827
self.outf.write('%-20s %s\n' % (tag, revspec))
5829
def _tags_for_range(self, branch, revision):
5831
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5832
revid1, revid2 = rev1.rev_id, rev2.rev_id
5833
# _get_revision_range will always set revid2 if it's not specified.
5834
# If revid1 is None, it means we want to start from the branch
5835
# origin which is always a valid ancestor. If revid1 == revid2, the
5836
# ancestry check is useless.
5837
if revid1 and revid1 != revid2:
5838
# FIXME: We really want to use the same graph than
5839
# branch.iter_merge_sorted_revisions below, but this is not
5840
# easily available -- vila 2011-09-23
5841
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5842
# We don't want to output anything in this case...
5844
# only show revisions between revid1 and revid2 (inclusive)
5845
tagged_revids = branch.tags.get_reverse_tag_dict()
5847
for r in branch.iter_merge_sorted_revisions(
5848
start_revision_id=revid2, stop_revision_id=revid1,
5849
stop_rule='include'):
5850
revid_tags = tagged_revids.get(r[0], None)
5852
found.extend([(tag, r[0]) for tag in revid_tags])
5461
5856
class cmd_reconfigure(Command):
5462
5857
__doc__ = """Reconfigure the type of a bzr directory.
5476
5871
takes_args = ['location?']
5477
5872
takes_options = [
5478
5873
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
5876
help='The relation between branch and tree.',
5482
5877
value_switches=True, enum_switch=False,
5483
5878
branch='Reconfigure to be an unbound branch with no working tree.',
5484
5879
tree='Reconfigure to be an unbound branch with a working tree.',
5485
5880
checkout='Reconfigure to be a bound branch with a working tree.',
5486
5881
lightweight_checkout='Reconfigure to be a lightweight'
5487
5882
' checkout (with no local history).',
5884
RegistryOption.from_kwargs(
5886
title='Repository type',
5887
help='Location fo the repository.',
5888
value_switches=True, enum_switch=False,
5488
5889
standalone='Reconfigure to be a standalone branch '
5489
5890
'(i.e. stop using shared repository).',
5490
5891
use_shared='Reconfigure to use a shared repository.',
5893
RegistryOption.from_kwargs(
5895
title='Trees in Repository',
5896
help='Whether new branches in the repository have trees.',
5897
value_switches=True, enum_switch=False,
5491
5898
with_trees='Reconfigure repository to create '
5492
5899
'working trees on branches by default.',
5493
5900
with_no_trees='Reconfigure repository to not create '
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5917
def run(self, location=None, bind_to=None, force=False,
5918
tree_type=None, repository_type=None, repository_trees=None,
5919
stacked_on=None, unstacked=None):
5513
5920
directory = bzrdir.BzrDir.open(location)
5514
5921
if stacked_on and unstacked:
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5922
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5516
5923
elif stacked_on is not None:
5517
5924
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5518
5925
elif unstacked:
5520
5927
# At the moment you can use --stacked-on and a different
5521
5928
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
5930
if (tree_type is None and
5931
repository_type is None and
5932
repository_trees is None):
5524
5933
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
5936
raise errors.BzrCommandError(gettext('No target configuration '
5938
reconfiguration = None
5939
if tree_type == 'branch':
5530
5940
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
5941
elif tree_type == 'tree':
5532
5942
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
5943
elif tree_type == 'checkout':
5534
5944
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
5945
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
5946
elif tree_type == 'lightweight-checkout':
5537
5947
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
5948
directory, bind_to)
5539
elif target_type == 'use-shared':
5950
reconfiguration.apply(force)
5951
reconfiguration = None
5952
if repository_type == 'use-shared':
5540
5953
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
5954
elif repository_type == 'standalone':
5542
5955
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
5957
reconfiguration.apply(force)
5958
reconfiguration = None
5959
if repository_trees == 'with-trees':
5544
5960
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
5961
directory, True)
5546
elif target_type == 'with-no-trees':
5962
elif repository_trees == 'with-no-trees':
5547
5963
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
5964
directory, False)
5549
reconfiguration.apply(force)
5966
reconfiguration.apply(force)
5967
reconfiguration = None
5552
5970
class cmd_switch(Command):
5584
6003
def run(self, to_location=None, force=False, create_branch=False,
6004
revision=None, directory=u'.'):
5586
6005
from bzrlib import switch
6006
tree_location = directory
5588
6007
revision = _get_one_revision('switch', revision)
5589
6008
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
6009
if to_location is None:
5591
6010
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6011
raise errors.BzrCommandError(gettext('You must supply either a'
6012
' revision or a location'))
6013
to_location = tree_location
5596
6015
branch = control_dir.open_branch()
5597
6016
had_explicit_nick = branch.get_config().has_explicit_nickname()
5735
tree, file_list = tree_files(file_list, apply_view=False)
6154
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6156
current_view, view_dict = tree.views.get_view_info()
5737
6157
if name is None:
5738
6158
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6161
raise errors.BzrCommandError(gettext(
6162
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6164
raise errors.BzrCommandError(gettext(
6165
"Both --delete and --switch specified"))
5747
6167
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6168
self.outf.write(gettext("Deleted all views.\n"))
5749
6169
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6170
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6172
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6173
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6176
raise errors.BzrCommandError(gettext(
6177
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6179
raise errors.BzrCommandError(gettext(
6180
"Both --switch and --all specified"))
5761
6181
elif switch == 'off':
5762
6182
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6183
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6184
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6185
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6187
tree.views.set_view_info(switch, view_dict)
5768
6188
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6189
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6192
self.outf.write(gettext('Views defined:\n'))
5773
6193
for view in sorted(view_dict):
5774
6194
if view == current_view:
5778
6198
view_str = views.view_display_str(view_dict[view])
5779
6199
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6201
self.outf.write(gettext('No views defined.\n'))
5782
6202
elif file_list:
5783
6203
if name is None:
5784
6204
# No name given and no current view set
5786
6206
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6207
raise errors.BzrCommandError(gettext(
6208
"Cannot change the 'off' pseudo view"))
5789
6209
tree.views.set_view(name, sorted(file_list))
5790
6210
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6211
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6213
# list the files
5794
6214
if name is None:
5795
6215
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6216
self.outf.write(gettext('No current view.\n'))
5798
6218
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6219
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6222
class cmd_hooks(Command):
5868
6288
You can put multiple items on the shelf, and by default, 'unshelve' will
5869
6289
restore the most recently shelved changes.
6291
For complicated changes, it is possible to edit the changes in a separate
6292
editor program to decide what the file remaining in the working copy
6293
should look like. To do this, add the configuration option
6295
change_editor = PROGRAM @new_path @old_path
6297
where @new_path is replaced with the path of the new version of the
6298
file and @old_path is replaced with the path of the old version of
6299
the file. The PROGRAM should save the new file with the desired
6300
contents of the file in the working tree.
5872
6304
takes_args = ['file*']
5874
6306
takes_options = [
5876
6309
Option('all', help='Shelve all changes.'),
5883
6316
Option('destroy',
5884
6317
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6319
_see_also = ['unshelve', 'configuration']
5888
6321
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6322
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6324
return self.run_for_list(directory=directory)
5892
6325
from bzrlib.shelf_ui import Shelver
5893
6326
if writer is None:
5894
6327
writer = bzrlib.option.diff_writer_registry.get()
5896
6329
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6330
file_list, message, destroy=destroy, directory=directory)
5902
6335
except errors.UserAbort:
5905
def run_for_list(self):
5906
tree = WorkingTree.open_containing('.')[0]
5908
self.add_cleanup(tree.unlock)
6338
def run_for_list(self, directory=None):
6339
if directory is None:
6341
tree = WorkingTree.open_containing(directory)[0]
6342
self.add_cleanup(tree.lock_read().unlock)
5909
6343
manager = tree.get_shelf_manager()
5910
6344
shelves = manager.active_shelves()
5911
6345
if len(shelves) == 0:
5912
note('No shelved changes.')
6346
note(gettext('No shelved changes.'))
5914
6348
for shelf_id in reversed(shelves):
5915
6349
message = manager.get_metadata(shelf_id).get('message')
5967
6402
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'
6404
takes_options = ['directory',
6405
Option('ignored', help='Delete all ignored files.'),
6406
Option('detritus', help='Delete conflict files, merge and revert'
5971
6407
' backups, and failed selftest dirs.'),
5972
6408
Option('unknown',
5973
6409
help='Delete files unknown to bzr (default).'),
5975
6411
' deleting them.'),
5976
6412
Option('force', help='Do not prompt before deleting.')]
5977
6413
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6414
force=False, directory=u'.'):
5979
6415
from bzrlib.clean_tree import clean_tree
5980
6416
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6420
clean_tree(directory, unknown=unknown, ignored=ignored,
6421
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6424
class cmd_reference(Command):
6032
6468
self.outf.write('%s %s\n' % (path, location))
6471
class cmd_export_pot(Command):
6472
__doc__ = """Export command helps and error messages in po format."""
6475
takes_options = [Option('plugin',
6476
help='Export help text from named command '\
6477
'(defaults to all built in commands).',
6480
def run(self, plugin=None):
6481
from bzrlib.export_pot import export_pot
6482
export_pot(self.outf, plugin)
6035
6485
def _register_lazy_builtins():
6036
6486
# register lazy builtins from other modules; called at startup and should
6037
6487
# be only called once.
6038
6488
for (name, aliases, module_name) in [
6039
6489
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6490
('cmd_config', [], 'bzrlib.config'),
6040
6491
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6492
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6493
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6494
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6495
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6496
('cmd_verify_signatures', [],
6497
'bzrlib.commit_signature_commands'),
6498
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6500
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
