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.
521
557
takes_args = ['location?']
522
558
takes_options = [
523
559
Option('tree', help='Show revno of working tree'),
527
def run(self, tree=False, location=u'.'):
564
def run(self, tree=False, location=u'.', revision=None):
565
if revision is not None and tree:
566
raise errors.BzrCommandError(gettext("--tree and --revision can "
567
"not be used together"))
530
571
wt = WorkingTree.open_containing(location)[0]
572
self.add_cleanup(wt.lock_read().unlock)
532
573
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
574
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
576
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
542
578
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
579
self.add_cleanup(b.lock_read().unlock)
581
if len(revision) != 1:
582
raise errors.BzrCommandError(gettext(
583
"Tags can only be placed on a single revision, "
585
revid = revision[0].as_revision_id(b)
587
revid = b.last_revision()
589
revno_t = b.revision_id_to_dotted_revno(revid)
590
except errors.NoSuchRevision:
592
revno = ".".join(str(n) for n in revno_t)
546
593
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
594
self.outf.write(revno + '\n')
550
597
class cmd_revision_info(Command):
677
726
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
678
727
to_file=self.outf, should_print=(not is_quiet()))
680
action = bzrlib.add.AddAction(to_file=self.outf,
729
action = bzrlib.add.AddWithSkipLargeAction(to_file=self.outf,
681
730
should_print=(not is_quiet()))
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
733
self.add_cleanup(base_tree.lock_read().unlock)
686
734
tree, file_list = tree_files_for_add(file_list)
687
735
added, ignored = tree.smart_add(file_list, not
688
736
no_recurse, action=action, save=not dry_run)
757
807
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
758
808
if kind and kind not in ['file', 'directory', 'symlink']:
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
809
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
761
811
revision = _get_one_revision('inventory', revision)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
812
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
813
self.add_cleanup(work_tree.lock_read().unlock)
765
814
if revision is not None:
766
815
tree = revision.as_tree(work_tree.branch)
768
817
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
818
self.add_cleanup(tree.lock_read().unlock)
828
877
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
879
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
880
if names_list is None:
833
882
if len(names_list) < 2:
834
raise errors.BzrCommandError("missing file argument")
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
883
raise errors.BzrCommandError(gettext("missing file argument"))
884
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
885
self.add_cleanup(tree.lock_tree_write().unlock)
838
886
self._run(tree, names_list, rel_names, after)
840
888
def run_auto(self, names_list, after, dry_run):
841
889
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
890
raise errors.BzrCommandError(gettext('Only one path may be specified to'
845
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
893
raise errors.BzrCommandError(gettext('--after cannot be specified with'
895
work_tree, file_list = WorkingTree.open_containing_paths(
896
names_list, default_directory='.')
897
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
898
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
900
def _run(self, tree, names_list, rel_names, after):
946
994
match the remote one, use pull --overwrite. This will work even if the two
947
995
branches have diverged.
949
If there is no default location set, the first pull will set it. After
950
that, you can omit the location to use the default. To change the
951
default, use --remember. The value will only be saved if the remote
952
location can be accessed.
997
If there is no default location set, the first pull will set it (use
998
--no-remember to avoid setting it). After that, you can omit the
999
location to use the default. To change the default, use --remember. The
1000
value will only be saved if the remote location can be accessed.
1002
The --verbose option will display the revisions pulled using the log_format
1003
configuration option. You can use a different format by overriding it with
1004
-Olog_format=<other_format>.
954
1006
Note: The location can be specified either in the form of a branch,
955
1007
or in the form of a path to a file containing a merge directive generated
960
1012
takes_options = ['remember', 'overwrite', 'revision',
961
1013
custom_help('verbose',
962
1014
help='Show logs of pulled revisions.'),
1015
custom_help('directory',
964
1016
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
1017
'rather than the one containing the working directory.'),
970
1019
help="Perform a local pull in a bound "
971
1020
"branch. Local pulls are not applied to "
972
1021
"the master branch."
1024
help="Show base revision text in conflicts.")
975
1026
takes_args = ['location?']
976
1027
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1029
def run(self, location=None, remember=None, overwrite=False,
979
1030
revision=None, verbose=False,
980
directory=None, local=False):
1031
directory=None, local=False,
981
1033
# FIXME: too much stuff is in the command class
982
1034
revision_id = None
983
1035
mergeable = None
987
1039
tree_to = WorkingTree.open_containing(directory)[0]
988
1040
branch_to = tree_to.branch
990
self.add_cleanup(tree_to.unlock)
1041
self.add_cleanup(tree_to.lock_write().unlock)
991
1042
except errors.NoWorkingTree:
993
1044
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
1045
self.add_cleanup(branch_to.lock_write().unlock)
1047
if tree_to is None and show_base:
1048
raise errors.BzrCommandError(gettext("Need working tree for --show-base."))
997
1050
if local and not branch_to.get_bound_location():
998
1051
raise errors.LocalRequiresBoundBranch()
1008
1061
stored_loc = branch_to.get_parent()
1009
1062
if location is None:
1010
1063
if stored_loc is None:
1011
raise errors.BzrCommandError("No pull location known or"
1064
raise errors.BzrCommandError(gettext("No pull location known or"
1014
1067
display_url = urlutils.unescape_for_display(stored_loc,
1015
1068
self.outf.encoding)
1016
1069
if not is_quiet():
1017
self.outf.write("Using saved parent location: %s\n" % display_url)
1070
self.outf.write(gettext("Using saved parent location: %s\n") % display_url)
1018
1071
location = stored_loc
1020
1073
revision = _get_one_revision('pull', revision)
1021
1074
if mergeable is not None:
1022
1075
if revision is not None:
1023
raise errors.BzrCommandError(
1024
'Cannot use -r with merge directives or bundles')
1076
raise errors.BzrCommandError(gettext(
1077
'Cannot use -r with merge directives or bundles'))
1025
1078
mergeable.install_revisions(branch_to.repository)
1026
1079
base_revision_id, revision_id, verified = \
1027
1080
mergeable.get_merge_request(branch_to.repository)
1077
1134
do a merge (see bzr help merge) from the other branch, and commit that.
1078
1135
After that you will be able to do a push without '--overwrite'.
1080
If there is no default push location set, the first push will set it.
1081
After that, you can omit the location to use the default. To change the
1082
default, use --remember. The value will only be saved if the remote
1083
location can be accessed.
1137
If there is no default push location set, the first push will set it (use
1138
--no-remember to avoid setting it). After that, you can omit the
1139
location to use the default. To change the default, use --remember. The
1140
value will only be saved if the remote location can be accessed.
1142
The --verbose option will display the revisions pushed using the log_format
1143
configuration option. You can use a different format by overriding it with
1144
-Olog_format=<other_format>.
1086
1147
_see_also = ['pull', 'update', 'working-trees']
1088
1149
Option('create-prefix',
1089
1150
help='Create the path leading up to the branch '
1090
1151
'if it does not already exist.'),
1152
custom_help('directory',
1092
1153
help='Branch to push from, '
1093
'rather than the one containing the working directory.',
1154
'rather than the one containing the working directory.'),
1097
1155
Option('use-existing-dir',
1098
1156
help='By default push will fail if the target'
1099
1157
' directory exists, but does not already'
1110
1168
Option('strict',
1111
1169
help='Refuse to push if there are uncommitted changes in'
1112
1170
' the working tree, --no-strict disables the check.'),
1172
help="Don't populate the working tree, even for protocols"
1173
" that support it."),
1114
1175
takes_args = ['location?']
1115
1176
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1178
def run(self, location=None, remember=None, overwrite=False,
1118
1179
create_prefix=False, verbose=False, revision=None,
1119
1180
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1181
stacked=False, strict=None, no_tree=False):
1121
1182
from bzrlib.push import _show_push_branch
1123
1184
if directory is None:
1151
1212
# error by the feedback given to them. RBC 20080227.
1152
1213
stacked_on = parent_url
1153
1214
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1215
raise errors.BzrCommandError(gettext(
1216
"Could not determine branch to refer to."))
1157
1218
# Get the destination location
1158
1219
if location is None:
1159
1220
stored_loc = br_from.get_push_location()
1160
1221
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1222
raise errors.BzrCommandError(gettext(
1223
"No push location known or specified."))
1164
1225
display_url = urlutils.unescape_for_display(stored_loc,
1165
1226
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1227
note(gettext("Using saved push location: %s") % display_url)
1167
1228
location = stored_loc
1169
1230
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1231
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1232
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1233
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1236
class cmd_branch(Command):
1185
1246
To retrieve the branch as of a particular revision, supply the --revision
1186
1247
parameter, as in "branch foo/bar -r 5".
1249
The synonyms 'clone' and 'get' for this command are deprecated.
1189
1252
_see_also = ['checkout']
1190
1253
takes_args = ['from_location', 'to_location?']
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1254
takes_options = ['revision',
1255
Option('hardlink', help='Hard-link working tree files where possible.'),
1256
Option('files-from', type=str,
1257
help="Get file contents from this tree."),
1193
1258
Option('no-tree',
1194
1259
help="Create a branch without a working-tree."),
1195
1260
Option('switch',
1214
1279
def run(self, from_location, to_location=None, revision=None,
1215
1280
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1281
use_existing_dir=False, switch=False, bind=False,
1217
1283
from bzrlib import switch as _mod_switch
1218
1284
from bzrlib.tag import _merge_tags_if_possible
1285
if self.invoked_as in ['get', 'clone']:
1286
ui.ui_factory.show_user_warning(
1287
'deprecated_command',
1288
deprecated_name=self.invoked_as,
1289
recommended_name='branch',
1290
deprecated_in_version='2.4')
1219
1291
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1293
if not (hardlink or files_from):
1294
# accelerator_tree is usually slower because you have to read N
1295
# files (no readahead, lots of seeks, etc), but allow the user to
1296
# explicitly request it
1297
accelerator_tree = None
1298
if files_from is not None and files_from != from_location:
1299
accelerator_tree = WorkingTree.open(files_from)
1221
1300
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1301
self.add_cleanup(br_from.lock_read().unlock)
1224
1302
if revision is not None:
1225
1303
revision_id = revision.as_revision_id(br_from)
1259
1337
branch = dir.open_branch()
1260
1338
except errors.NoSuchRevision:
1261
1339
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1340
msg = gettext("The branch {0} has no revision {1}.").format(
1341
from_location, revision)
1264
1342
raise errors.BzrCommandError(msg)
1265
1343
_merge_tags_if_possible(br_from, branch)
1266
1344
# If the source branch is stacked, the new branch may
1267
1345
# be stacked whether we asked for that explicitly or not.
1268
1346
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1348
note(gettext('Created new stacked branch referring to %s.') %
1271
1349
branch.get_stacked_on_url())
1272
1350
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
1351
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1352
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1354
# Bind to the parent
1277
1355
parent_branch = Branch.open(from_location)
1278
1356
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1357
note(gettext('New branch bound to %s') % from_location)
1281
1359
# Switch to the new branch
1282
1360
wt, _ = WorkingTree.open_containing('.')
1283
1361
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1362
note(gettext('Switched to branch: %s'),
1285
1363
urlutils.unescape_for_display(branch.base, 'utf-8'))
1366
class cmd_branches(Command):
1367
__doc__ = """List the branches available at the current location.
1369
This command will print the names of all the branches at the current
1373
takes_args = ['location?']
1375
Option('recursive', short_name='R',
1376
help='Recursively scan for branches rather than '
1377
'just looking in the specified location.')]
1379
def run(self, location=".", recursive=False):
1381
t = transport.get_transport(location)
1382
if not t.listable():
1383
raise errors.BzrCommandError(
1384
"Can't scan this type of location.")
1385
for b in bzrdir.BzrDir.find_branches(t):
1386
self.outf.write("%s\n" % urlutils.unescape_for_display(
1387
urlutils.relative_url(t.base, b.base),
1388
self.outf.encoding).rstrip("/"))
1390
dir = bzrdir.BzrDir.open_containing(location)[0]
1391
for branch in dir.list_branches():
1392
if branch.name is None:
1393
self.outf.write(gettext(" (default)\n"))
1395
self.outf.write(" %s\n" % branch.name.encode(
1396
self.outf.encoding))
1288
1399
class cmd_checkout(Command):
1289
1400
__doc__ = """Create a new checkout of an existing branch.
1331
1442
to_location = branch_location
1332
1443
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1333
1444
branch_location)
1445
if not (hardlink or files_from):
1446
# accelerator_tree is usually slower because you have to read N
1447
# files (no readahead, lots of seeks, etc), but allow the user to
1448
# explicitly request it
1449
accelerator_tree = None
1334
1450
revision = _get_one_revision('checkout', revision)
1335
if files_from is not None:
1451
if files_from is not None and files_from != branch_location:
1336
1452
accelerator_tree = WorkingTree.open(files_from)
1337
1453
if revision is not None:
1338
1454
revision_id = revision.as_revision_id(source)
1389
1503
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
1504
__doc__ = """Update a working tree to a new revision.
1506
This will perform a merge of the destination revision (the tip of the
1507
branch, or the specified revision) into the working tree, and then make
1508
that revision the basis revision for the working tree.
1510
You can use this to visit an older revision, or to update a working tree
1511
that is out of date from its branch.
1513
If there are any uncommitted changes in the tree, they will be carried
1514
across and remain as uncommitted changes after the update. To discard
1515
these changes, use 'bzr revert'. The uncommitted changes may conflict
1516
with the changes brought in by the change in basis revision.
1518
If the tree's branch is bound to a master branch, bzr will also update
1400
1519
the branch from the master.
1521
You cannot update just a single file or directory, because each Bazaar
1522
working tree has just a single basis revision. If you want to restore a
1523
file that has been removed locally, use 'bzr revert' instead of 'bzr
1524
update'. If you want to restore a file to its state in a previous
1525
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1526
out the old content of that file to a new location.
1528
The 'dir' argument, if given, must be the location of the root of a
1529
working tree to update. By default, the working tree that contains the
1530
current working directory is used.
1403
1533
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1534
takes_args = ['dir?']
1405
takes_options = ['revision']
1535
takes_options = ['revision',
1537
help="Show base revision text in conflicts."),
1406
1539
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1541
def run(self, dir=None, revision=None, show_base=None):
1409
1542
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]
1543
raise errors.BzrCommandError(gettext(
1544
"bzr update --revision takes exactly one revision"))
1546
tree = WorkingTree.open_containing('.')[0]
1548
tree, relpath = WorkingTree.open_containing(dir)
1551
raise errors.BzrCommandError(gettext(
1552
"bzr update can only update a whole tree, "
1553
"not a file or subdirectory"))
1413
1554
branch = tree.branch
1414
1555
possible_transports = []
1415
1556
master = branch.get_master_branch(
1416
1557
possible_transports=possible_transports)
1417
1558
if master is not None:
1419
1559
branch_location = master.base
1562
branch_location = tree.branch.base
1421
1563
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1564
self.add_cleanup(tree.unlock)
1424
1565
# get rid of the final '/' and be ready for display
1425
1566
branch_location = urlutils.unescape_for_display(
1439
1580
revision_id = branch.last_revision()
1440
1581
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1441
1582
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))
1583
note(gettext("Tree is up to date at revision {0} of branch {1}"
1584
).format('.'.join(map(str, revno)), branch_location))
1445
1586
view_info = _get_view_info_for_change_reporter(tree)
1446
1587
change_reporter = delta._ChangeReporter(
1451
1592
change_reporter,
1452
1593
possible_transports=possible_transports,
1453
1594
revision=revision_id,
1596
show_base=show_base)
1455
1597
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1598
raise errors.BzrCommandError(gettext(
1457
1599
"branch has no revision %s\n"
1458
1600
"bzr update --revision only works"
1459
" for a revision in the branch history"
1601
" for a revision in the branch history")
1460
1602
% (e.revision))
1461
1603
revno = tree.branch.revision_id_to_dotted_revno(
1462
1604
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1605
note(gettext('Updated to revision {0} of branch {1}').format(
1606
'.'.join(map(str, revno)), branch_location))
1465
1607
parent_ids = tree.get_parent_ids()
1466
1608
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'.")
1609
note(gettext('Your local commits will now show as pending merges with '
1610
"'bzr status', and can be committed with 'bzr commit'."))
1469
1611
if conflicts != 0:
1519
1661
class cmd_remove(Command):
1520
1662
__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.
1664
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1665
delete them if they can easily be recovered using revert otherwise they
1666
will be backed up (adding an extention of the form .~#~). If no options or
1667
parameters are given Bazaar will scan for files that are being tracked by
1668
Bazaar but missing in your tree and stop tracking them for you.
1527
1670
takes_args = ['file*']
1528
1671
takes_options = ['verbose',
1530
1673
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1674
'The file deletion mode to be used.',
1532
1675
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1676
safe='Backup changed files (default).',
1535
1677
keep='Delete from bzr but leave the working copy.',
1678
no_backup='Don\'t backup changed files.',
1536
1679
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1680
'recovered and even if they are non-empty directories. '
1681
'(deprecated, use no-backup)')]
1538
1682
aliases = ['rm', 'del']
1539
1683
encoding_type = 'replace'
1541
1685
def run(self, file_list, verbose=False, new=False,
1542
1686
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1687
if file_deletion_strategy == 'force':
1688
note(gettext("(The --force option is deprecated, rather use --no-backup "
1690
file_deletion_strategy = 'no-backup'
1692
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1694
if file_list is not None:
1546
1695
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1697
self.add_cleanup(tree.lock_write().unlock)
1550
1698
# Heuristics should probably all move into tree.remove_smart or
1678
1832
last_revision = wt.last_revision()
1680
revision_ids = b.repository.get_ancestry(last_revision)
1682
for revision_id in revision_ids:
1834
self.add_cleanup(b.repository.lock_read().unlock)
1835
graph = b.repository.get_graph()
1836
revisions = [revid for revid, parents in
1837
graph.iter_ancestry([last_revision])]
1838
for revision_id in reversed(revisions):
1839
if _mod_revision.is_null(revision_id):
1683
1841
self.outf.write(revision_id + '\n')
1723
1881
Option('append-revisions-only',
1724
1882
help='Never change revnos or the existing log.'
1725
' Append revisions to it only.')
1883
' Append revisions to it only.'),
1885
'Create a branch without a working tree.')
1727
1887
def run(self, location=None, format=None, append_revisions_only=False,
1728
create_prefix=False):
1888
create_prefix=False, no_tree=False):
1729
1889
if format is None:
1730
1890
format = bzrdir.format_registry.make_bzrdir('default')
1731
1891
if location is None:
1765
1930
raise errors.BranchExistsWithoutWorkingTree(location)
1766
1931
raise errors.AlreadyBranchError(location)
1767
1932
branch = a_bzrdir.create_branch()
1768
a_bzrdir.create_workingtree()
1933
if not no_tree and not a_bzrdir.has_workingtree():
1934
a_bzrdir.create_workingtree()
1769
1935
if append_revisions_only:
1771
1937
branch.set_append_revisions_only(True)
1772
1938
except errors.UpgradeRequired:
1773
raise errors.BzrCommandError('This branch format cannot be set'
1774
' to append-revisions-only. Try --default.')
1939
raise errors.BzrCommandError(gettext('This branch format cannot be set'
1940
' to append-revisions-only. Try --default.'))
1775
1941
if not is_quiet():
1776
1942
from bzrlib.info import describe_layout, describe_format
1781
1947
repository = branch.repository
1782
1948
layout = describe_layout(repository, branch, tree).lower()
1783
1949
format = describe_format(a_bzrdir, repository, branch, tree)
1784
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
1950
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1785
1952
if repository.is_shared():
1786
1953
#XXX: maybe this can be refactored into transport.path_or_url()
1787
1954
url = repository.bzrdir.root_transport.external_url()
1969
2153
elif ':' in prefix:
1970
2154
old_label, new_label = prefix.split(":")
1972
raise errors.BzrCommandError(
2156
raise errors.BzrCommandError(gettext(
1973
2157
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2158
' (eg "old/:new/")'))
1976
2160
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2161
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2162
' one or two revision specifiers'))
1980
2164
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2165
raise errors.BzrCommandError(gettext(
2166
'{0} and {1} are mutually exclusive').format(
2167
'--using', '--format'))
1984
2169
(old_tree, new_tree,
1985
2170
old_branch, new_branch,
1986
2171
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2172
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2173
# GNU diff on Windows uses ANSI encoding for filenames
2174
path_encoding = osutils.get_diff_header_encoding()
1988
2175
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2176
specific_files=specific_files,
1990
2177
external_diff_options=diff_options,
1991
2178
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2179
extra_trees=extra_trees,
2180
path_encoding=path_encoding,
1993
2182
format_cls=format)
2003
2192
# level of effort but possibly much less IO. (Or possibly not,
2004
2193
# if the directories are very large...)
2005
2194
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
2195
takes_options = ['directory', 'show-ids']
2008
2197
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2198
def run(self, show_ids=False, directory=u'.'):
2199
tree = WorkingTree.open_containing(directory)[0]
2200
self.add_cleanup(tree.lock_read().unlock)
2013
2201
old = tree.basis_tree()
2015
self.add_cleanup(old.unlock)
2202
self.add_cleanup(old.lock_read().unlock)
2016
2203
for path, ie in old.inventory.iter_entries():
2017
2204
if not tree.has_id(ie.file_id):
2018
2205
self.outf.write(path)
2030
2217
_see_also = ['status', 'ls']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2218
takes_options = ['directory', 'null']
2037
2220
@display_command
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2221
def run(self, null=False, directory=u'.'):
2222
tree = WorkingTree.open_containing(directory)[0]
2223
self.add_cleanup(tree.lock_read().unlock)
2040
2224
td = tree.changes_from(tree.basis_tree())
2041
2226
for path, id, kind, text_modified, meta_modified in td.modified:
2043
2228
self.outf.write(path + '\0')
2053
2238
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2239
takes_options = ['directory', 'null']
2060
2241
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2242
def run(self, null=False, directory=u'.'):
2243
wt = WorkingTree.open_containing(directory)[0]
2244
self.add_cleanup(wt.lock_read().unlock)
2065
2245
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2246
self.add_cleanup(basis.lock_read().unlock)
2068
2247
basis_inv = basis.inventory
2069
2248
inv = wt.inventory
2070
2249
for file_id in inv:
2071
if file_id in basis_inv:
2250
if basis_inv.has_id(file_id):
2073
2252
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2254
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2255
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2258
self.outf.write(path + '\0')
2279
2461
help='Show just the specified revision.'
2280
2462
' See also "help revisionspec".'),
2464
RegistryOption('authors',
2465
'What names to list as authors - first, all or committer.',
2467
lazy_registry=('bzrlib.log', 'author_list_registry'),
2282
2469
Option('levels',
2283
2470
short_name='n',
2284
2471
help='Number of levels to display - 0 for all, 1 for flat.',
2286
2473
type=_parse_levels),
2287
2474
Option('message',
2289
2475
help='Show revisions whose message matches this '
2290
2476
'regular expression.',
2292
2479
Option('limit',
2293
2480
short_name='l',
2294
2481
help='Limit the output to the first N revisions.',
2297
2484
Option('show-diff',
2298
2485
short_name='p',
2299
2486
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2487
Option('include-merged',
2301
2488
help='Show merged revisions like --levels 0 does.'),
2489
Option('include-merges', hidden=True,
2490
help='Historical alias for --include-merged.'),
2491
Option('omit-merges',
2492
help='Do not report commits with more than one parent.'),
2302
2493
Option('exclude-common-ancestry',
2303
2494
help='Display only the revisions that are not part'
2304
2495
' of both ancestries (require -rX..Y)'
2497
Option('signatures',
2498
help='Show digital signature validity'),
2501
help='Show revisions whose properties match this '
2504
ListOption('match-message',
2505
help='Show revisions whose message matches this '
2508
ListOption('match-committer',
2509
help='Show revisions whose committer matches this '
2512
ListOption('match-author',
2513
help='Show revisions whose authors match this '
2516
ListOption('match-bugs',
2517
help='Show revisions whose bugs match this '
2307
2521
encoding_type = 'replace'
2327
2550
_get_info_for_log_files,
2329
2552
direction = (forward and 'forward') or 'reverse'
2553
if symbol_versioning.deprecated_passed(include_merges):
2554
ui.ui_factory.show_user_warning(
2555
'deprecated_command_option',
2556
deprecated_name='--include-merges',
2557
recommended_name='--include-merged',
2558
deprecated_in_version='2.5',
2559
command=self.invoked_as)
2560
if include_merged is None:
2561
include_merged = include_merges
2563
raise errors.BzrCommandError(gettext(
2564
'{0} and {1} are mutually exclusive').format(
2565
'--include-merges', '--include-merged'))
2566
if include_merged is None:
2567
include_merged = False
2330
2568
if (exclude_common_ancestry
2331
2569
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2570
raise errors.BzrCommandError(gettext(
2571
'--exclude-common-ancestry requires -r with two revisions'))
2335
2573
if levels is None:
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2576
raise errors.BzrCommandError(gettext(
2577
'{0} and {1} are mutually exclusive').format(
2578
'--levels', '--include-merged'))
2341
2580
if change is not None:
2342
2581
if len(change) > 1:
2343
2582
raise errors.RangeInChangeOption()
2344
2583
if revision is not None:
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2584
raise errors.BzrCommandError(gettext(
2585
'{0} and {1} are mutually exclusive').format(
2586
'--revision', '--change'))
2348
2588
revision = change
2353
2593
# find the file ids to log and check for directory filtering
2354
2594
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2595
revision, file_list, self.add_cleanup)
2357
2596
for relpath, file_id, kind in file_info_list:
2358
2597
if file_id is None:
2359
raise errors.BzrCommandError(
2360
"Path unknown at end or start of revision range: %s" %
2598
raise errors.BzrCommandError(gettext(
2599
"Path unknown at end or start of revision range: %s") %
2362
2601
# If the relpath is the top of the tree, we log everything
2363
2602
if relpath == '':
2378
2617
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
2618
b = dir.open_branch()
2381
self.add_cleanup(b.unlock)
2619
self.add_cleanup(b.lock_read().unlock)
2382
2620
rev1, rev2 = _get_revision_range(revision, b, self.name())
2622
if b.get_config().validate_signatures_in_log():
2626
if not gpg.GPGStrategy.verify_signatures_available():
2627
raise errors.GpgmeNotInstalled(None)
2384
2629
# Decide on the type of delta & diff filtering to use
2385
2630
# TODO: add an --all-files option to make this configurable & consistent
2386
2631
if not verbose:
2430
2688
start_revision=rev1, end_revision=rev2, limit=limit,
2431
2689
message_search=message, delta_type=delta_type,
2432
2690
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2433
exclude_common_ancestry=exclude_common_ancestry,
2691
exclude_common_ancestry=exclude_common_ancestry, match=match_dict,
2692
signature=signatures, omit_merges=omit_merges,
2435
2694
Logger(b, rqst).show(lf)
2453
2712
# b is taken from revision[0].get_branch(), and
2454
2713
# show_log will use its revision_history. Having
2455
2714
# different branches will lead to weird behaviors.
2456
raise errors.BzrCommandError(
2715
raise errors.BzrCommandError(gettext(
2457
2716
"bzr %s doesn't accept two revisions in different"
2458
" branches." % command_name)
2717
" branches.") % command_name)
2459
2718
if start_spec.spec is None:
2460
2719
# Avoid loading all the history.
2461
2720
rev1 = RevisionInfo(branch, None, None)
2528
2786
help='Recurse into subdirectories.'),
2529
2787
Option('from-root',
2530
2788
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2789
Option('unknown', short_name='u',
2790
help='Print unknown files.'),
2532
2791
Option('versioned', help='Print versioned files.',
2533
2792
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.'),
2793
Option('ignored', short_name='i',
2794
help='Print ignored files.'),
2795
Option('kind', short_name='k',
2539
2796
help='List entries of a particular kind: file, directory, symlink.',
2543
2802
@display_command
2544
2803
def run(self, revision=None, verbose=False,
2545
2804
recursive=False, from_root=False,
2546
2805
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2806
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2808
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2809
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
2811
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2812
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
2813
all = not (unknown or versioned or ignored)
2556
2815
selection = {'I':ignored, '?':unknown, 'V':versioned}
2583
2842
apply_view = True
2584
2843
view_str = views.view_display_str(view_files)
2585
note("Ignoring files outside view. View is %s" % view_str)
2844
note(gettext("Ignoring files outside view. View is %s") % view_str)
2588
self.add_cleanup(tree.unlock)
2846
self.add_cleanup(tree.lock_read().unlock)
2589
2847
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
2848
from_dir=relpath, recursive=recursive):
2591
2849
# Apply additional masking
2713
2981
_see_also = ['status', 'ignored', 'patterns']
2714
2982
takes_args = ['name_pattern*']
2983
takes_options = ['directory',
2716
2984
Option('default-rules',
2717
2985
help='Display the default ignore rules that bzr uses.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2988
def run(self, name_pattern_list=None, default_rules=None,
2721
2990
from bzrlib import ignores
2722
2991
if default_rules is not None:
2723
2992
# dump the default rules and exit
2725
2994
self.outf.write("%s\n" % pattern)
2727
2996
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2997
raise errors.BzrCommandError(gettext("ignore requires at least one "
2998
"NAME_PATTERN or --default-rules."))
2730
2999
name_pattern_list = [globbing.normalize_pattern(p)
2731
3000
for p in name_pattern_list]
3002
bad_patterns_count = 0
3003
for p in name_pattern_list:
3004
if not globbing.Globster.is_pattern_valid(p):
3005
bad_patterns_count += 1
3006
bad_patterns += ('\n %s' % p)
3008
msg = (ngettext('Invalid ignore pattern found. %s',
3009
'Invalid ignore patterns found. %s',
3010
bad_patterns_count) % bad_patterns)
3011
ui.ui_factory.show_error(msg)
3012
raise errors.InvalidPattern('')
2732
3013
for name_pattern in name_pattern_list:
2733
3014
if (name_pattern[0] == '/' or
2734
3015
(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'.')
3016
raise errors.BzrCommandError(gettext(
3017
"NAME_PATTERN should not be an absolute path"))
3018
tree, relpath = WorkingTree.open_containing(directory)
2738
3019
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3020
ignored = globbing.Globster(name_pattern_list)
3022
self.add_cleanup(tree.lock_read().unlock)
2742
3023
for entry in tree.list_files():
2744
3025
if id is not None:
2745
3026
filename = entry[0]
2746
3027
if ignored.match(filename):
2747
3028
matches.append(filename)
2749
3029
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3030
self.outf.write(gettext("Warning: the following files are version "
3031
"controlled and match your ignore pattern:\n%s"
2752
3032
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3033
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2756
3036
class cmd_ignored(Command):
2767
3047
encoding_type = 'replace'
2768
3048
_see_also = ['ignore', 'ls']
3049
takes_options = ['directory']
2770
3051
@display_command
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
3052
def run(self, directory=u'.'):
3053
tree = WorkingTree.open_containing(directory)[0]
3054
self.add_cleanup(tree.lock_read().unlock)
2775
3055
for path, file_class, kind, file_id, entry in tree.list_files():
2776
3056
if file_class != 'I':
2844
3126
'revision in which it was changed.'),
2846
3128
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
3129
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2848
3130
from bzrlib.export import export
2850
3132
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
3133
tree = WorkingTree.open_containing(directory)[0]
2852
3134
b = tree.branch
2885
3167
@display_command
2886
3168
def run(self, filename, revision=None, name_from_revision=False,
3169
filters=False, directory=None):
2888
3170
if revision is not None and len(revision) != 1:
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3171
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3172
" one revision specifier"))
2891
3173
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3174
_open_directory_or_containing_tree_or_branch(filename, directory)
3175
self.add_cleanup(branch.lock_read().unlock)
2895
3176
return self._run(tree, branch, relpath, filename, revision,
2896
3177
name_from_revision, filters)
2900
3181
if tree is None:
2901
3182
tree = b.basis_tree()
2902
3183
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3184
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3186
old_file_id = rev_tree.path2id(relpath)
3188
# TODO: Split out this code to something that generically finds the
3189
# best id for a path across one or more trees; it's like
3190
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3192
if name_from_revision:
2909
3193
# Try in revision if requested
2910
3194
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3195
raise errors.BzrCommandError(gettext(
3196
"{0!r} is not present in revision {1}").format(
2913
3197
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3199
actual_file_id = old_file_id
2917
3201
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" % (
3202
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3203
actual_file_id = cur_file_id
3204
elif old_file_id is not None:
3205
actual_file_id = old_file_id
3207
raise errors.BzrCommandError(gettext(
3208
"{0!r} is not present in revision {1}").format(
2935
3209
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)
3211
from bzrlib.filter_tree import ContentFilterTree
3212
filter_tree = ContentFilterTree(rev_tree,
3213
rev_tree._content_filter_stack)
3214
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3216
content = rev_tree.get_file_text(actual_file_id)
3218
self.outf.write(content)
2952
3221
class cmd_local_time_offset(Command):
3013
3282
to trigger updates to external systems like bug trackers. The --fixes
3014
3283
option can be used to record the association between a revision and
3015
3284
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
3287
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3288
takes_args = ['selected*']
3076
3320
Option('show-diff', short_name='p',
3077
3321
help='When no message is supplied, show the diff along'
3078
3322
' with the status summary in the message editor.'),
3324
help='When committing to a foreign version control '
3325
'system do not push data that can not be natively '
3080
3328
aliases = ['ci', 'checkin']
3082
3330
def _iter_bug_fix_urls(self, fixes, branch):
3331
default_bugtracker = None
3083
3332
# Configure the properties for bug fixing attributes.
3084
3333
for fixed_bug in fixes:
3085
3334
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3335
if len(tokens) == 1:
3336
if default_bugtracker is None:
3337
branch_config = branch.get_config()
3338
default_bugtracker = branch_config.get_user_option(
3340
if default_bugtracker is None:
3341
raise errors.BzrCommandError(gettext(
3342
"No tracker specified for bug %s. Use the form "
3343
"'tracker:id' or specify a default bug tracker "
3344
"using the `bugtracker` option.\nSee "
3345
"\"bzr help bugs\" for more information on this "
3346
"feature. Commit refused.") % fixed_bug)
3347
tag = default_bugtracker
3349
elif len(tokens) != 2:
3350
raise errors.BzrCommandError(gettext(
3088
3351
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
3352
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3353
"feature.\nCommit refused.") % fixed_bug)
3355
tag, bug_id = tokens
3093
3357
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
3358
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3359
raise errors.BzrCommandError(gettext(
3360
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3097
3361
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3362
raise errors.BzrCommandError(gettext(
3363
"%s\nCommit refused.") % (str(e),))
3101
3365
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3366
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3367
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3369
from bzrlib.errors import (
3105
3370
PointlessCommit,
3106
3371
ConflictsInTree,
3118
3384
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3119
3385
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.
3386
raise errors.BzrCommandError(gettext(
3387
"Could not parse --commit-time: " + str(e)))
3129
3389
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3391
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3392
if selected_list == ['']:
3133
3393
# workaround - commit of root of tree should be exactly the same
3134
3394
# as just default commit in that tree, and succeed even though
3163
3423
message = message.replace('\r\n', '\n')
3164
3424
message = message.replace('\r', '\n')
3166
raise errors.BzrCommandError(
3167
"please specify either --message or --file")
3426
raise errors.BzrCommandError(gettext(
3427
"please specify either --message or --file"))
3169
3429
def get_message(commit_obj):
3170
3430
"""Callback to get commit message"""
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3434
my_message = f.read().decode(osutils.get_user_encoding())
3174
3437
elif message is not None:
3175
3438
my_message = message
3184
3447
# make_commit_message_template_encoded returns user encoding.
3185
3448
# 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")
3450
my_message = set_commit_message(commit_obj)
3451
if my_message is None:
3452
start_message = generate_commit_message_template(commit_obj)
3453
my_message = edit_commit_message_encoded(text,
3454
start_message=start_message)
3455
if my_message is None:
3456
raise errors.BzrCommandError(gettext("please specify a commit"
3457
" message with either --message or --file"))
3458
if my_message == "":
3459
raise errors.BzrCommandError(gettext("Empty commit message specified."
3460
" Please specify a commit message with either"
3461
" --message or --file or leave a blank message"
3462
" with --message \"\"."))
3195
3463
return my_message
3197
3465
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3473
reporter=None, verbose=verbose, revprops=properties,
3206
3474
authors=author, timestamp=commit_stamp,
3207
3475
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3476
exclude=tree.safe_relpath_files(exclude),
3209
3478
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3479
raise errors.BzrCommandError(gettext("No changes to commit."
3480
" Please 'bzr add' the files you want to commit, or use"
3481
" --unchanged to force an empty commit."))
3212
3482
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3483
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3214
3484
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3216
3486
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3487
raise errors.BzrCommandError(gettext("Commit refused because there are"
3488
" unknown files in the working tree."))
3219
3489
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3490
e.extra_help = (gettext("\n"
3221
3491
'To commit to master branch, run update and then commit.\n'
3222
3492
'You can also pass --local to commit to continue working '
3297
3567
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.
3568
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3570
When the default format has changed after a major new release of
3571
Bazaar, you may be informed during certain operations that you
3572
should upgrade. Upgrading to a newer format may improve performance
3573
or make new features available. It may however limit interoperability
3574
with older repositories or with older versions of Bazaar.
3576
If you wish to upgrade to a particular format rather than the
3577
current default, that can be specified using the --format option.
3578
As a consequence, you can use the upgrade command this way to
3579
"downgrade" to an earlier format, though some conversions are
3580
a one way process (e.g. changing from the 1.x default to the
3581
2.x default) so downgrading is not always possible.
3583
A backup.bzr.~#~ directory is created at the start of the conversion
3584
process (where # is a number). By default, this is left there on
3585
completion. If the conversion fails, delete the new .bzr directory
3586
and rename this one back in its place. Use the --clean option to ask
3587
for the backup.bzr directory to be removed on successful conversion.
3588
Alternatively, you can delete it by hand if everything looks good
3591
If the location given is a shared repository, dependent branches
3592
are also converted provided the repository converts successfully.
3593
If the conversion of a branch fails, remaining branches are still
3596
For more information on upgrades, see the Bazaar Upgrade Guide,
3597
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3600
_see_also = ['check', 'reconcile', 'formats']
3306
3601
takes_args = ['url?']
3307
3602
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'),
3603
RegistryOption('format',
3604
help='Upgrade to a specific format. See "bzr help'
3605
' formats" for details.',
3606
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3607
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3608
value_switches=True, title='Branch format'),
3610
help='Remove the backup.bzr directory if successful.'),
3612
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3615
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3616
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3617
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3619
if len(exceptions) == 1:
3620
# Compatibility with historical behavior
3321
3626
class cmd_whoami(Command):
3340
3646
encoding_type = 'replace'
3342
3648
@display_command
3343
def run(self, email=False, branch=False, name=None):
3649
def run(self, email=False, branch=False, name=None, directory=None):
3344
3650
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()
3651
if directory is None:
3652
# use branch if we're inside one; otherwise global config
3654
c = Branch.open_containing(u'.')[0].get_config()
3655
except errors.NotBranchError:
3656
c = _mod_config.GlobalConfig()
3658
c = Branch.open(directory).get_config()
3351
3660
self.outf.write(c.user_email() + '\n')
3353
3662
self.outf.write(c.username() + '\n')
3666
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3669
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3671
_mod_config.extract_email_address(name)
3359
3672
except errors.NoEmailInUsername, e:
3360
3673
warning('"%s" does not seem to contain an email address. '
3361
3674
'This is allowed, but not recommended.', name)
3363
3676
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3678
if directory is None:
3679
c = Branch.open_containing(u'.')[0].get_config()
3681
c = Branch.open(directory).get_config()
3367
c = config.GlobalConfig()
3683
c = _mod_config.GlobalConfig()
3368
3684
c.set_user_option('email', name)
3433
3750
def remove_alias(self, alias_name):
3434
3751
if alias_name is None:
3435
raise errors.BzrCommandError(
3436
'bzr alias --remove expects an alias to remove.')
3752
raise errors.BzrCommandError(gettext(
3753
'bzr alias --remove expects an alias to remove.'))
3437
3754
# If alias is not found, print something like:
3438
3755
# unalias: foo: not found
3439
c = config.GlobalConfig()
3756
c = _mod_config.GlobalConfig()
3440
3757
c.unset_alias(alias_name)
3442
3759
@display_command
3443
3760
def print_aliases(self):
3444
3761
"""Print out the defined aliases in a similar format to bash."""
3445
aliases = config.GlobalConfig().get_aliases()
3762
aliases = _mod_config.GlobalConfig().get_aliases()
3446
3763
for key, value in sorted(aliases.iteritems()):
3447
3764
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3515
3835
if typestring == "sftp":
3516
3836
from bzrlib.tests import stub_sftp
3517
3837
return stub_sftp.SFTPAbsoluteServer
3518
if typestring == "memory":
3838
elif typestring == "memory":
3519
3839
from bzrlib.tests import test_server
3520
3840
return memory.MemoryServer
3521
if typestring == "fakenfs":
3841
elif typestring == "fakenfs":
3522
3842
from bzrlib.tests import test_server
3523
3843
return test_server.FakeNFSServer
3524
3844
msg = "No known transport type %s. Supported types are: sftp\n" %\
3537
3857
'throughout the test suite.',
3538
3858
type=get_transport_type),
3539
3859
Option('benchmark',
3540
help='Run the benchmarks rather than selftests.'),
3860
help='Run the benchmarks rather than selftests.',
3541
3862
Option('lsprof-timed',
3542
3863
help='Generate lsprof output for benchmarked'
3543
3864
' sections of code.'),
3544
3865
Option('lsprof-tests',
3545
3866
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3549
3867
Option('first',
3550
3868
help='Run all tests, but run specified tests first.',
3551
3869
short_name='f',
3560
3878
Option('randomize', type=str, argname="SEED",
3561
3879
help='Randomize the order of tests using the given'
3562
3880
' seed or "now" for the current time.'),
3563
Option('exclude', type=str, argname="PATTERN",
3565
help='Exclude tests that match this regular'
3881
ListOption('exclude', type=str, argname="PATTERN",
3883
help='Exclude tests that match this regular'
3567
3885
Option('subunit',
3568
3886
help='Output test progress via subunit.'),
3569
3887
Option('strict', help='Fail on missing dependencies or '
3586
3907
def run(self, testspecs_list=None, verbose=False, one=False,
3587
3908
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
3910
first=False, list_only=False,
3590
3911
randomize=None, exclude=None, strict=False,
3591
3912
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)
3913
parallel=None, lsprof_tests=False,
3915
from bzrlib import tests
3602
3917
if testspecs_list is not None:
3603
3918
pattern = '|'.join(testspecs_list)
3608
3923
from bzrlib.tests import SubUnitBzrRunner
3609
3924
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3925
raise errors.BzrCommandError(gettext("subunit not available. subunit "
3926
"needs to be installed to use --subunit."))
3612
3927
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3928
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3929
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3930
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3931
# following code can be deleted when it's sufficiently deployed
3932
# -- vila/mgz 20100514
3933
if (sys.platform == "win32"
3934
and getattr(sys.stdout, 'fileno', None) is not None):
3617
3936
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
3938
self.additional_selftest_args.setdefault(
3620
3939
'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)
3941
raise errors.BzrCommandError(gettext(
3942
"--benchmark is no longer supported from bzr 2.2; "
3943
"use bzr-usertest instead"))
3944
test_suite_factory = None
3946
exclude_pattern = None
3629
test_suite_factory = None
3948
exclude_pattern = '(' + '|'.join(exclude) + ')'
3950
self._disable_fsync()
3631
3951
selftest_kwargs = {"verbose": verbose,
3632
3952
"pattern": pattern,
3633
3953
"stop_on_failure": one,
3635
3955
"test_suite_factory": test_suite_factory,
3636
3956
"lsprof_timed": lsprof_timed,
3637
3957
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
3958
"matching_tests_first": first,
3640
3959
"list_only": list_only,
3641
3960
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3961
"exclude_pattern": exclude_pattern,
3643
3962
"strict": strict,
3644
3963
"load_list": load_list,
3645
3964
"debug_flags": debugflag,
3646
3965
"starting_with": starting_with
3648
3967
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3969
# Make deprecation warnings visible, unless -Werror is set
3970
cleanup = symbol_versioning.activate_deprecation_warnings(
3973
result = tests.selftest(**selftest_kwargs)
3650
3976
return int(not result)
3978
def _disable_fsync(self):
3979
"""Change the 'os' functionality to not synchronize."""
3980
self._orig_fsync = getattr(os, 'fsync', None)
3981
if self._orig_fsync is not None:
3982
os.fsync = lambda filedes: None
3983
self._orig_fdatasync = getattr(os, 'fdatasync', None)
3984
if self._orig_fdatasync is not None:
3985
os.fdatasync = lambda filedes: None
3653
3988
class cmd_version(Command):
3654
3989
__doc__ = """Show version of bzr."""
3691
4026
branch1 = Branch.open_containing(branch)[0]
3692
4027
branch2 = Branch.open_containing(other)[0]
3694
self.add_cleanup(branch1.unlock)
3696
self.add_cleanup(branch2.unlock)
4028
self.add_cleanup(branch1.lock_read().unlock)
4029
self.add_cleanup(branch2.lock_read().unlock)
3697
4030
last1 = ensure_null(branch1.last_revision())
3698
4031
last2 = ensure_null(branch2.last_revision())
3700
4033
graph = branch1.repository.get_graph(branch2.repository)
3701
4034
base_rev_id = graph.find_unique_lca(last1, last2)
3703
self.outf.write('merge base is revision %s\n' % base_rev_id)
4036
self.outf.write(gettext('merge base is revision %s\n') % base_rev_id)
3706
4039
class cmd_merge(Command):
3709
4042
The source of the merge can be specified either in the form of a branch,
3710
4043
or in the form of a path to a file containing a merge directive generated
3711
4044
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.
4045
or the branch most recently merged using --remember. The source of the
4046
merge may also be specified in the form of a path to a file in another
4047
branch: in this case, only the modifications to that file are merged into
4048
the current working tree.
4050
When merging from a branch, by default bzr will try to merge in all new
4051
work from the other branch, automatically determining an appropriate base
4052
revision. If this fails, you may need to give an explicit base.
4054
To pick a different ending revision, pass "--revision OTHER". bzr will
4055
try to merge in all new work up to and including revision OTHER.
4057
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4058
through OTHER, excluding BASE but including OTHER, will be merged. If this
4059
causes some revisions to be skipped, i.e. if the destination branch does
4060
not already contain revision BASE, such a merge is commonly referred to as
4061
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4062
cherrypicks. The changes look like a normal commit, and the history of the
4063
changes from the other branch is not stored in the commit.
4065
Revision numbers are always relative to the source branch.
3725
4067
Merge will do its best to combine the changes in two branches, but there
3726
4068
are some kinds of problems only a human can fix. When it encounters those,
3730
4072
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.
4074
If there is no default branch set, the first merge will set it (use
4075
--no-remember to avoid setting it). After that, you can omit the branch
4076
to use the default. To change the default, use --remember. The value will
4077
only be saved if the remote location can be accessed.
3737
4079
The results of the merge are placed into the destination working
3738
4080
directory, where they can be reviewed (with bzr diff), tested, and then
3739
4081
committed to record the result of the merge.
3741
4083
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
4084
--force is given. If --force is given, then the changes from the source
4085
will be merged with the current working tree, including any uncommitted
4086
changes in the tree. The --force option can also be used to create a
3743
4087
merge revision which has more than two parents.
3745
4089
If one would like to merge changes from the working tree of the other
3793
4137
' completely merged into the source, pull from the'
3794
4138
' source rather than merging. When this happens,'
3795
4139
' you do not need to commit the result.'),
4140
custom_help('directory',
3797
4141
help='Branch to merge into, '
3798
'rather than the one containing the working directory.',
4142
'rather than the one containing the working directory.'),
3802
4143
Option('preview', help='Instead of merging, show a diff of the'
3804
4145
Option('interactive', help='Select changes interactively.',
3847
4191
mergeable = None
3849
4193
if uncommitted:
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
4194
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4195
' with bundles or merge directives.'))
3853
4197
if revision is not None:
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
4198
raise errors.BzrCommandError(gettext(
4199
'Cannot use -r with merge directives or bundles'))
3856
4200
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3857
4201
mergeable, None)
3859
4203
if merger is None and uncommitted:
3860
4204
if revision is not None and len(revision) > 0:
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
4205
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4206
' --revision at the same time.'))
3863
4207
merger = self.get_merger_from_uncommitted(tree, location, None)
3864
4208
allow_pending = False
3873
4217
self.sanity_check_merger(merger)
3874
4218
if (merger.base_rev_id == merger.other_rev_id and
3875
4219
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4220
# check if location is a nonexistent file (and not a branch) to
4221
# disambiguate the 'Nothing to do'
4222
if merger.interesting_files:
4223
if not merger.other_tree.has_filename(
4224
merger.interesting_files[0]):
4225
note(gettext("merger: ") + str(merger))
4226
raise errors.PathsDoNotExist([location])
4227
note(gettext('Nothing to do.'))
4229
if pull and not preview:
3879
4230
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4231
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4232
if (merger.base_rev_id == tree.last_revision()):
3882
4233
result = tree.pull(merger.other_branch, False,
3883
4234
merger.other_rev_id)
3884
4235
result.report(self.outf)
3886
4237
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4238
raise errors.BzrCommandError(gettext(
3888
4239
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4240
" (perhaps you would prefer 'bzr pull')"))
3891
4242
return self._do_preview(merger)
3892
4243
elif interactive:
3905
4256
def _do_preview(self, merger):
3906
4257
from bzrlib.diff import show_diff_trees
3907
4258
result_tree = self._get_preview(merger)
4259
path_encoding = osutils.get_diff_header_encoding()
3908
4260
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
4261
old_label='', new_label='',
4262
path_encoding=path_encoding)
3911
4264
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
4265
merger.change_reporter = change_reporter
3950
4303
# Use reprocess if the merger supports it
3951
4304
merger.reprocess = merger.merge_type.supports_reprocess
3952
4305
if merger.reprocess and not merger.merge_type.supports_reprocess:
3953
raise errors.BzrCommandError("Conflict reduction is not supported"
3954
" for merge type %s." %
4306
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4307
" for merge type %s.") %
3955
4308
merger.merge_type)
3956
4309
if merger.reprocess and merger.show_base:
3957
raise errors.BzrCommandError("Cannot do conflict reduction and"
4310
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
3960
4313
def _get_merger_from_branch(self, tree, location, revision, remember,
3961
4314
possible_transports, pb):
3988
4341
if other_revision_id is None:
3989
4342
other_revision_id = _mod_revision.ensure_null(
3990
4343
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):
4344
# Remember where we merge from. We need to remember if:
4345
# - user specify a location (and we don't merge from the parent
4347
# - user ask to remember or there is no previous location set to merge
4348
# from and user didn't ask to *not* remember
4349
if (user_location is not None
4351
or (remember is None
4352
and tree.branch.get_submit_branch() is None)))):
3994
4353
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4354
# Merge tags (but don't set them in the master branch yet, the user
4355
# might revert this merge). Commit will propagate them.
4356
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4357
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4358
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4359
if other_path != '':
4057
4418
stored_location_type = "parent"
4058
4419
mutter("%s", stored_location)
4059
4420
if stored_location is None:
4060
raise errors.BzrCommandError("No location specified or remembered")
4421
raise errors.BzrCommandError(gettext("No location specified or remembered"))
4061
4422
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)
4423
note(gettext("{0} remembered {1} location {2}").format(verb_string,
4424
stored_location_type, display_url))
4064
4425
return stored_location
4099
4460
from bzrlib.conflicts import restore
4100
4461
if merge_type is None:
4101
4462
merge_type = _mod_merge.Merge3Merger
4102
tree, file_list = tree_files(file_list)
4104
self.add_cleanup(tree.unlock)
4463
tree, file_list = WorkingTree.open_containing_paths(file_list)
4464
self.add_cleanup(tree.lock_write().unlock)
4105
4465
parents = tree.get_parent_ids()
4106
4466
if len(parents) != 2:
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4467
raise errors.BzrCommandError(gettext("Sorry, remerge only works after normal"
4108
4468
" merges. Not cherrypicking or"
4110
4470
repository = tree.branch.repository
4111
4471
interesting_ids = None
4112
4472
new_conflicts = []
4167
4527
last committed revision is used.
4169
4529
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.
4530
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4531
will remove the changes introduced by the second last commit (-2), without
4532
affecting the changes introduced by the last commit (-1). To remove
4533
certain changes on a hunk-by-hunk basis, see the shelve command.
4174
4535
By default, any files that have been manually changed will be backed up
4175
4536
first. (Files changed only by merge are not backed up.) Backup files have
4340
4703
theirs_only=False,
4341
4704
log_format=None, long=False, short=False, line=False,
4342
4705
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4706
include_merged=None, revision=None, my_revision=None,
4708
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4344
4709
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4710
def message(s):
4346
4711
if not is_quiet():
4347
4712
self.outf.write(s)
4714
if symbol_versioning.deprecated_passed(include_merges):
4715
ui.ui_factory.show_user_warning(
4716
'deprecated_command_option',
4717
deprecated_name='--include-merges',
4718
recommended_name='--include-merged',
4719
deprecated_in_version='2.5',
4720
command=self.invoked_as)
4721
if include_merged is None:
4722
include_merged = include_merges
4724
raise errors.BzrCommandError(gettext(
4725
'{0} and {1} are mutually exclusive').format(
4726
'--include-merges', '--include-merged'))
4727
if include_merged is None:
4728
include_merged = False
4350
4730
mine_only = this
4359
4739
elif theirs_only:
4360
4740
restrict = 'remote'
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4742
local_branch = Branch.open_containing(directory)[0]
4743
self.add_cleanup(local_branch.lock_read().unlock)
4366
4745
parent = local_branch.get_parent()
4367
4746
if other_branch is None:
4368
4747
other_branch = parent
4369
4748
if other_branch is None:
4370
raise errors.BzrCommandError("No peer location known"
4749
raise errors.BzrCommandError(gettext("No peer location known"
4372
4751
display_url = urlutils.unescape_for_display(parent,
4373
4752
self.outf.encoding)
4374
message("Using saved parent location: "
4375
+ display_url + "\n")
4753
message(gettext("Using saved parent location: {0}\n").format(
4377
4756
remote_branch = Branch.open(other_branch)
4378
4757
if remote_branch.base == local_branch.base:
4379
4758
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4760
self.add_cleanup(remote_branch.lock_read().unlock)
4384
4762
local_revid_range = _revision_range_to_revid_range(
4385
4763
_get_revision_range(my_revision, local_branch,
4430
4812
if mine_only and not local_extra:
4431
4813
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4814
message(gettext('This branch has no new revisions.\n'))
4433
4815
elif theirs_only and not remote_extra:
4434
4816
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4817
message(gettext('Other branch has no new revisions.\n'))
4436
4818
elif not (mine_only or theirs_only or local_extra or
4438
4820
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
4822
message(gettext("Branches are up to date.\n"))
4441
4823
self.cleanup_now()
4442
4824
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)
4825
self.add_cleanup(local_branch.lock_write().unlock)
4445
4826
# handle race conditions - a parent might be set while we run.
4446
4827
if local_branch.get_parent() is None:
4447
4828
local_branch.set_parent(remote_branch.base)
4507
4888
@display_command
4508
4889
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")
4890
from bzrlib import plugin
4891
# Don't give writelines a generator as some codecs don't like that
4892
self.outf.writelines(
4893
list(plugin.describe_plugins(show_paths=verbose)))
4531
4896
class cmd_testament(Command):
4578
4942
Option('long', help='Show commit date in annotations.'),
4582
4947
encoding_type = 'exact'
4584
4949
@display_command
4585
4950
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4951
show_ids=False, directory=None):
4952
from bzrlib.annotate import (
4588
4955
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4956
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
4957
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4958
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4960
self.add_cleanup(branch.lock_read().unlock)
4596
4961
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4962
self.add_cleanup(tree.lock_read().unlock)
4963
if wt is not None and revision is None:
4600
4964
file_id = wt.path2id(relpath)
4602
4966
file_id = tree.path2id(relpath)
4603
4967
if file_id is None:
4604
4968
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
4969
if wt is not None and revision is None:
4607
4970
# If there is a tree and we're not annotating historical
4608
4971
# versions, annotate the working tree's content.
4609
4972
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
4973
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4975
annotate_file_tree(tree, file_id, self.outf, long, all,
4976
show_ids=show_ids, branch=branch)
4616
4979
class cmd_re_sign(Command):
4620
4983
hidden = True # is this right ?
4621
4984
takes_args = ['revision_id*']
4622
takes_options = ['revision']
4985
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
4987
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
4988
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')
4989
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
4990
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)
4991
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
4992
b = WorkingTree.open_containing(directory)[0].branch
4993
self.add_cleanup(b.lock_write().unlock)
4632
4994
return self._run(b, revision_id_list, revision)
4634
4996
def _run(self, b, revision_id_list, revision):
4694
5056
_see_also = ['checkouts', 'unbind']
4695
5057
takes_args = ['location?']
5058
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5060
def run(self, location=None, directory=u'.'):
5061
b, relpath = Branch.open_containing(directory)
4700
5062
if location is None:
4702
5064
location = b.get_old_bound_location()
4703
5065
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5066
raise errors.BzrCommandError(gettext('No location supplied. '
5067
'This format does not remember old locations.'))
4707
5069
if location is None:
4708
5070
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5071
raise errors.BzrCommandError(gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5073
raise errors.BzrCommandError(gettext('No location supplied '
5074
'and no previous location known'))
4713
5075
b_other = Branch.open(location)
4715
5077
b.bind(b_other)
4716
5078
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5079
raise errors.BzrCommandError(gettext('These branches have diverged.'
5080
' Try merging, and then bind again.'))
4719
5081
if b.get_config().has_explicit_nickname():
4720
5082
b.nick = b_other.nick
4771
5135
encoding_type = 'replace'
4773
def run(self, location=None,
4774
dry_run=False, verbose=False,
4775
revision=None, force=False, local=False):
5137
def run(self, location=None, dry_run=False, verbose=False,
5138
revision=None, force=False, local=False, keep_tags=False):
4776
5139
if location is None:
4777
5140
location = u'.'
4778
5141
control, relpath = bzrdir.BzrDir.open_containing(location)
4784
5147
b = control.open_branch()
4786
5149
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5150
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)
5152
self.add_cleanup(b.lock_write().unlock)
5153
return self._run(b, tree, dry_run, verbose, revision, force,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5156
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4795
5158
from bzrlib.log import log_formatter, show_log
4796
5159
from bzrlib.uncommit import uncommit
4827
5190
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5193
self.outf.write(gettext('Dry-run, pretending to remove'
5194
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5196
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')
5199
if not ui.ui_factory.confirm_action(
5200
gettext(u'Uncommit these revisions'),
5201
'bzrlib.builtins.uncommit',
5203
self.outf.write(gettext('Canceled\n'))
4840
5206
mutter('Uncommitting from {%s} to {%s}',
4841
5207
last_rev_id, rev_id)
4842
5208
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)
5209
revno=revno, local=local, keep_tags=keep_tags)
5210
self.outf.write(gettext('You can restore the old tip by running:\n'
5211
' bzr pull . -r revid:%s\n') % last_rev_id)
4848
5214
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5215
__doc__ = """Break a dead lock.
5217
This command breaks a lock on a repository, branch, working directory or
4851
5220
CAUTION: Locks should only be broken when you are sure that the process
4852
5221
holding the lock has been stopped.
4859
5228
bzr break-lock bzr+ssh://example.com/bzr/foo
5229
bzr break-lock --conf ~/.bazaar
4861
5232
takes_args = ['location?']
5235
help='LOCATION is the directory where the config lock is.'),
5237
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5240
def run(self, location=None, config=False, force=False):
4864
5241
if location is None:
4865
5242
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5244
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5246
{'bzrlib.lockdir.break': True})
5248
conf = _mod_config.LockableConfig(file_name=location)
5251
control, relpath = bzrdir.BzrDir.open_containing(location)
5253
control.break_lock()
5254
except NotImplementedError:
4873
5258
class cmd_wait_until_signalled(Command):
4936
5322
return host, port
4938
5324
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5325
protocol=None, client_timeout=None):
5326
from bzrlib import transport
4941
5327
if directory is None:
4942
5328
directory = os.getcwd()
4943
5329
if protocol is None:
4944
protocol = transport_server_registry.get()
5330
protocol = transport.transport_server_registry.get()
4945
5331
host, port = self.get_host_and_port(port)
4946
5332
url = urlutils.local_path_to_url(directory)
4947
5333
if not allow_writes:
4948
5334
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5335
t = transport.get_transport(url)
5337
protocol(t, host, port, inet, client_timeout)
5338
except TypeError, e:
5339
# We use symbol_versioning.deprecated_in just so that people
5340
# grepping can find it here.
5341
# symbol_versioning.deprecated_in((2, 5, 0))
5342
symbol_versioning.warn(
5343
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5344
'Most likely it needs to be updated to support a'
5345
' "timeout" parameter (added in bzr 2.5.0)'
5346
% (e, protocol.__module__, protocol),
5348
protocol(t, host, port, inet)
4953
5351
class cmd_join(Command):
4986
5384
except errors.BadReferenceTarget, e:
4987
5385
# XXX: Would be better to just raise a nicely printable
4988
5386
# exception from the real origin. Also below. mbp 20070306
4989
raise errors.BzrCommandError("Cannot join %s. %s" %
5387
raise errors.BzrCommandError(
5388
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4993
5391
containing_tree.subsume(sub_tree)
4994
5392
except errors.BadSubsumeSource, e:
4995
raise errors.BzrCommandError("Cannot join %s. %s" %
5393
raise errors.BzrCommandError(
5394
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4999
5397
class cmd_split(Command):
5064
5463
encoding_type = 'exact'
5066
5465
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5067
sign=False, revision=None, mail_to=None, message=None):
5466
sign=False, revision=None, mail_to=None, message=None,
5068
5468
from bzrlib.revision import ensure_null, NULL_REVISION
5069
5469
include_patch, include_bundle = {
5070
5470
'plain': (False, False),
5071
5471
'diff': (True, False),
5072
5472
'bundle': (True, True),
5074
branch = Branch.open('.')
5474
branch = Branch.open(directory)
5075
5475
stored_submit_branch = branch.get_submit_branch()
5076
5476
if submit_branch is None:
5077
5477
submit_branch = stored_submit_branch
5089
5489
elif stored_public_branch is None:
5090
5490
branch.set_public_branch(public_branch)
5091
5491
if not include_bundle and public_branch is None:
5092
raise errors.BzrCommandError('No public branch specified or'
5492
raise errors.BzrCommandError(gettext('No public branch specified or'
5094
5494
base_revision_id = None
5095
5495
if revision is not None:
5096
5496
if len(revision) > 2:
5097
raise errors.BzrCommandError('bzr merge-directive takes '
5098
'at most two one revision identifiers')
5497
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5498
'at most two one revision identifiers'))
5099
5499
revision_id = revision[-1].as_revision_id(branch)
5100
5500
if len(revision) == 2:
5101
5501
base_revision_id = revision[0].as_revision_id(branch)
5153
5553
source branch defaults to that containing the working directory, but can
5154
5554
be changed using --from.
5556
Both the submit branch and the public branch follow the usual behavior with
5557
respect to --remember: If there is no default location set, the first send
5558
will set it (use --no-remember to avoid setting it). After that, you can
5559
omit the location to use the default. To change the default, use
5560
--remember. The value will only be saved if the location can be accessed.
5156
5562
In order to calculate those changes, bzr must analyse the submit branch.
5157
5563
Therefore it is most efficient for the submit branch to be a local mirror.
5158
5564
If a public location is known for the submit_branch, that location is used
5229
5635
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
no_patch=False, revision=None, remember=False, output=None,
5636
no_patch=False, revision=None, remember=None, output=None,
5231
5637
format=None, mail_to=None, message=None, body=None,
5232
5638
strict=None, **kwargs):
5233
5639
from bzrlib.send import send
5359
5762
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5763
self.add_cleanup(branch.lock_write().unlock)
5363
5765
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5766
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5767
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5768
note(gettext('Deleted tag %s.') % tag_name)
5369
5771
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5772
raise errors.BzrCommandError(gettext(
5371
5773
"Tags can only be placed on a single revision, "
5373
5775
revision_id = revision[0].as_revision_id(branch)
5375
5777
revision_id = branch.last_revision()
5376
5778
if tag_name is None:
5377
5779
tag_name = branch.automatic_tag_name(revision_id)
5378
5780
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):
5781
raise errors.BzrCommandError(gettext(
5782
"Please specify a tag name."))
5784
existing_target = branch.tags.lookup_tag(tag_name)
5785
except errors.NoSuchTag:
5786
existing_target = None
5787
if not force and existing_target not in (None, revision_id):
5382
5788
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5789
if existing_target == revision_id:
5790
note(gettext('Tag %s already exists for that revision.') % tag_name)
5792
branch.tags.set_tag(tag_name, revision_id)
5793
if existing_target is None:
5794
note(gettext('Created tag %s.') % tag_name)
5796
note(gettext('Updated tag %s.') % tag_name)
5387
5799
class cmd_tags(Command):
5393
5805
_see_also = ['tag']
5394
5806
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5807
custom_help('directory',
5808
help='Branch whose tags should be displayed.'),
5809
RegistryOption('sort',
5401
5810
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5811
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
5817
@display_command
5818
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5819
from bzrlib.tag import tag_sort_methods
5416
5820
branch, relpath = Branch.open_containing(directory)
5418
5822
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
5826
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]])
5828
# Restrict to the specified range
5829
tags = self._tags_for_range(branch, revision)
5831
sort = tag_sort_methods.get()
5444
5833
if not show_ids:
5445
5834
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
5835
for index, (tag, revid) in enumerate(tags):
5448
5837
revno = branch.revision_id_to_dotted_revno(revid)
5449
5838
if isinstance(revno, tuple):
5450
5839
revno = '.'.join(map(str, revno))
5451
except errors.NoSuchRevision:
5840
except (errors.NoSuchRevision,
5841
errors.GhostRevisionsHaveNoRevno,
5842
errors.UnsupportedOperation):
5452
5843
# Bad tag data/merges can lead to tagged revisions
5453
5844
# which are not in this branch. Fail gracefully ...
5457
5848
for tag, revspec in tags:
5458
5849
self.outf.write('%-20s %s\n' % (tag, revspec))
5851
def _tags_for_range(self, branch, revision):
5853
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5854
revid1, revid2 = rev1.rev_id, rev2.rev_id
5855
# _get_revision_range will always set revid2 if it's not specified.
5856
# If revid1 is None, it means we want to start from the branch
5857
# origin which is always a valid ancestor. If revid1 == revid2, the
5858
# ancestry check is useless.
5859
if revid1 and revid1 != revid2:
5860
# FIXME: We really want to use the same graph than
5861
# branch.iter_merge_sorted_revisions below, but this is not
5862
# easily available -- vila 2011-09-23
5863
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5864
# We don't want to output anything in this case...
5866
# only show revisions between revid1 and revid2 (inclusive)
5867
tagged_revids = branch.tags.get_reverse_tag_dict()
5869
for r in branch.iter_merge_sorted_revisions(
5870
start_revision_id=revid2, stop_revision_id=revid1,
5871
stop_rule='include'):
5872
revid_tags = tagged_revids.get(r[0], None)
5874
found.extend([(tag, r[0]) for tag in revid_tags])
5461
5878
class cmd_reconfigure(Command):
5462
5879
__doc__ = """Reconfigure the type of a bzr directory.
5476
5893
takes_args = ['location?']
5477
5894
takes_options = [
5478
5895
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
5898
help='The relation between branch and tree.',
5482
5899
value_switches=True, enum_switch=False,
5483
5900
branch='Reconfigure to be an unbound branch with no working tree.',
5484
5901
tree='Reconfigure to be an unbound branch with a working tree.',
5485
5902
checkout='Reconfigure to be a bound branch with a working tree.',
5486
5903
lightweight_checkout='Reconfigure to be a lightweight'
5487
5904
' checkout (with no local history).',
5906
RegistryOption.from_kwargs(
5908
title='Repository type',
5909
help='Location fo the repository.',
5910
value_switches=True, enum_switch=False,
5488
5911
standalone='Reconfigure to be a standalone branch '
5489
5912
'(i.e. stop using shared repository).',
5490
5913
use_shared='Reconfigure to use a shared repository.',
5915
RegistryOption.from_kwargs(
5917
title='Trees in Repository',
5918
help='Whether new branches in the repository have trees.',
5919
value_switches=True, enum_switch=False,
5491
5920
with_trees='Reconfigure repository to create '
5492
5921
'working trees on branches by default.',
5493
5922
with_no_trees='Reconfigure repository to not create '
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5939
def run(self, location=None, bind_to=None, force=False,
5940
tree_type=None, repository_type=None, repository_trees=None,
5941
stacked_on=None, unstacked=None):
5513
5942
directory = bzrdir.BzrDir.open(location)
5514
5943
if stacked_on and unstacked:
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5944
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5516
5945
elif stacked_on is not None:
5517
5946
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5518
5947
elif unstacked:
5520
5949
# At the moment you can use --stacked-on and a different
5521
5950
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
5952
if (tree_type is None and
5953
repository_type is None and
5954
repository_trees is None):
5524
5955
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
5958
raise errors.BzrCommandError(gettext('No target configuration '
5960
reconfiguration = None
5961
if tree_type == 'branch':
5530
5962
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
5963
elif tree_type == 'tree':
5532
5964
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
5965
elif tree_type == 'checkout':
5534
5966
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
5967
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
5968
elif tree_type == 'lightweight-checkout':
5537
5969
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
5970
directory, bind_to)
5539
elif target_type == 'use-shared':
5972
reconfiguration.apply(force)
5973
reconfiguration = None
5974
if repository_type == 'use-shared':
5540
5975
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
5976
elif repository_type == 'standalone':
5542
5977
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
5979
reconfiguration.apply(force)
5980
reconfiguration = None
5981
if repository_trees == 'with-trees':
5544
5982
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
5983
directory, True)
5546
elif target_type == 'with-no-trees':
5984
elif repository_trees == 'with-no-trees':
5547
5985
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
5986
directory, False)
5549
reconfiguration.apply(force)
5988
reconfiguration.apply(force)
5989
reconfiguration = None
5552
5992
class cmd_switch(Command):
5584
6025
def run(self, to_location=None, force=False, create_branch=False,
6026
revision=None, directory=u'.'):
5586
6027
from bzrlib import switch
6028
tree_location = directory
5588
6029
revision = _get_one_revision('switch', revision)
5589
6030
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
6031
if to_location is None:
5591
6032
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6033
raise errors.BzrCommandError(gettext('You must supply either a'
6034
' revision or a location'))
6035
to_location = tree_location
5596
6037
branch = control_dir.open_branch()
5597
6038
had_explicit_nick = branch.get_config().has_explicit_nickname()
5735
tree, file_list = tree_files(file_list, apply_view=False)
6176
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6178
current_view, view_dict = tree.views.get_view_info()
5737
6179
if name is None:
5738
6180
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6183
raise errors.BzrCommandError(gettext(
6184
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6186
raise errors.BzrCommandError(gettext(
6187
"Both --delete and --switch specified"))
5747
6189
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6190
self.outf.write(gettext("Deleted all views.\n"))
5749
6191
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6192
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6194
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6195
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6198
raise errors.BzrCommandError(gettext(
6199
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6201
raise errors.BzrCommandError(gettext(
6202
"Both --switch and --all specified"))
5761
6203
elif switch == 'off':
5762
6204
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6205
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6206
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6207
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6209
tree.views.set_view_info(switch, view_dict)
5768
6210
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6211
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6214
self.outf.write(gettext('Views defined:\n'))
5773
6215
for view in sorted(view_dict):
5774
6216
if view == current_view:
5778
6220
view_str = views.view_display_str(view_dict[view])
5779
6221
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6223
self.outf.write(gettext('No views defined.\n'))
5782
6224
elif file_list:
5783
6225
if name is None:
5784
6226
# No name given and no current view set
5786
6228
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6229
raise errors.BzrCommandError(gettext(
6230
"Cannot change the 'off' pseudo view"))
5789
6231
tree.views.set_view(name, sorted(file_list))
5790
6232
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6233
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6235
# list the files
5794
6236
if name is None:
5795
6237
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6238
self.outf.write(gettext('No current view.\n'))
5798
6240
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6241
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6244
class cmd_hooks(Command):
5868
6310
You can put multiple items on the shelf, and by default, 'unshelve' will
5869
6311
restore the most recently shelved changes.
6313
For complicated changes, it is possible to edit the changes in a separate
6314
editor program to decide what the file remaining in the working copy
6315
should look like. To do this, add the configuration option
6317
change_editor = PROGRAM @new_path @old_path
6319
where @new_path is replaced with the path of the new version of the
6320
file and @old_path is replaced with the path of the old version of
6321
the file. The PROGRAM should save the new file with the desired
6322
contents of the file in the working tree.
5872
6326
takes_args = ['file*']
5874
6328
takes_options = [
5876
6331
Option('all', help='Shelve all changes.'),
5883
6338
Option('destroy',
5884
6339
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6341
_see_also = ['unshelve', 'configuration']
5888
6343
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6344
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6346
return self.run_for_list(directory=directory)
5892
6347
from bzrlib.shelf_ui import Shelver
5893
6348
if writer is None:
5894
6349
writer = bzrlib.option.diff_writer_registry.get()
5896
6351
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6352
file_list, message, destroy=destroy, directory=directory)
5902
6357
except errors.UserAbort:
5905
def run_for_list(self):
5906
tree = WorkingTree.open_containing('.')[0]
5908
self.add_cleanup(tree.unlock)
6360
def run_for_list(self, directory=None):
6361
if directory is None:
6363
tree = WorkingTree.open_containing(directory)[0]
6364
self.add_cleanup(tree.lock_read().unlock)
5909
6365
manager = tree.get_shelf_manager()
5910
6366
shelves = manager.active_shelves()
5911
6367
if len(shelves) == 0:
5912
note('No shelved changes.')
6368
note(gettext('No shelved changes.'))
5914
6370
for shelf_id in reversed(shelves):
5915
6371
message = manager.get_metadata(shelf_id).get('message')
5967
6424
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'
6426
takes_options = ['directory',
6427
Option('ignored', help='Delete all ignored files.'),
6428
Option('detritus', help='Delete conflict files, merge and revert'
5971
6429
' backups, and failed selftest dirs.'),
5972
6430
Option('unknown',
5973
6431
help='Delete files unknown to bzr (default).'),
5975
6433
' deleting them.'),
5976
6434
Option('force', help='Do not prompt before deleting.')]
5977
6435
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6436
force=False, directory=u'.'):
5979
6437
from bzrlib.clean_tree import clean_tree
5980
6438
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6442
clean_tree(directory, unknown=unknown, ignored=ignored,
6443
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6446
class cmd_reference(Command):
6032
6490
self.outf.write('%s %s\n' % (path, location))
6493
class cmd_export_pot(Command):
6494
__doc__ = """Export command helps and error messages in po format."""
6497
takes_options = [Option('plugin',
6498
help='Export help text from named command '\
6499
'(defaults to all built in commands).',
6502
def run(self, plugin=None):
6503
from bzrlib.export_pot import export_pot
6504
export_pot(self.outf, plugin)
6035
6507
def _register_lazy_builtins():
6036
6508
# register lazy builtins from other modules; called at startup and should
6037
6509
# be only called once.
6038
6510
for (name, aliases, module_name) in [
6039
6511
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6512
('cmd_config', [], 'bzrlib.config'),
6040
6513
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6514
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6515
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6516
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6517
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6518
('cmd_verify_signatures', [],
6519
'bzrlib.commit_signature_commands'),
6520
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6522
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
