73
73
_parse_revision_str,
75
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
81
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
82
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
84
return internal_tree_files(file_list, default_branch, canonicalize,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
88
88
def tree_files_for_add(file_list):
153
153
# XXX: Bad function name; should possibly also be a class method of
154
154
# WorkingTree rather than a function.
155
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
156
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
157
156
apply_view=True):
158
157
"""Convert command-line paths to a WorkingTree and relative paths.
160
Deprecated: use WorkingTree.open_containing_paths instead.
162
159
This is typically used for command-line processors that take one or
163
160
more filenames, and infer the workingtree that contains them.
175
172
:return: workingtree, [relative_paths]
177
return WorkingTree.open_containing_paths(
178
file_list, default_directory='.',
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
183
223
def _get_view_info_for_change_reporter(tree):
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)
203
235
# TODO: Make sure no commands unconditionally use the working directory as a
204
236
# branch. If a filename argument is used, the first of them should be used to
205
237
# specify the branch. (Perhaps this can be factored out into some kind of
234
266
Not versioned and not matching an ignore pattern.
236
Additionally for directories, symlinks and files with a changed
237
executable bit, Bazaar indicates their type using a trailing
238
character: '/', '@' or '*' respectively. These decorations can be
239
disabled using the '--no-classify' option.
268
Additionally for directories, symlinks and files with an executable
269
bit, Bazaar indicates their type using a trailing character: '/', '@'
241
272
To see ignored files use 'bzr ignored'. For details on the
242
273
changes to file texts, use 'bzr diff'.
255
286
To skip the display of pending merge information altogether, use
256
287
the no-pending option or specify a file/directory.
258
To compare the working directory to a specific revision, pass a
259
single revision to the revision argument.
261
To see which files have changed in a specific revision, or between
262
two revisions, pass a revision range to the revision argument.
263
This will produce the same results as calling 'bzr diff --summarize'.
289
If a revision argument is given, the status is calculated against
290
that revision, or between two revisions if two are provided.
266
293
# TODO: --no-recurse, --recurse options
286
310
def run(self, show_ids=False, file_list=None, revision=None, short=False,
287
versioned=False, no_pending=False, verbose=False,
311
versioned=False, no_pending=False, verbose=False):
289
312
from bzrlib.status import show_tree_status
291
314
if revision and len(revision) > 2:
292
raise errors.BzrCommandError(gettext('bzr status --revision takes exactly'
293
' one or two revision specifiers'))
315
raise errors.BzrCommandError('bzr status --revision takes exactly'
316
' one or two revision specifiers')
295
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
318
tree, relfile_list = tree_files(file_list)
296
319
# Avoid asking for specific files when that is not needed.
297
320
if relfile_list == ['']:
298
321
relfile_list = None
305
328
show_tree_status(tree, show_ids=show_ids,
306
329
specific_files=relfile_list, revision=revision,
307
330
to_file=self.outf, short=short, versioned=versioned,
308
show_pending=(not no_pending), verbose=verbose,
309
classify=not no_classify)
331
show_pending=(not no_pending), verbose=verbose)
312
334
class cmd_cat_revision(Command):
331
353
self.outf.write(revtext.decode('utf-8'))
334
def run(self, revision_id=None, revision=None, directory=u'.'):
356
def run(self, revision_id=None, revision=None):
335
357
if revision_id is not None and revision is not None:
336
raise errors.BzrCommandError(gettext('You can only supply one of'
337
' revision_id or --revision'))
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
338
360
if revision_id is None and revision is None:
339
raise errors.BzrCommandError(gettext('You must supply either'
340
' --revision or a revision_id'))
342
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
344
365
revisions = b.repository.revisions
345
366
if revisions is None:
346
raise errors.BzrCommandError(gettext('Repository %r does not support '
347
'access to raw revision texts'))
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
349
370
b.repository.lock_read()
355
376
self.print_revision(revisions, revision_id)
356
377
except errors.NoSuchRevision:
357
msg = gettext("The repository {0} contains no revision {1}.").format(
378
msg = "The repository %s contains no revision %s." % (
358
379
b.repository.base, revision_id)
359
380
raise errors.BzrCommandError(msg)
360
381
elif revision is not None:
361
382
for rev in revision:
363
384
raise errors.BzrCommandError(
364
gettext('You cannot specify a NULL revision.'))
385
'You cannot specify a NULL revision.')
365
386
rev_id = rev.as_revision_id(b)
366
387
self.print_revision(revisions, rev_id)
479
497
working = d.open_workingtree()
480
498
except errors.NoWorkingTree:
481
raise errors.BzrCommandError(gettext("No working tree to remove"))
499
raise errors.BzrCommandError("No working tree to remove")
482
500
except errors.NotLocalUrl:
483
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
484
" of a remote path"))
501
raise errors.BzrCommandError("You cannot remove the working tree"
486
504
if (working.has_changes()):
487
505
raise errors.UncommittedChanges(working)
488
if working.get_shelf_manager().last_shelf() is not None:
489
raise errors.ShelvedChanges(working)
491
507
if working.user_url != working.branch.user_url:
492
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
493
" from a lightweight checkout"))
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
495
511
d.destroy_workingtree()
498
class cmd_repair_workingtree(Command):
499
__doc__ = """Reset the working tree state file.
501
This is not meant to be used normally, but more as a way to recover from
502
filesystem corruption, etc. This rebuilds the working inventory back to a
503
'known good' state. Any new modifications (adding a file, renaming, etc)
504
will be lost, though modified files will still be detected as such.
506
Most users will want something more like "bzr revert" or "bzr update"
507
unless the state file has become corrupted.
509
By default this attempts to recover the current state by looking at the
510
headers of the state file. If the state file is too corrupted to even do
511
that, you can supply --revision to force the state of the tree.
514
takes_options = ['revision', 'directory',
516
help='Reset the tree even if it doesn\'t appear to be'
521
def run(self, revision=None, directory='.', force=False):
522
tree, _ = WorkingTree.open_containing(directory)
523
self.add_cleanup(tree.lock_tree_write().unlock)
527
except errors.BzrError:
528
pass # There seems to be a real error here, so we'll reset
531
raise errors.BzrCommandError(gettext(
532
'The tree does not appear to be corrupt. You probably'
533
' want "bzr revert" instead. Use "--force" if you are'
534
' sure you want to reset the working tree.'))
538
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
540
tree.reset_state(revision_ids)
541
except errors.BzrError, e:
542
if revision_ids is None:
543
extra = (gettext(', the header appears corrupt, try passing -r -1'
544
' to set the state to the last commit'))
547
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
550
514
class cmd_revno(Command):
551
515
__doc__ = """Show current revision number.
713
677
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
714
678
to_file=self.outf, should_print=(not is_quiet()))
716
action = bzrlib.add.AddWithSkipLargeAction(to_file=self.outf,
680
action = bzrlib.add.AddAction(to_file=self.outf,
717
681
should_print=(not is_quiet()))
720
self.add_cleanup(base_tree.lock_read().unlock)
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
721
686
tree, file_list = tree_files_for_add(file_list)
722
687
added, ignored = tree.smart_add(file_list, not
723
688
no_recurse, action=action, save=not dry_run)
793
757
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
794
758
if kind and kind not in ['file', 'directory', 'symlink']:
795
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
797
761
revision = _get_one_revision('inventory', revision)
798
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
799
self.add_cleanup(work_tree.lock_read().unlock)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
800
765
if revision is not None:
801
766
tree = revision.as_tree(work_tree.branch)
803
768
extra_trees = [work_tree]
804
self.add_cleanup(tree.lock_read().unlock)
770
self.add_cleanup(tree.unlock)
863
828
return self.run_auto(names_list, after, dry_run)
865
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
830
raise errors.BzrCommandError('--dry-run requires --auto.')
866
831
if names_list is None:
868
833
if len(names_list) < 2:
869
raise errors.BzrCommandError(gettext("missing file argument"))
870
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
871
self.add_cleanup(tree.lock_tree_write().unlock)
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)
872
838
self._run(tree, names_list, rel_names, after)
874
840
def run_auto(self, names_list, after, dry_run):
875
841
if names_list is not None and len(names_list) > 1:
876
raise errors.BzrCommandError(gettext('Only one path may be specified to'
842
raise errors.BzrCommandError('Only one path may be specified to'
879
raise errors.BzrCommandError(gettext('--after cannot be specified with'
881
work_tree, file_list = WorkingTree.open_containing_paths(
882
names_list, default_directory='.')
883
self.add_cleanup(work_tree.lock_tree_write().unlock)
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)
884
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
886
852
def _run(self, tree, names_list, rel_names, after):
980
946
match the remote one, use pull --overwrite. This will work even if the two
981
947
branches have diverged.
983
If there is no default location set, the first pull will set it (use
984
--no-remember to avoid setting it). After that, you can omit the
985
location to use the default. To change the default, use --remember. The
986
value will only be saved if the remote location can be accessed.
988
The --verbose option will display the revisions pulled using the log_format
989
configuration option. You can use a different format by overriding it with
990
-Olog_format=<other_format>.
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.
992
954
Note: The location can be specified either in the form of a branch,
993
955
or in the form of a path to a file containing a merge directive generated
998
960
takes_options = ['remember', 'overwrite', 'revision',
999
961
custom_help('verbose',
1000
962
help='Show logs of pulled revisions.'),
1001
custom_help('directory',
1002
964
help='Branch to pull into, '
1003
'rather than the one containing the working directory.'),
965
'rather than the one containing the working directory.',
1005
970
help="Perform a local pull in a bound "
1006
971
"branch. Local pulls are not applied to "
1007
972
"the master branch."
1010
help="Show base revision text in conflicts.")
1012
975
takes_args = ['location?']
1013
976
encoding_type = 'replace'
1015
def run(self, location=None, remember=None, overwrite=False,
978
def run(self, location=None, remember=False, overwrite=False,
1016
979
revision=None, verbose=False,
1017
directory=None, local=False,
980
directory=None, local=False):
1019
981
# FIXME: too much stuff is in the command class
1020
982
revision_id = None
1021
983
mergeable = None
1025
987
tree_to = WorkingTree.open_containing(directory)[0]
1026
988
branch_to = tree_to.branch
1027
self.add_cleanup(tree_to.lock_write().unlock)
990
self.add_cleanup(tree_to.unlock)
1028
991
except errors.NoWorkingTree:
1030
993
branch_to = Branch.open_containing(directory)[0]
1031
self.add_cleanup(branch_to.lock_write().unlock)
1033
if tree_to is None and show_base:
1034
raise errors.BzrCommandError(gettext("Need working tree for --show-base."))
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
1036
997
if local and not branch_to.get_bound_location():
1037
998
raise errors.LocalRequiresBoundBranch()
1047
1008
stored_loc = branch_to.get_parent()
1048
1009
if location is None:
1049
1010
if stored_loc is None:
1050
raise errors.BzrCommandError(gettext("No pull location known or"
1011
raise errors.BzrCommandError("No pull location known or"
1053
1014
display_url = urlutils.unescape_for_display(stored_loc,
1054
1015
self.outf.encoding)
1055
1016
if not is_quiet():
1056
self.outf.write(gettext("Using saved parent location: %s\n") % display_url)
1017
self.outf.write("Using saved parent location: %s\n" % display_url)
1057
1018
location = stored_loc
1059
1020
revision = _get_one_revision('pull', revision)
1060
1021
if mergeable is not None:
1061
1022
if revision is not None:
1062
raise errors.BzrCommandError(gettext(
1063
'Cannot use -r with merge directives or bundles'))
1023
raise errors.BzrCommandError(
1024
'Cannot use -r with merge directives or bundles')
1064
1025
mergeable.install_revisions(branch_to.repository)
1065
1026
base_revision_id, revision_id, verified = \
1066
1027
mergeable.get_merge_request(branch_to.repository)
1120
1077
do a merge (see bzr help merge) from the other branch, and commit that.
1121
1078
After that you will be able to do a push without '--overwrite'.
1123
If there is no default push location set, the first push will set it (use
1124
--no-remember to avoid setting it). After that, you can omit the
1125
location to use the default. To change the default, use --remember. The
1126
value will only be saved if the remote location can be accessed.
1128
The --verbose option will display the revisions pushed using the log_format
1129
configuration option. You can use a different format by overriding it with
1130
-Olog_format=<other_format>.
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.
1133
1086
_see_also = ['pull', 'update', 'working-trees']
1135
1088
Option('create-prefix',
1136
1089
help='Create the path leading up to the branch '
1137
1090
'if it does not already exist.'),
1138
custom_help('directory',
1139
1092
help='Branch to push from, '
1140
'rather than the one containing the working directory.'),
1093
'rather than the one containing the working directory.',
1141
1097
Option('use-existing-dir',
1142
1098
help='By default push will fail if the target'
1143
1099
' directory exists, but does not already'
1154
1110
Option('strict',
1155
1111
help='Refuse to push if there are uncommitted changes in'
1156
1112
' the working tree, --no-strict disables the check.'),
1158
help="Don't populate the working tree, even for protocols"
1159
" that support it."),
1161
1114
takes_args = ['location?']
1162
1115
encoding_type = 'replace'
1164
def run(self, location=None, remember=None, overwrite=False,
1117
def run(self, location=None, remember=False, overwrite=False,
1165
1118
create_prefix=False, verbose=False, revision=None,
1166
1119
use_existing_dir=False, directory=None, stacked_on=None,
1167
stacked=False, strict=None, no_tree=False):
1120
stacked=False, strict=None):
1168
1121
from bzrlib.push import _show_push_branch
1170
1123
if directory is None:
1198
1151
# error by the feedback given to them. RBC 20080227.
1199
1152
stacked_on = parent_url
1200
1153
if not stacked_on:
1201
raise errors.BzrCommandError(gettext(
1202
"Could not determine branch to refer to."))
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1204
1157
# Get the destination location
1205
1158
if location is None:
1206
1159
stored_loc = br_from.get_push_location()
1207
1160
if stored_loc is None:
1208
raise errors.BzrCommandError(gettext(
1209
"No push location known or specified."))
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1211
1164
display_url = urlutils.unescape_for_display(stored_loc,
1212
1165
self.outf.encoding)
1213
note(gettext("Using saved push location: %s") % display_url)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1214
1167
location = stored_loc
1216
1169
_show_push_branch(br_from, revision_id, location, self.outf,
1217
1170
verbose=verbose, overwrite=overwrite, remember=remember,
1218
1171
stacked_on=stacked_on, create_prefix=create_prefix,
1219
use_existing_dir=use_existing_dir, no_tree=no_tree)
1172
use_existing_dir=use_existing_dir)
1222
1175
class cmd_branch(Command):
1232
1185
To retrieve the branch as of a particular revision, supply the --revision
1233
1186
parameter, as in "branch foo/bar -r 5".
1235
The synonyms 'clone' and 'get' for this command are deprecated.
1238
1189
_see_also = ['checkout']
1239
1190
takes_args = ['from_location', 'to_location?']
1240
takes_options = ['revision',
1241
Option('hardlink', help='Hard-link working tree files where possible.'),
1242
Option('files-from', type=str,
1243
help="Get file contents from this tree."),
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1244
1193
Option('no-tree',
1245
1194
help="Create a branch without a working-tree."),
1246
1195
Option('switch',
1265
1214
def run(self, from_location, to_location=None, revision=None,
1266
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1267
use_existing_dir=False, switch=False, bind=False,
1216
use_existing_dir=False, switch=False, bind=False):
1269
1217
from bzrlib import switch as _mod_switch
1270
1218
from bzrlib.tag import _merge_tags_if_possible
1271
if self.invoked_as in ['get', 'clone']:
1272
ui.ui_factory.show_user_warning(
1273
'deprecated_command',
1274
deprecated_name=self.invoked_as,
1275
recommended_name='branch',
1276
deprecated_in_version='2.4')
1277
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1279
if not (hardlink or files_from):
1280
# accelerator_tree is usually slower because you have to read N
1281
# files (no readahead, lots of seeks, etc), but allow the user to
1282
# explicitly request it
1283
accelerator_tree = None
1284
if files_from is not None and files_from != from_location:
1285
accelerator_tree = WorkingTree.open(files_from)
1286
1221
revision = _get_one_revision('branch', revision)
1287
self.add_cleanup(br_from.lock_read().unlock)
1223
self.add_cleanup(br_from.unlock)
1288
1224
if revision is not None:
1289
1225
revision_id = revision.as_revision_id(br_from)
1323
1259
branch = dir.open_branch()
1324
1260
except errors.NoSuchRevision:
1325
1261
to_transport.delete_tree('.')
1326
msg = gettext("The branch {0} has no revision {1}.").format(
1327
from_location, revision)
1262
msg = "The branch %s has no revision %s." % (from_location,
1328
1264
raise errors.BzrCommandError(msg)
1329
1265
_merge_tags_if_possible(br_from, branch)
1330
1266
# If the source branch is stacked, the new branch may
1331
1267
# be stacked whether we asked for that explicitly or not.
1332
1268
# We therefore need a try/except here and not just 'if stacked:'
1334
note(gettext('Created new stacked branch referring to %s.') %
1270
note('Created new stacked branch referring to %s.' %
1335
1271
branch.get_stacked_on_url())
1336
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1337
1273
errors.UnstackableRepositoryFormat), e:
1338
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1274
note('Branched %d revision(s).' % branch.revno())
1340
1276
# Bind to the parent
1341
1277
parent_branch = Branch.open(from_location)
1342
1278
branch.bind(parent_branch)
1343
note(gettext('New branch bound to %s') % from_location)
1279
note('New branch bound to %s' % from_location)
1345
1281
# Switch to the new branch
1346
1282
wt, _ = WorkingTree.open_containing('.')
1347
1283
_mod_switch.switch(wt.bzrdir, branch)
1348
note(gettext('Switched to branch: %s'),
1284
note('Switched to branch: %s',
1349
1285
urlutils.unescape_for_display(branch.base, 'utf-8'))
1352
class cmd_branches(Command):
1353
__doc__ = """List the branches available at the current location.
1355
This command will print the names of all the branches at the current
1359
takes_args = ['location?']
1361
Option('recursive', short_name='R',
1362
help='Recursively scan for branches rather than '
1363
'just looking in the specified location.')]
1365
def run(self, location=".", recursive=False):
1367
t = transport.get_transport(location)
1368
if not t.listable():
1369
raise errors.BzrCommandError(
1370
"Can't scan this type of location.")
1371
for b in bzrdir.BzrDir.find_branches(t):
1372
self.outf.write("%s\n" % urlutils.unescape_for_display(
1373
urlutils.relative_url(t.base, b.base),
1374
self.outf.encoding).rstrip("/"))
1376
dir = bzrdir.BzrDir.open_containing(location)[0]
1377
for branch in dir.list_branches():
1378
if branch.name is None:
1379
self.outf.write(gettext(" (default)\n"))
1381
self.outf.write(" %s\n" % branch.name.encode(
1382
self.outf.encoding))
1385
1288
class cmd_checkout(Command):
1386
1289
__doc__ = """Create a new checkout of an existing branch.
1428
1331
to_location = branch_location
1429
1332
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1430
1333
branch_location)
1431
if not (hardlink or files_from):
1432
# accelerator_tree is usually slower because you have to read N
1433
# files (no readahead, lots of seeks, etc), but allow the user to
1434
# explicitly request it
1435
accelerator_tree = None
1436
1334
revision = _get_one_revision('checkout', revision)
1437
if files_from is not None and files_from != branch_location:
1335
if files_from is not None:
1438
1336
accelerator_tree = WorkingTree.open(files_from)
1439
1337
if revision is not None:
1440
1338
revision_id = revision.as_revision_id(source)
1489
1389
class cmd_update(Command):
1490
__doc__ = """Update a working tree to a new revision.
1492
This will perform a merge of the destination revision (the tip of the
1493
branch, or the specified revision) into the working tree, and then make
1494
that revision the basis revision for the working tree.
1496
You can use this to visit an older revision, or to update a working tree
1497
that is out of date from its branch.
1499
If there are any uncommitted changes in the tree, they will be carried
1500
across and remain as uncommitted changes after the update. To discard
1501
these changes, use 'bzr revert'. The uncommitted changes may conflict
1502
with the changes brought in by the change in basis revision.
1504
If the tree's branch is bound to a master branch, bzr will also update
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
1505
1400
the branch from the master.
1507
You cannot update just a single file or directory, because each Bazaar
1508
working tree has just a single basis revision. If you want to restore a
1509
file that has been removed locally, use 'bzr revert' instead of 'bzr
1510
update'. If you want to restore a file to its state in a previous
1511
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1512
out the old content of that file to a new location.
1514
The 'dir' argument, if given, must be the location of the root of a
1515
working tree to update. By default, the working tree that contains the
1516
current working directory is used.
1519
1403
_see_also = ['pull', 'working-trees', 'status-flags']
1520
1404
takes_args = ['dir?']
1521
takes_options = ['revision',
1523
help="Show base revision text in conflicts."),
1405
takes_options = ['revision']
1525
1406
aliases = ['up']
1527
def run(self, dir=None, revision=None, show_base=None):
1408
def run(self, dir='.', revision=None):
1528
1409
if revision is not None and len(revision) != 1:
1529
raise errors.BzrCommandError(gettext(
1530
"bzr update --revision takes exactly one revision"))
1532
tree = WorkingTree.open_containing('.')[0]
1534
tree, relpath = WorkingTree.open_containing(dir)
1537
raise errors.BzrCommandError(gettext(
1538
"bzr update can only update a whole tree, "
1539
"not a file or subdirectory"))
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1412
tree = WorkingTree.open_containing(dir)[0]
1540
1413
branch = tree.branch
1541
1414
possible_transports = []
1542
1415
master = branch.get_master_branch(
1543
1416
possible_transports=possible_transports)
1544
1417
if master is not None:
1545
1419
branch_location = master.base
1421
tree.lock_tree_write()
1548
1422
branch_location = tree.branch.base
1549
tree.lock_tree_write()
1550
1423
self.add_cleanup(tree.unlock)
1551
1424
# get rid of the final '/' and be ready for display
1552
1425
branch_location = urlutils.unescape_for_display(
1566
1439
revision_id = branch.last_revision()
1567
1440
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1568
1441
revno = branch.revision_id_to_dotted_revno(revision_id)
1569
note(gettext("Tree is up to date at revision {0} of branch {1}"
1570
).format('.'.join(map(str, revno)), branch_location))
1442
note("Tree is up to date at revision %s of branch %s" %
1443
('.'.join(map(str, revno)), branch_location))
1572
1445
view_info = _get_view_info_for_change_reporter(tree)
1573
1446
change_reporter = delta._ChangeReporter(
1578
1451
change_reporter,
1579
1452
possible_transports=possible_transports,
1580
1453
revision=revision_id,
1582
show_base=show_base)
1583
1455
except errors.NoSuchRevision, e:
1584
raise errors.BzrCommandError(gettext(
1456
raise errors.BzrCommandError(
1585
1457
"branch has no revision %s\n"
1586
1458
"bzr update --revision only works"
1587
" for a revision in the branch history")
1459
" for a revision in the branch history"
1588
1460
% (e.revision))
1589
1461
revno = tree.branch.revision_id_to_dotted_revno(
1590
1462
_mod_revision.ensure_null(tree.last_revision()))
1591
note(gettext('Updated to revision {0} of branch {1}').format(
1592
'.'.join(map(str, revno)), branch_location))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1593
1465
parent_ids = tree.get_parent_ids()
1594
1466
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1595
note(gettext('Your local commits will now show as pending merges with '
1596
"'bzr status', and can be committed with 'bzr commit'."))
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1597
1469
if conflicts != 0:
1647
1519
class cmd_remove(Command):
1648
1520
__doc__ = """Remove files or directories.
1650
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1651
delete them if they can easily be recovered using revert otherwise they
1652
will be backed up (adding an extention of the form .~#~). If no options or
1653
parameters are given Bazaar will scan for files that are being tracked by
1654
Bazaar but missing in your tree and stop tracking them for you.
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.
1656
1527
takes_args = ['file*']
1657
1528
takes_options = ['verbose',
1659
1530
RegistryOption.from_kwargs('file-deletion-strategy',
1660
1531
'The file deletion mode to be used.',
1661
1532
title='Deletion Strategy', value_switches=True, enum_switch=False,
1662
safe='Backup changed files (default).',
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1663
1535
keep='Delete from bzr but leave the working copy.',
1664
no_backup='Don\'t backup changed files.',
1665
1536
force='Delete all the specified files, even if they can not be '
1666
'recovered and even if they are non-empty directories. '
1667
'(deprecated, use no-backup)')]
1537
'recovered and even if they are non-empty directories.')]
1668
1538
aliases = ['rm', 'del']
1669
1539
encoding_type = 'replace'
1671
1541
def run(self, file_list, verbose=False, new=False,
1672
1542
file_deletion_strategy='safe'):
1673
if file_deletion_strategy == 'force':
1674
note(gettext("(The --force option is deprecated, rather use --no-backup "
1676
file_deletion_strategy = 'no-backup'
1678
tree, file_list = WorkingTree.open_containing_paths(file_list)
1543
tree, file_list = tree_files(file_list)
1680
1545
if file_list is not None:
1681
1546
file_list = [f for f in file_list]
1683
self.add_cleanup(tree.lock_write().unlock)
1549
self.add_cleanup(tree.unlock)
1684
1550
# Heuristics should probably all move into tree.remove_smart or
1818
1678
last_revision = wt.last_revision()
1820
self.add_cleanup(b.repository.lock_read().unlock)
1821
graph = b.repository.get_graph()
1822
revisions = [revid for revid, parents in
1823
graph.iter_ancestry([last_revision])]
1824
for revision_id in reversed(revisions):
1825
if _mod_revision.is_null(revision_id):
1680
revision_ids = b.repository.get_ancestry(last_revision)
1682
for revision_id in revision_ids:
1827
1683
self.outf.write(revision_id + '\n')
1867
1723
Option('append-revisions-only',
1868
1724
help='Never change revnos or the existing log.'
1869
' Append revisions to it only.'),
1871
'Create a branch without a working tree.')
1725
' Append revisions to it only.')
1873
1727
def run(self, location=None, format=None, append_revisions_only=False,
1874
create_prefix=False, no_tree=False):
1728
create_prefix=False):
1875
1729
if format is None:
1876
1730
format = bzrdir.format_registry.make_bzrdir('default')
1877
1731
if location is None:
1916
1765
raise errors.BranchExistsWithoutWorkingTree(location)
1917
1766
raise errors.AlreadyBranchError(location)
1918
1767
branch = a_bzrdir.create_branch()
1919
if not no_tree and not a_bzrdir.has_workingtree():
1920
a_bzrdir.create_workingtree()
1768
a_bzrdir.create_workingtree()
1921
1769
if append_revisions_only:
1923
1771
branch.set_append_revisions_only(True)
1924
1772
except errors.UpgradeRequired:
1925
raise errors.BzrCommandError(gettext('This branch format cannot be set'
1926
' to append-revisions-only. Try --default.'))
1773
raise errors.BzrCommandError('This branch format cannot be set'
1774
' to append-revisions-only. Try --default.')
1927
1775
if not is_quiet():
1928
1776
from bzrlib.info import describe_layout, describe_format
1933
1781
repository = branch.repository
1934
1782
layout = describe_layout(repository, branch, tree).lower()
1935
1783
format = describe_format(a_bzrdir, repository, branch, tree)
1936
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1784
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
1938
1785
if repository.is_shared():
1939
1786
#XXX: maybe this can be refactored into transport.path_or_url()
1940
1787
url = repository.bzrdir.root_transport.external_url()
2139
1969
elif ':' in prefix:
2140
1970
old_label, new_label = prefix.split(":")
2142
raise errors.BzrCommandError(gettext(
1972
raise errors.BzrCommandError(
2143
1973
'--prefix expects two values separated by a colon'
2144
' (eg "old/:new/")'))
1974
' (eg "old/:new/")')
2146
1976
if revision and len(revision) > 2:
2147
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2148
' one or two revision specifiers'))
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2150
1980
if using is not None and format is not None:
2151
raise errors.BzrCommandError(gettext(
2152
'{0} and {1} are mutually exclusive').format(
2153
'--using', '--format'))
1981
raise errors.BzrCommandError('--using and --format are mutually '
2155
1984
(old_tree, new_tree,
2156
1985
old_branch, new_branch,
2157
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2158
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2159
# GNU diff on Windows uses ANSI encoding for filenames
2160
path_encoding = osutils.get_diff_header_encoding()
2161
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
2162
1989
specific_files=specific_files,
2163
1990
external_diff_options=diff_options,
2164
1991
old_label=old_label, new_label=new_label,
2165
extra_trees=extra_trees,
2166
path_encoding=path_encoding,
1992
extra_trees=extra_trees, using=using,
2168
1993
format_cls=format)
2178
2003
# level of effort but possibly much less IO. (Or possibly not,
2179
2004
# if the directories are very large...)
2180
2005
_see_also = ['status', 'ls']
2181
takes_options = ['directory', 'show-ids']
2006
takes_options = ['show-ids']
2183
2008
@display_command
2184
def run(self, show_ids=False, directory=u'.'):
2185
tree = WorkingTree.open_containing(directory)[0]
2186
self.add_cleanup(tree.lock_read().unlock)
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2187
2013
old = tree.basis_tree()
2188
self.add_cleanup(old.lock_read().unlock)
2015
self.add_cleanup(old.unlock)
2189
2016
for path, ie in old.inventory.iter_entries():
2190
2017
if not tree.has_id(ie.file_id):
2191
2018
self.outf.write(path)
2203
2030
_see_also = ['status', 'ls']
2204
takes_options = ['directory', 'null']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2206
2037
@display_command
2207
def run(self, null=False, directory=u'.'):
2208
tree = WorkingTree.open_containing(directory)[0]
2209
self.add_cleanup(tree.lock_read().unlock)
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2210
2040
td = tree.changes_from(tree.basis_tree())
2212
2041
for path, id, kind, text_modified, meta_modified in td.modified:
2214
2043
self.outf.write(path + '\0')
2224
2053
_see_also = ['status', 'ls']
2225
takes_options = ['directory', 'null']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2227
2060
@display_command
2228
def run(self, null=False, directory=u'.'):
2229
wt = WorkingTree.open_containing(directory)[0]
2230
self.add_cleanup(wt.lock_read().unlock)
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2231
2065
basis = wt.basis_tree()
2232
self.add_cleanup(basis.lock_read().unlock)
2067
self.add_cleanup(basis.unlock)
2233
2068
basis_inv = basis.inventory
2234
2069
inv = wt.inventory
2235
2070
for file_id in inv:
2236
if basis_inv.has_id(file_id):
2071
if file_id in basis_inv:
2238
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2240
2075
path = inv.id2path(file_id)
2241
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2076
if not os.access(osutils.abspath(path), os.F_OK):
2244
2079
self.outf.write(path + '\0')
2447
2279
help='Show just the specified revision.'
2448
2280
' See also "help revisionspec".'),
2450
RegistryOption('authors',
2451
'What names to list as authors - first, all or committer.',
2453
lazy_registry=('bzrlib.log', 'author_list_registry'),
2455
2282
Option('levels',
2456
2283
short_name='n',
2457
2284
help='Number of levels to display - 0 for all, 1 for flat.',
2459
2286
type=_parse_levels),
2460
2287
Option('message',
2461
2289
help='Show revisions whose message matches this '
2462
2290
'regular expression.',
2465
2292
Option('limit',
2466
2293
short_name='l',
2467
2294
help='Limit the output to the first N revisions.',
2470
2297
Option('show-diff',
2471
2298
short_name='p',
2472
2299
help='Show changes made in each revision as a patch.'),
2473
Option('include-merged',
2300
Option('include-merges',
2474
2301
help='Show merged revisions like --levels 0 does.'),
2475
Option('include-merges', hidden=True,
2476
help='Historical alias for --include-merged.'),
2477
Option('omit-merges',
2478
help='Do not report commits with more than one parent.'),
2479
2302
Option('exclude-common-ancestry',
2480
2303
help='Display only the revisions that are not part'
2481
2304
' of both ancestries (require -rX..Y)'
2483
Option('signatures',
2484
help='Show digital signature validity'),
2487
help='Show revisions whose properties match this '
2490
ListOption('match-message',
2491
help='Show revisions whose message matches this '
2494
ListOption('match-committer',
2495
help='Show revisions whose committer matches this '
2498
ListOption('match-author',
2499
help='Show revisions whose authors match this '
2502
ListOption('match-bugs',
2503
help='Show revisions whose bugs match this '
2507
2307
encoding_type = 'replace'
2536
2327
_get_info_for_log_files,
2538
2329
direction = (forward and 'forward') or 'reverse'
2539
if symbol_versioning.deprecated_passed(include_merges):
2540
ui.ui_factory.show_user_warning(
2541
'deprecated_command_option',
2542
deprecated_name='--include-merges',
2543
recommended_name='--include-merged',
2544
deprecated_in_version='2.5',
2545
command=self.invoked_as)
2546
if include_merged is None:
2547
include_merged = include_merges
2549
raise errors.BzrCommandError(gettext(
2550
'{0} and {1} are mutually exclusive').format(
2551
'--include-merges', '--include-merged'))
2552
if include_merged is None:
2553
include_merged = False
2554
2330
if (exclude_common_ancestry
2555
2331
and (revision is None or len(revision) != 2)):
2556
raise errors.BzrCommandError(gettext(
2557
'--exclude-common-ancestry requires -r with two revisions'))
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2559
2335
if levels is None:
2562
raise errors.BzrCommandError(gettext(
2563
'{0} and {1} are mutually exclusive').format(
2564
'--levels', '--include-merged'))
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2566
2341
if change is not None:
2567
2342
if len(change) > 1:
2568
2343
raise errors.RangeInChangeOption()
2569
2344
if revision is not None:
2570
raise errors.BzrCommandError(gettext(
2571
'{0} and {1} are mutually exclusive').format(
2572
'--revision', '--change'))
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2574
2348
revision = change
2579
2353
# find the file ids to log and check for directory filtering
2580
2354
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2581
revision, file_list, self.add_cleanup)
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2582
2357
for relpath, file_id, kind in file_info_list:
2583
2358
if file_id is None:
2584
raise errors.BzrCommandError(gettext(
2585
"Path unknown at end or start of revision range: %s") %
2359
raise errors.BzrCommandError(
2360
"Path unknown at end or start of revision range: %s" %
2587
2362
# If the relpath is the top of the tree, we log everything
2588
2363
if relpath == '':
2603
2378
dir, relpath = bzrdir.BzrDir.open_containing(location)
2604
2379
b = dir.open_branch()
2605
self.add_cleanup(b.lock_read().unlock)
2381
self.add_cleanup(b.unlock)
2606
2382
rev1, rev2 = _get_revision_range(revision, b, self.name())
2608
if b.get_config().validate_signatures_in_log():
2612
if not gpg.GPGStrategy.verify_signatures_available():
2613
raise errors.GpgmeNotInstalled(None)
2615
2384
# Decide on the type of delta & diff filtering to use
2616
2385
# TODO: add an --all-files option to make this configurable & consistent
2617
2386
if not verbose:
2674
2430
start_revision=rev1, end_revision=rev2, limit=limit,
2675
2431
message_search=message, delta_type=delta_type,
2676
2432
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2677
exclude_common_ancestry=exclude_common_ancestry, match=match_dict,
2678
signature=signatures, omit_merges=omit_merges,
2433
exclude_common_ancestry=exclude_common_ancestry,
2680
2435
Logger(b, rqst).show(lf)
2698
2453
# b is taken from revision[0].get_branch(), and
2699
2454
# show_log will use its revision_history. Having
2700
2455
# different branches will lead to weird behaviors.
2701
raise errors.BzrCommandError(gettext(
2456
raise errors.BzrCommandError(
2702
2457
"bzr %s doesn't accept two revisions in different"
2703
" branches.") % command_name)
2458
" branches." % command_name)
2704
2459
if start_spec.spec is None:
2705
2460
# Avoid loading all the history.
2706
2461
rev1 = RevisionInfo(branch, None, None)
2772
2528
help='Recurse into subdirectories.'),
2773
2529
Option('from-root',
2774
2530
help='Print paths relative to the root of the branch.'),
2775
Option('unknown', short_name='u',
2776
help='Print unknown files.'),
2531
Option('unknown', help='Print unknown files.'),
2777
2532
Option('versioned', help='Print versioned files.',
2778
2533
short_name='V'),
2779
Option('ignored', short_name='i',
2780
help='Print ignored files.'),
2781
Option('kind', short_name='k',
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2782
2539
help='List entries of a particular kind: file, directory, symlink.',
2788
2543
@display_command
2789
2544
def run(self, revision=None, verbose=False,
2790
2545
recursive=False, from_root=False,
2791
2546
unknown=False, versioned=False, ignored=False,
2792
null=False, kind=None, show_ids=False, path=None, directory=None):
2547
null=False, kind=None, show_ids=False, path=None):
2794
2549
if kind and kind not in ('file', 'directory', 'symlink'):
2795
raise errors.BzrCommandError(gettext('invalid kind specified'))
2550
raise errors.BzrCommandError('invalid kind specified')
2797
2552
if verbose and null:
2798
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2799
2554
all = not (unknown or versioned or ignored)
2801
2556
selection = {'I':ignored, '?':unknown, 'V':versioned}
2828
2583
apply_view = True
2829
2584
view_str = views.view_display_str(view_files)
2830
note(gettext("Ignoring files outside view. View is %s") % view_str)
2585
note("Ignoring files outside view. View is %s" % view_str)
2832
self.add_cleanup(tree.lock_read().unlock)
2588
self.add_cleanup(tree.unlock)
2833
2589
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2834
2590
from_dir=relpath, recursive=recursive):
2835
2591
# Apply additional masking
2967
2713
_see_also = ['status', 'ignored', 'patterns']
2968
2714
takes_args = ['name_pattern*']
2969
takes_options = ['directory',
2970
2716
Option('default-rules',
2971
2717
help='Display the default ignore rules that bzr uses.')
2974
def run(self, name_pattern_list=None, default_rules=None,
2720
def run(self, name_pattern_list=None, default_rules=None):
2976
2721
from bzrlib import ignores
2977
2722
if default_rules is not None:
2978
2723
# dump the default rules and exit
2980
2725
self.outf.write("%s\n" % pattern)
2982
2727
if not name_pattern_list:
2983
raise errors.BzrCommandError(gettext("ignore requires at least one "
2984
"NAME_PATTERN or --default-rules."))
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2985
2730
name_pattern_list = [globbing.normalize_pattern(p)
2986
2731
for p in name_pattern_list]
2988
bad_patterns_count = 0
2989
for p in name_pattern_list:
2990
if not globbing.Globster.is_pattern_valid(p):
2991
bad_patterns_count += 1
2992
bad_patterns += ('\n %s' % p)
2994
msg = (ngettext('Invalid ignore pattern found. %s',
2995
'Invalid ignore patterns found. %s',
2996
bad_patterns_count) % bad_patterns)
2997
ui.ui_factory.show_error(msg)
2998
raise errors.InvalidPattern('')
2999
2732
for name_pattern in name_pattern_list:
3000
2733
if (name_pattern[0] == '/' or
3001
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
3002
raise errors.BzrCommandError(gettext(
3003
"NAME_PATTERN should not be an absolute path"))
3004
tree, relpath = WorkingTree.open_containing(directory)
2735
raise errors.BzrCommandError(
2736
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
3005
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
3006
2739
ignored = globbing.Globster(name_pattern_list)
3008
self.add_cleanup(tree.lock_read().unlock)
3009
2742
for entry in tree.list_files():
3011
2744
if id is not None:
3012
2745
filename = entry[0]
3013
2746
if ignored.match(filename):
3014
2747
matches.append(filename)
3015
2749
if len(matches) > 0:
3016
self.outf.write(gettext("Warning: the following files are version "
3017
"controlled and match your ignore pattern:\n%s"
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3018
2752
"\nThese files will continue to be version controlled"
3019
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3022
2756
class cmd_ignored(Command):
3033
2767
encoding_type = 'replace'
3034
2768
_see_also = ['ignore', 'ls']
3035
takes_options = ['directory']
3037
2770
@display_command
3038
def run(self, directory=u'.'):
3039
tree = WorkingTree.open_containing(directory)[0]
3040
self.add_cleanup(tree.lock_read().unlock)
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
3041
2775
for path, file_class, kind, file_id, entry in tree.list_files():
3042
2776
if file_class != 'I':
3112
2844
'revision in which it was changed.'),
3114
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
3115
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2847
root=None, filters=False, per_file_timestamps=False):
3116
2848
from bzrlib.export import export
3118
2850
if branch_or_subdir is None:
3119
tree = WorkingTree.open_containing(directory)[0]
2851
tree = WorkingTree.open_containing(u'.')[0]
3120
2852
b = tree.branch
3153
2885
@display_command
3154
2886
def run(self, filename, revision=None, name_from_revision=False,
3155
filters=False, directory=None):
3156
2888
if revision is not None and len(revision) != 1:
3157
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3158
" one revision specifier"))
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3159
2891
tree, branch, relpath = \
3160
_open_directory_or_containing_tree_or_branch(filename, directory)
3161
self.add_cleanup(branch.lock_read().unlock)
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3162
2895
return self._run(tree, branch, relpath, filename, revision,
3163
2896
name_from_revision, filters)
3167
2900
if tree is None:
3168
2901
tree = b.basis_tree()
3169
2902
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
3170
self.add_cleanup(rev_tree.lock_read().unlock)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3172
2906
old_file_id = rev_tree.path2id(relpath)
3174
# TODO: Split out this code to something that generically finds the
3175
# best id for a path across one or more trees; it's like
3176
# find_ids_across_trees but restricted to find just one. -- mbp
3178
2908
if name_from_revision:
3179
2909
# Try in revision if requested
3180
2910
if old_file_id is None:
3181
raise errors.BzrCommandError(gettext(
3182
"{0!r} is not present in revision {1}").format(
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3183
2913
filename, rev_tree.get_revision_id()))
3185
actual_file_id = old_file_id
2915
content = rev_tree.get_file_text(old_file_id)
3187
2917
cur_file_id = tree.path2id(relpath)
3188
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3189
actual_file_id = cur_file_id
3190
elif old_file_id is not None:
3191
actual_file_id = old_file_id
3193
raise errors.BzrCommandError(gettext(
3194
"{0!r} is not present in revision {1}").format(
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" % (
3195
2935
filename, rev_tree.get_revision_id()))
3197
from bzrlib.filter_tree import ContentFilterTree
3198
filter_tree = ContentFilterTree(rev_tree,
3199
rev_tree._content_filter_stack)
3200
content = filter_tree.get_file_text(actual_file_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)
3202
content = rev_tree.get_file_text(actual_file_id)
3204
self.outf.write(content)
2949
self.outf.write(content)
3207
2952
class cmd_local_time_offset(Command):
3268
3013
to trigger updates to external systems like bug trackers. The --fixes
3269
3014
option can be used to record the association between a revision and
3270
3015
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
3273
3043
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3274
3044
takes_args = ['selected*']
3306
3076
Option('show-diff', short_name='p',
3307
3077
help='When no message is supplied, show the diff along'
3308
3078
' with the status summary in the message editor.'),
3310
help='When committing to a foreign version control '
3311
'system do not push data that can not be natively '
3314
3080
aliases = ['ci', 'checkin']
3316
3082
def _iter_bug_fix_urls(self, fixes, branch):
3317
default_bugtracker = None
3318
3083
# Configure the properties for bug fixing attributes.
3319
3084
for fixed_bug in fixes:
3320
3085
tokens = fixed_bug.split(':')
3321
if len(tokens) == 1:
3322
if default_bugtracker is None:
3323
branch_config = branch.get_config()
3324
default_bugtracker = branch_config.get_user_option(
3326
if default_bugtracker is None:
3327
raise errors.BzrCommandError(gettext(
3328
"No tracker specified for bug %s. Use the form "
3329
"'tracker:id' or specify a default bug tracker "
3330
"using the `bugtracker` option.\nSee "
3331
"\"bzr help bugs\" for more information on this "
3332
"feature. Commit refused.") % fixed_bug)
3333
tag = default_bugtracker
3335
elif len(tokens) != 2:
3336
raise errors.BzrCommandError(gettext(
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3337
3088
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3338
3089
"See \"bzr help bugs\" for more information on this "
3339
"feature.\nCommit refused.") % fixed_bug)
3341
tag, bug_id = tokens
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3343
3093
yield bugtracker.get_bug_url(tag, branch, bug_id)
3344
3094
except errors.UnknownBugTrackerAbbreviation:
3345
raise errors.BzrCommandError(gettext(
3346
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3347
3097
except errors.MalformedBugIdentifier, e:
3348
raise errors.BzrCommandError(gettext(
3349
"%s\nCommit refused.") % (str(e),))
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3351
3101
def run(self, message=None, file=None, verbose=False, selected_list=None,
3352
3102
unchanged=False, strict=False, local=False, fixes=None,
3353
author=None, show_diff=False, exclude=None, commit_time=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3355
3104
from bzrlib.errors import (
3356
3105
PointlessCommit,
3357
3106
ConflictsInTree,
3370
3118
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3371
3119
except ValueError, e:
3372
raise errors.BzrCommandError(gettext(
3373
"Could not parse --commit-time: " + str(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.
3375
3129
properties = {}
3377
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3131
tree, selected_list = tree_files(selected_list)
3378
3132
if selected_list == ['']:
3379
3133
# workaround - commit of root of tree should be exactly the same
3380
3134
# as just default commit in that tree, and succeed even though
3409
3163
message = message.replace('\r\n', '\n')
3410
3164
message = message.replace('\r', '\n')
3412
raise errors.BzrCommandError(gettext(
3413
"please specify either --message or --file"))
3166
raise errors.BzrCommandError(
3167
"please specify either --message or --file")
3415
3169
def get_message(commit_obj):
3416
3170
"""Callback to get commit message"""
3420
my_message = f.read().decode(osutils.get_user_encoding())
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3423
3174
elif message is not None:
3424
3175
my_message = message
3433
3184
# make_commit_message_template_encoded returns user encoding.
3434
3185
# We probably want to be using edit_commit_message instead to
3436
my_message = set_commit_message(commit_obj)
3437
if my_message is None:
3438
start_message = generate_commit_message_template(commit_obj)
3439
my_message = edit_commit_message_encoded(text,
3440
start_message=start_message)
3441
if my_message is None:
3442
raise errors.BzrCommandError(gettext("please specify a commit"
3443
" message with either --message or --file"))
3444
if my_message == "":
3445
raise errors.BzrCommandError(gettext("Empty commit message specified."
3446
" Please specify a commit message with either"
3447
" --message or --file or leave a blank message"
3448
" with --message \"\"."))
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")
3449
3195
return my_message
3451
3197
# The API permits a commit with a filter of [] to mean 'select nothing'
3459
3205
reporter=None, verbose=verbose, revprops=properties,
3460
3206
authors=author, timestamp=commit_stamp,
3461
3207
timezone=offset,
3462
exclude=tree.safe_relpath_files(exclude),
3208
exclude=safe_relpath_files(tree, exclude))
3464
3209
except PointlessCommit:
3465
raise errors.BzrCommandError(gettext("No changes to commit."
3466
" Please 'bzr add' the files you want to commit, or use"
3467
" --unchanged to force an empty commit."))
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3468
3212
except ConflictsInTree:
3469
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3213
raise errors.BzrCommandError('Conflicts detected in working '
3470
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3472
3216
except StrictCommitFailed:
3473
raise errors.BzrCommandError(gettext("Commit refused because there are"
3474
" unknown files in the working tree."))
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3475
3219
except errors.BoundBranchOutOfDate, e:
3476
e.extra_help = (gettext("\n"
3220
e.extra_help = ("\n"
3477
3221
'To commit to master branch, run update and then commit.\n'
3478
3222
'You can also pass --local to commit to continue working '
3553
3297
class cmd_upgrade(Command):
3554
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3556
When the default format has changed after a major new release of
3557
Bazaar, you may be informed during certain operations that you
3558
should upgrade. Upgrading to a newer format may improve performance
3559
or make new features available. It may however limit interoperability
3560
with older repositories or with older versions of Bazaar.
3562
If you wish to upgrade to a particular format rather than the
3563
current default, that can be specified using the --format option.
3564
As a consequence, you can use the upgrade command this way to
3565
"downgrade" to an earlier format, though some conversions are
3566
a one way process (e.g. changing from the 1.x default to the
3567
2.x default) so downgrading is not always possible.
3569
A backup.bzr.~#~ directory is created at the start of the conversion
3570
process (where # is a number). By default, this is left there on
3571
completion. If the conversion fails, delete the new .bzr directory
3572
and rename this one back in its place. Use the --clean option to ask
3573
for the backup.bzr directory to be removed on successful conversion.
3574
Alternatively, you can delete it by hand if everything looks good
3577
If the location given is a shared repository, dependent branches
3578
are also converted provided the repository converts successfully.
3579
If the conversion of a branch fails, remaining branches are still
3582
For more information on upgrades, see the Bazaar Upgrade Guide,
3583
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
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.
3586
_see_also = ['check', 'reconcile', 'formats']
3305
_see_also = ['check']
3587
3306
takes_args = ['url?']
3588
3307
takes_options = [
3589
RegistryOption('format',
3590
help='Upgrade to a specific format. See "bzr help'
3591
' formats" for details.',
3592
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3593
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3594
value_switches=True, title='Branch format'),
3596
help='Remove the backup.bzr directory if successful.'),
3598
help="Show what would be done, but don't actually do anything."),
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'),
3601
def run(self, url='.', format=None, clean=False, dry_run=False):
3316
def run(self, url='.', format=None):
3602
3317
from bzrlib.upgrade import upgrade
3603
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3605
if len(exceptions) == 1:
3606
# Compatibility with historical behavior
3318
upgrade(url, format)
3612
3321
class cmd_whoami(Command):
3632
3340
encoding_type = 'replace'
3634
3342
@display_command
3635
def run(self, email=False, branch=False, name=None, directory=None):
3343
def run(self, email=False, branch=False, name=None):
3636
3344
if name is None:
3637
if directory is None:
3638
# use branch if we're inside one; otherwise global config
3640
c = Branch.open_containing(u'.')[0].get_config()
3641
except errors.NotBranchError:
3642
c = _mod_config.GlobalConfig()
3644
c = Branch.open(directory).get_config()
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()
3646
3351
self.outf.write(c.user_email() + '\n')
3648
3353
self.outf.write(c.username() + '\n')
3652
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3655
3356
# display a warning if an email address isn't included in the given name.
3657
_mod_config.extract_email_address(name)
3358
config.extract_email_address(name)
3658
3359
except errors.NoEmailInUsername, e:
3659
3360
warning('"%s" does not seem to contain an email address. '
3660
3361
'This is allowed, but not recommended.', name)
3662
3363
# use global config unless --branch given
3664
if directory is None:
3665
c = Branch.open_containing(u'.')[0].get_config()
3667
c = Branch.open(directory).get_config()
3365
c = Branch.open_containing('.')[0].get_config()
3669
c = _mod_config.GlobalConfig()
3367
c = config.GlobalConfig()
3670
3368
c.set_user_option('email', name)
3736
3433
def remove_alias(self, alias_name):
3737
3434
if alias_name is None:
3738
raise errors.BzrCommandError(gettext(
3739
'bzr alias --remove expects an alias to remove.'))
3435
raise errors.BzrCommandError(
3436
'bzr alias --remove expects an alias to remove.')
3740
3437
# If alias is not found, print something like:
3741
3438
# unalias: foo: not found
3742
c = _mod_config.GlobalConfig()
3439
c = config.GlobalConfig()
3743
3440
c.unset_alias(alias_name)
3745
3442
@display_command
3746
3443
def print_aliases(self):
3747
3444
"""Print out the defined aliases in a similar format to bash."""
3748
aliases = _mod_config.GlobalConfig().get_aliases()
3445
aliases = config.GlobalConfig().get_aliases()
3749
3446
for key, value in sorted(aliases.iteritems()):
3750
3447
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3821
3515
if typestring == "sftp":
3822
3516
from bzrlib.tests import stub_sftp
3823
3517
return stub_sftp.SFTPAbsoluteServer
3824
elif typestring == "memory":
3518
if typestring == "memory":
3825
3519
from bzrlib.tests import test_server
3826
3520
return memory.MemoryServer
3827
elif typestring == "fakenfs":
3521
if typestring == "fakenfs":
3828
3522
from bzrlib.tests import test_server
3829
3523
return test_server.FakeNFSServer
3830
3524
msg = "No known transport type %s. Supported types are: sftp\n" %\
3843
3537
'throughout the test suite.',
3844
3538
type=get_transport_type),
3845
3539
Option('benchmark',
3846
help='Run the benchmarks rather than selftests.',
3540
help='Run the benchmarks rather than selftests.'),
3848
3541
Option('lsprof-timed',
3849
3542
help='Generate lsprof output for benchmarked'
3850
3543
' sections of code.'),
3851
3544
Option('lsprof-tests',
3852
3545
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3853
3549
Option('first',
3854
3550
help='Run all tests, but run specified tests first.',
3855
3551
short_name='f',
3864
3560
Option('randomize', type=str, argname="SEED",
3865
3561
help='Randomize the order of tests using the given'
3866
3562
' seed or "now" for the current time.'),
3867
ListOption('exclude', type=str, argname="PATTERN",
3869
help='Exclude tests that match this regular'
3563
Option('exclude', type=str, argname="PATTERN",
3565
help='Exclude tests that match this regular'
3871
3567
Option('subunit',
3872
3568
help='Output test progress via subunit.'),
3873
3569
Option('strict', help='Fail on missing dependencies or '
3893
3586
def run(self, testspecs_list=None, verbose=False, one=False,
3894
3587
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3896
3589
first=False, list_only=False,
3897
3590
randomize=None, exclude=None, strict=False,
3898
3591
load_list=None, debugflag=None, starting_with=None, subunit=False,
3899
parallel=None, lsprof_tests=False,
3901
from bzrlib import tests
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)
3903
3602
if testspecs_list is not None:
3904
3603
pattern = '|'.join(testspecs_list)
3909
3608
from bzrlib.tests import SubUnitBzrRunner
3910
3609
except ImportError:
3911
raise errors.BzrCommandError(gettext("subunit not available. subunit "
3912
"needs to be installed to use --subunit."))
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3913
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3914
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3915
3614
# stdout, which would corrupt the subunit stream.
3916
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3917
# following code can be deleted when it's sufficiently deployed
3918
# -- vila/mgz 20100514
3919
if (sys.platform == "win32"
3920
and getattr(sys.stdout, 'fileno', None) is not None):
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3922
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3924
3619
self.additional_selftest_args.setdefault(
3925
3620
'suite_decorators', []).append(parallel)
3927
raise errors.BzrCommandError(gettext(
3928
"--benchmark is no longer supported from bzr 2.2; "
3929
"use bzr-usertest instead"))
3930
test_suite_factory = None
3932
exclude_pattern = None
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)
3934
exclude_pattern = '(' + '|'.join(exclude) + ')'
3936
self._disable_fsync()
3629
test_suite_factory = None
3937
3631
selftest_kwargs = {"verbose": verbose,
3938
3632
"pattern": pattern,
3939
3633
"stop_on_failure": one,
3941
3635
"test_suite_factory": test_suite_factory,
3942
3636
"lsprof_timed": lsprof_timed,
3943
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3944
3639
"matching_tests_first": first,
3945
3640
"list_only": list_only,
3946
3641
"random_seed": randomize,
3947
"exclude_pattern": exclude_pattern,
3642
"exclude_pattern": exclude,
3948
3643
"strict": strict,
3949
3644
"load_list": load_list,
3950
3645
"debug_flags": debugflag,
3951
3646
"starting_with": starting_with
3953
3648
selftest_kwargs.update(self.additional_selftest_args)
3955
# Make deprecation warnings visible, unless -Werror is set
3956
cleanup = symbol_versioning.activate_deprecation_warnings(
3959
result = tests.selftest(**selftest_kwargs)
3649
result = selftest(**selftest_kwargs)
3962
3650
return int(not result)
3964
def _disable_fsync(self):
3965
"""Change the 'os' functionality to not synchronize."""
3966
self._orig_fsync = getattr(os, 'fsync', None)
3967
if self._orig_fsync is not None:
3968
os.fsync = lambda filedes: None
3969
self._orig_fdatasync = getattr(os, 'fdatasync', None)
3970
if self._orig_fdatasync is not None:
3971
os.fdatasync = lambda filedes: None
3974
3653
class cmd_version(Command):
3975
3654
__doc__ = """Show version of bzr."""
4012
3691
branch1 = Branch.open_containing(branch)[0]
4013
3692
branch2 = Branch.open_containing(other)[0]
4014
self.add_cleanup(branch1.lock_read().unlock)
4015
self.add_cleanup(branch2.lock_read().unlock)
3694
self.add_cleanup(branch1.unlock)
3696
self.add_cleanup(branch2.unlock)
4016
3697
last1 = ensure_null(branch1.last_revision())
4017
3698
last2 = ensure_null(branch2.last_revision())
4019
3700
graph = branch1.repository.get_graph(branch2.repository)
4020
3701
base_rev_id = graph.find_unique_lca(last1, last2)
4022
self.outf.write(gettext('merge base is revision %s\n') % base_rev_id)
3703
self.outf.write('merge base is revision %s\n' % base_rev_id)
4025
3706
class cmd_merge(Command):
4028
3709
The source of the merge can be specified either in the form of a branch,
4029
3710
or in the form of a path to a file containing a merge directive generated
4030
3711
with bzr send. If neither is specified, the default is the upstream branch
4031
or the branch most recently merged using --remember. The source of the
4032
merge may also be specified in the form of a path to a file in another
4033
branch: in this case, only the modifications to that file are merged into
4034
the current working tree.
4036
When merging from a branch, by default bzr will try to merge in all new
4037
work from the other branch, automatically determining an appropriate base
4038
revision. If this fails, you may need to give an explicit base.
4040
To pick a different ending revision, pass "--revision OTHER". bzr will
4041
try to merge in all new work up to and including revision OTHER.
4043
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4044
through OTHER, excluding BASE but including OTHER, will be merged. If this
4045
causes some revisions to be skipped, i.e. if the destination branch does
4046
not already contain revision BASE, such a merge is commonly referred to as
4047
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4048
cherrypicks. The changes look like a normal commit, and the history of the
4049
changes from the other branch is not stored in the commit.
4051
Revision numbers are always relative to the source 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.
4053
3725
Merge will do its best to combine the changes in two branches, but there
4054
3726
are some kinds of problems only a human can fix. When it encounters those,
4058
3730
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
4060
If there is no default branch set, the first merge will set it (use
4061
--no-remember to avoid setting it). After that, you can omit the branch
4062
to use the default. To change the default, use --remember. The value will
4063
only be saved if the remote location can be accessed.
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.
4065
3737
The results of the merge are placed into the destination working
4066
3738
directory, where they can be reviewed (with bzr diff), tested, and then
4067
3739
committed to record the result of the merge.
4069
3741
merge refuses to run if there are any uncommitted changes, unless
4070
--force is given. If --force is given, then the changes from the source
4071
will be merged with the current working tree, including any uncommitted
4072
changes in the tree. The --force option can also be used to create a
3742
--force is given. The --force option can also be used to create a
4073
3743
merge revision which has more than two parents.
4075
3745
If one would like to merge changes from the working tree of the other
4123
3793
' completely merged into the source, pull from the'
4124
3794
' source rather than merging. When this happens,'
4125
3795
' you do not need to commit the result.'),
4126
custom_help('directory',
4127
3797
help='Branch to merge into, '
4128
'rather than the one containing the working directory.'),
3798
'rather than the one containing the working directory.',
4129
3802
Option('preview', help='Instead of merging, show a diff of the'
4131
3804
Option('interactive', help='Select changes interactively.',
4177
3847
mergeable = None
4179
3849
if uncommitted:
4180
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4181
' with bundles or merge directives.'))
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
4183
3853
if revision is not None:
4184
raise errors.BzrCommandError(gettext(
4185
'Cannot use -r with merge directives or bundles'))
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
4186
3856
merger, verified = _mod_merge.Merger.from_mergeable(tree,
4187
3857
mergeable, None)
4189
3859
if merger is None and uncommitted:
4190
3860
if revision is not None and len(revision) > 0:
4191
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4192
' --revision at the same time.'))
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
4193
3863
merger = self.get_merger_from_uncommitted(tree, location, None)
4194
3864
allow_pending = False
4203
3873
self.sanity_check_merger(merger)
4204
3874
if (merger.base_rev_id == merger.other_rev_id and
4205
3875
merger.other_rev_id is not None):
4206
# check if location is a nonexistent file (and not a branch) to
4207
# disambiguate the 'Nothing to do'
4208
if merger.interesting_files:
4209
if not merger.other_tree.has_filename(
4210
merger.interesting_files[0]):
4211
note(gettext("merger: ") + str(merger))
4212
raise errors.PathsDoNotExist([location])
4213
note(gettext('Nothing to do.'))
3876
note('Nothing to do.')
4215
if pull and not preview:
4216
3879
if merger.interesting_files is not None:
4217
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3880
raise errors.BzrCommandError('Cannot pull individual files')
4218
3881
if (merger.base_rev_id == tree.last_revision()):
4219
3882
result = tree.pull(merger.other_branch, False,
4220
3883
merger.other_rev_id)
4221
3884
result.report(self.outf)
4223
3886
if merger.this_basis is None:
4224
raise errors.BzrCommandError(gettext(
3887
raise errors.BzrCommandError(
4225
3888
"This branch has no commits."
4226
" (perhaps you would prefer 'bzr pull')"))
3889
" (perhaps you would prefer 'bzr pull')")
4228
3891
return self._do_preview(merger)
4229
3892
elif interactive:
4242
3905
def _do_preview(self, merger):
4243
3906
from bzrlib.diff import show_diff_trees
4244
3907
result_tree = self._get_preview(merger)
4245
path_encoding = osutils.get_diff_header_encoding()
4246
3908
show_diff_trees(merger.this_tree, result_tree, self.outf,
4247
old_label='', new_label='',
4248
path_encoding=path_encoding)
3909
old_label='', new_label='')
4250
3911
def _do_merge(self, merger, change_reporter, allow_pending, verified):
4251
3912
merger.change_reporter = change_reporter
4289
3950
# Use reprocess if the merger supports it
4290
3951
merger.reprocess = merger.merge_type.supports_reprocess
4291
3952
if merger.reprocess and not merger.merge_type.supports_reprocess:
4292
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4293
" for merge type %s.") %
3953
raise errors.BzrCommandError("Conflict reduction is not supported"
3954
" for merge type %s." %
4294
3955
merger.merge_type)
4295
3956
if merger.reprocess and merger.show_base:
4296
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
3957
raise errors.BzrCommandError("Cannot do conflict reduction and"
4299
3960
def _get_merger_from_branch(self, tree, location, revision, remember,
4300
3961
possible_transports, pb):
4327
3988
if other_revision_id is None:
4328
3989
other_revision_id = _mod_revision.ensure_null(
4329
3990
other_branch.last_revision())
4330
# Remember where we merge from. We need to remember if:
4331
# - user specify a location (and we don't merge from the parent
4333
# - user ask to remember or there is no previous location set to merge
4334
# from and user didn't ask to *not* remember
4335
if (user_location is not None
4337
or (remember is None
4338
and tree.branch.get_submit_branch() is None)))):
3991
# Remember where we merge from
3992
if ((remember or tree.branch.get_submit_branch() is None) and
3993
user_location is not None):
4339
3994
tree.branch.set_submit_branch(other_branch.base)
4340
# Merge tags (but don't set them in the master branch yet, the user
4341
# might revert this merge). Commit will propagate them.
4342
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4343
3996
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4344
3997
other_revision_id, base_revision_id, other_branch, base_branch)
4345
3998
if other_path != '':
4404
4057
stored_location_type = "parent"
4405
4058
mutter("%s", stored_location)
4406
4059
if stored_location is None:
4407
raise errors.BzrCommandError(gettext("No location specified or remembered"))
4060
raise errors.BzrCommandError("No location specified or remembered")
4408
4061
display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
4409
note(gettext("{0} remembered {1} location {2}").format(verb_string,
4410
stored_location_type, display_url))
4062
note(u"%s remembered %s location %s", verb_string,
4063
stored_location_type, display_url)
4411
4064
return stored_location
4446
4099
from bzrlib.conflicts import restore
4447
4100
if merge_type is None:
4448
4101
merge_type = _mod_merge.Merge3Merger
4449
tree, file_list = WorkingTree.open_containing_paths(file_list)
4450
self.add_cleanup(tree.lock_write().unlock)
4102
tree, file_list = tree_files(file_list)
4104
self.add_cleanup(tree.unlock)
4451
4105
parents = tree.get_parent_ids()
4452
4106
if len(parents) != 2:
4453
raise errors.BzrCommandError(gettext("Sorry, remerge only works after normal"
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4454
4108
" merges. Not cherrypicking or"
4456
4110
repository = tree.branch.repository
4457
4111
interesting_ids = None
4458
4112
new_conflicts = []
4513
4167
last committed revision is used.
4515
4169
To remove only some changes, without reverting to a prior version, use
4516
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4517
will remove the changes introduced by the second last commit (-2), without
4518
affecting the changes introduced by the last commit (-1). To remove
4519
certain changes on a hunk-by-hunk basis, see the shelve command.
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.
4521
4174
By default, any files that have been manually changed will be backed up
4522
4175
first. (Files changed only by merge are not backed up.) Backup files have
4689
4340
theirs_only=False,
4690
4341
log_format=None, long=False, short=False, line=False,
4691
4342
show_ids=False, verbose=False, this=False, other=False,
4692
include_merged=None, revision=None, my_revision=None,
4694
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4343
include_merges=False, revision=None, my_revision=None):
4695
4344
from bzrlib.missing import find_unmerged, iter_log_revisions
4696
4345
def message(s):
4697
4346
if not is_quiet():
4698
4347
self.outf.write(s)
4700
if symbol_versioning.deprecated_passed(include_merges):
4701
ui.ui_factory.show_user_warning(
4702
'deprecated_command_option',
4703
deprecated_name='--include-merges',
4704
recommended_name='--include-merged',
4705
deprecated_in_version='2.5',
4706
command=self.invoked_as)
4707
if include_merged is None:
4708
include_merged = include_merges
4710
raise errors.BzrCommandError(gettext(
4711
'{0} and {1} are mutually exclusive').format(
4712
'--include-merges', '--include-merged'))
4713
if include_merged is None:
4714
include_merged = False
4716
4350
mine_only = this
4725
4359
elif theirs_only:
4726
4360
restrict = 'remote'
4728
local_branch = Branch.open_containing(directory)[0]
4729
self.add_cleanup(local_branch.lock_read().unlock)
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4731
4366
parent = local_branch.get_parent()
4732
4367
if other_branch is None:
4733
4368
other_branch = parent
4734
4369
if other_branch is None:
4735
raise errors.BzrCommandError(gettext("No peer location known"
4370
raise errors.BzrCommandError("No peer location known"
4737
4372
display_url = urlutils.unescape_for_display(parent,
4738
4373
self.outf.encoding)
4739
message(gettext("Using saved parent location: {0}\n").format(
4374
message("Using saved parent location: "
4375
+ display_url + "\n")
4742
4377
remote_branch = Branch.open(other_branch)
4743
4378
if remote_branch.base == local_branch.base:
4744
4379
remote_branch = local_branch
4746
self.add_cleanup(remote_branch.lock_read().unlock)
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4748
4384
local_revid_range = _revision_range_to_revid_range(
4749
4385
_get_revision_range(my_revision, local_branch,
4798
4430
if mine_only and not local_extra:
4799
4431
# We checked local, and found nothing extra
4800
message(gettext('This branch has no new revisions.\n'))
4432
message('This branch is up to date.\n')
4801
4433
elif theirs_only and not remote_extra:
4802
4434
# We checked remote, and found nothing extra
4803
message(gettext('Other branch has no new revisions.\n'))
4435
message('Other branch is up to date.\n')
4804
4436
elif not (mine_only or theirs_only or local_extra or
4806
4438
# We checked both branches, and neither one had extra
4808
message(gettext("Branches are up to date.\n"))
4440
message("Branches are up to date.\n")
4809
4441
self.cleanup_now()
4810
4442
if not status_code and parent is None and other_branch is not None:
4811
self.add_cleanup(local_branch.lock_write().unlock)
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4812
4445
# handle race conditions - a parent might be set while we run.
4813
4446
if local_branch.get_parent() is None:
4814
4447
local_branch.set_parent(remote_branch.base)
4874
4507
@display_command
4875
4508
def run(self, verbose=False):
4876
from bzrlib import plugin
4877
# Don't give writelines a generator as some codecs don't like that
4878
self.outf.writelines(
4879
list(plugin.describe_plugins(show_paths=verbose)))
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")
4882
4531
class cmd_testament(Command):
4928
4578
Option('long', help='Show commit date in annotations.'),
4933
4582
encoding_type = 'exact'
4935
4584
@display_command
4936
4585
def run(self, filename, all=False, long=False, revision=None,
4937
show_ids=False, directory=None):
4938
from bzrlib.annotate import (
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4941
4588
wt, branch, relpath = \
4942
_open_directory_or_containing_tree_or_branch(filename, directory)
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4943
4590
if wt is not None:
4944
self.add_cleanup(wt.lock_read().unlock)
4592
self.add_cleanup(wt.unlock)
4946
self.add_cleanup(branch.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4947
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4948
self.add_cleanup(tree.lock_read().unlock)
4949
if wt is not None and revision is None:
4598
self.add_cleanup(tree.unlock)
4950
4600
file_id = wt.path2id(relpath)
4952
4602
file_id = tree.path2id(relpath)
4953
4603
if file_id is None:
4954
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4955
4606
if wt is not None and revision is None:
4956
4607
# If there is a tree and we're not annotating historical
4957
4608
# versions, annotate the working tree's content.
4958
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
4959
4610
show_ids=show_ids)
4961
annotate_file_tree(tree, file_id, self.outf, long, all,
4962
show_ids=show_ids, branch=branch)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4965
4616
class cmd_re_sign(Command):
4969
4620
hidden = True # is this right ?
4970
4621
takes_args = ['revision_id*']
4971
takes_options = ['directory', 'revision']
4622
takes_options = ['revision']
4973
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4624
def run(self, revision_id_list=None, revision=None):
4974
4625
if revision_id_list is not None and revision is not None:
4975
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4976
4627
if revision_id_list is None and revision is None:
4977
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
4978
b = WorkingTree.open_containing(directory)[0].branch
4979
self.add_cleanup(b.lock_write().unlock)
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)
4980
4632
return self._run(b, revision_id_list, revision)
4982
4634
def _run(self, b, revision_id_list, revision):
5042
4694
_see_also = ['checkouts', 'unbind']
5043
4695
takes_args = ['location?']
5044
takes_options = ['directory']
5046
def run(self, location=None, directory=u'.'):
5047
b, relpath = Branch.open_containing(directory)
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5048
4700
if location is None:
5050
4702
location = b.get_old_bound_location()
5051
4703
except errors.UpgradeRequired:
5052
raise errors.BzrCommandError(gettext('No location supplied. '
5053
'This format does not remember old locations.'))
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5055
4707
if location is None:
5056
4708
if b.get_bound_location() is not None:
5057
raise errors.BzrCommandError(gettext('Branch is already bound'))
4709
raise errors.BzrCommandError('Branch is already bound')
5059
raise errors.BzrCommandError(gettext('No location supplied '
5060
'and no previous location known'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5061
4713
b_other = Branch.open(location)
5063
4715
b.bind(b_other)
5064
4716
except errors.DivergedBranches:
5065
raise errors.BzrCommandError(gettext('These branches have diverged.'
5066
' Try merging, and then bind again.'))
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5067
4719
if b.get_config().has_explicit_nickname():
5068
4720
b.nick = b_other.nick
5121
4771
encoding_type = 'replace'
5123
def run(self, location=None, dry_run=False, verbose=False,
5124
revision=None, force=False, local=False, keep_tags=False):
4773
def run(self, location=None,
4774
dry_run=False, verbose=False,
4775
revision=None, force=False, local=False):
5125
4776
if location is None:
5126
4777
location = u'.'
5127
4778
control, relpath = bzrdir.BzrDir.open_containing(location)
5133
4784
b = control.open_branch()
5135
4786
if tree is not None:
5136
self.add_cleanup(tree.lock_write().unlock)
4788
self.add_cleanup(tree.unlock)
5138
self.add_cleanup(b.lock_write().unlock)
5139
return self._run(b, tree, dry_run, verbose, revision, force,
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5142
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5144
4795
from bzrlib.log import log_formatter, show_log
5145
4796
from bzrlib.uncommit import uncommit
5176
4827
end_revision=last_revno)
5179
self.outf.write(gettext('Dry-run, pretending to remove'
5180
' the above revisions.\n'))
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5182
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5185
if not ui.ui_factory.confirm_action(
5186
gettext(u'Uncommit these revisions'),
5187
'bzrlib.builtins.uncommit',
5189
self.outf.write(gettext('Canceled\n'))
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5192
4840
mutter('Uncommitting from {%s} to {%s}',
5193
4841
last_rev_id, rev_id)
5194
4842
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5195
revno=revno, local=local, keep_tags=keep_tags)
5196
self.outf.write(gettext('You can restore the old tip by running:\n'
5197
' bzr pull . -r revid:%s\n') % last_rev_id)
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)
5200
4848
class cmd_break_lock(Command):
5201
__doc__ = """Break a dead lock.
5203
This command breaks a lock on a repository, branch, working directory or
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5206
4851
CAUTION: Locks should only be broken when you are sure that the process
5207
4852
holding the lock has been stopped.
5214
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
5215
bzr break-lock --conf ~/.bazaar
5218
4861
takes_args = ['location?']
5221
help='LOCATION is the directory where the config lock is.'),
5223
help='Do not ask for confirmation before breaking the lock.'),
5226
def run(self, location=None, config=False, force=False):
4863
def run(self, location=None, show=False):
5227
4864
if location is None:
5228
4865
location = u'.'
5230
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5232
{'bzrlib.lockdir.break': True})
5234
conf = _mod_config.LockableConfig(file_name=location)
5237
control, relpath = bzrdir.BzrDir.open_containing(location)
5239
control.break_lock()
5240
except NotImplementedError:
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5244
4873
class cmd_wait_until_signalled(Command):
5308
4936
return host, port
5310
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5311
protocol=None, client_timeout=None):
5312
from bzrlib import transport
4940
from bzrlib.transport import get_transport, transport_server_registry
5313
4941
if directory is None:
5314
4942
directory = os.getcwd()
5315
4943
if protocol is None:
5316
protocol = transport.transport_server_registry.get()
4944
protocol = transport_server_registry.get()
5317
4945
host, port = self.get_host_and_port(port)
5318
4946
url = urlutils.local_path_to_url(directory)
5319
4947
if not allow_writes:
5320
4948
url = 'readonly+' + url
5321
t = transport.get_transport(url)
5323
protocol(t, host, port, inet, client_timeout)
5324
except TypeError, e:
5325
# We use symbol_versioning.deprecated_in just so that people
5326
# grepping can find it here.
5327
# symbol_versioning.deprecated_in((2, 5, 0))
5328
symbol_versioning.warn(
5329
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5330
'Most likely it needs to be updated to support a'
5331
' "timeout" parameter (added in bzr 2.5.0)'
5332
% (e, protocol.__module__, protocol),
5334
protocol(t, host, port, inet)
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5337
4953
class cmd_join(Command):
5370
4986
except errors.BadReferenceTarget, e:
5371
4987
# XXX: Would be better to just raise a nicely printable
5372
4988
# exception from the real origin. Also below. mbp 20070306
5373
raise errors.BzrCommandError(
5374
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4989
raise errors.BzrCommandError("Cannot join %s. %s" %
5377
4993
containing_tree.subsume(sub_tree)
5378
4994
except errors.BadSubsumeSource, e:
5379
raise errors.BzrCommandError(
5380
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4995
raise errors.BzrCommandError("Cannot join %s. %s" %
5383
4999
class cmd_split(Command):
5449
5064
encoding_type = 'exact'
5451
5066
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5452
sign=False, revision=None, mail_to=None, message=None,
5067
sign=False, revision=None, mail_to=None, message=None):
5454
5068
from bzrlib.revision import ensure_null, NULL_REVISION
5455
5069
include_patch, include_bundle = {
5456
5070
'plain': (False, False),
5457
5071
'diff': (True, False),
5458
5072
'bundle': (True, True),
5460
branch = Branch.open(directory)
5074
branch = Branch.open('.')
5461
5075
stored_submit_branch = branch.get_submit_branch()
5462
5076
if submit_branch is None:
5463
5077
submit_branch = stored_submit_branch
5475
5089
elif stored_public_branch is None:
5476
5090
branch.set_public_branch(public_branch)
5477
5091
if not include_bundle and public_branch is None:
5478
raise errors.BzrCommandError(gettext('No public branch specified or'
5092
raise errors.BzrCommandError('No public branch specified or'
5480
5094
base_revision_id = None
5481
5095
if revision is not None:
5482
5096
if len(revision) > 2:
5483
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5484
'at most two one revision identifiers'))
5097
raise errors.BzrCommandError('bzr merge-directive takes '
5098
'at most two one revision identifiers')
5485
5099
revision_id = revision[-1].as_revision_id(branch)
5486
5100
if len(revision) == 2:
5487
5101
base_revision_id = revision[0].as_revision_id(branch)
5489
5103
revision_id = branch.last_revision()
5490
5104
revision_id = ensure_null(revision_id)
5491
5105
if revision_id == NULL_REVISION:
5492
raise errors.BzrCommandError(gettext('No revisions to bundle.'))
5106
raise errors.BzrCommandError('No revisions to bundle.')
5493
5107
directive = merge_directive.MergeDirective2.from_objects(
5494
5108
branch.repository, revision_id, time.time(),
5495
5109
osutils.local_time_offset(), submit_branch,
5539
5153
source branch defaults to that containing the working directory, but can
5540
5154
be changed using --from.
5542
Both the submit branch and the public branch follow the usual behavior with
5543
respect to --remember: If there is no default location set, the first send
5544
will set it (use --no-remember to avoid setting it). After that, you can
5545
omit the location to use the default. To change the default, use
5546
--remember. The value will only be saved if the location can be accessed.
5548
5156
In order to calculate those changes, bzr must analyse the submit branch.
5549
5157
Therefore it is most efficient for the submit branch to be a local mirror.
5550
5158
If a public location is known for the submit_branch, that location is used
5621
5229
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5622
no_patch=False, revision=None, remember=None, output=None,
5230
no_patch=False, revision=None, remember=False, output=None,
5623
5231
format=None, mail_to=None, message=None, body=None,
5624
5232
strict=None, **kwargs):
5625
5233
from bzrlib.send import send
5748
5359
branch, relpath = Branch.open_containing(directory)
5749
self.add_cleanup(branch.lock_write().unlock)
5361
self.add_cleanup(branch.unlock)
5751
5363
if tag_name is None:
5752
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5364
raise errors.BzrCommandError("No tag specified to delete.")
5753
5365
branch.tags.delete_tag(tag_name)
5754
note(gettext('Deleted tag %s.') % tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5757
5369
if len(revision) != 1:
5758
raise errors.BzrCommandError(gettext(
5370
raise errors.BzrCommandError(
5759
5371
"Tags can only be placed on a single revision, "
5761
5373
revision_id = revision[0].as_revision_id(branch)
5763
5375
revision_id = branch.last_revision()
5764
5376
if tag_name is None:
5765
5377
tag_name = branch.automatic_tag_name(revision_id)
5766
5378
if tag_name is None:
5767
raise errors.BzrCommandError(gettext(
5768
"Please specify a tag name."))
5770
existing_target = branch.tags.lookup_tag(tag_name)
5771
except errors.NoSuchTag:
5772
existing_target = None
5773
if not force and existing_target not in (None, revision_id):
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5774
5382
raise errors.TagAlreadyExists(tag_name)
5775
if existing_target == revision_id:
5776
note(gettext('Tag %s already exists for that revision.') % tag_name)
5778
branch.tags.set_tag(tag_name, revision_id)
5779
if existing_target is None:
5780
note(gettext('Created tag %s.') % tag_name)
5782
note(gettext('Updated tag %s.') % tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5785
5387
class cmd_tags(Command):
5791
5393
_see_also = ['tag']
5792
5394
takes_options = [
5793
custom_help('directory',
5794
help='Branch whose tags should be displayed.'),
5795
RegistryOption('sort',
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5796
5401
'Sort tags by different criteria.', title='Sorting',
5797
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5803
5409
@display_command
5804
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5805
from bzrlib.tag import tag_sort_methods
5806
5416
branch, relpath = Branch.open_containing(directory)
5808
5418
tags = branch.tags.get_tag_dict().items()
5812
self.add_cleanup(branch.lock_read().unlock)
5423
self.add_cleanup(branch.unlock)
5814
# Restrict to the specified range
5815
tags = self._tags_for_range(branch, revision)
5817
sort = tag_sort_methods.get()
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]])
5819
5444
if not show_ids:
5820
5445
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5821
5446
for index, (tag, revid) in enumerate(tags):
5823
5448
revno = branch.revision_id_to_dotted_revno(revid)
5824
5449
if isinstance(revno, tuple):
5825
5450
revno = '.'.join(map(str, revno))
5826
except (errors.NoSuchRevision,
5827
errors.GhostRevisionsHaveNoRevno,
5828
errors.UnsupportedOperation):
5451
except errors.NoSuchRevision:
5829
5452
# Bad tag data/merges can lead to tagged revisions
5830
5453
# which are not in this branch. Fail gracefully ...
5834
5457
for tag, revspec in tags:
5835
5458
self.outf.write('%-20s %s\n' % (tag, revspec))
5837
def _tags_for_range(self, branch, revision):
5839
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5840
revid1, revid2 = rev1.rev_id, rev2.rev_id
5841
# _get_revision_range will always set revid2 if it's not specified.
5842
# If revid1 is None, it means we want to start from the branch
5843
# origin which is always a valid ancestor. If revid1 == revid2, the
5844
# ancestry check is useless.
5845
if revid1 and revid1 != revid2:
5846
# FIXME: We really want to use the same graph than
5847
# branch.iter_merge_sorted_revisions below, but this is not
5848
# easily available -- vila 2011-09-23
5849
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5850
# We don't want to output anything in this case...
5852
# only show revisions between revid1 and revid2 (inclusive)
5853
tagged_revids = branch.tags.get_reverse_tag_dict()
5855
for r in branch.iter_merge_sorted_revisions(
5856
start_revision_id=revid2, stop_revision_id=revid1,
5857
stop_rule='include'):
5858
revid_tags = tagged_revids.get(r[0], None)
5860
found.extend([(tag, r[0]) for tag in revid_tags])
5864
5461
class cmd_reconfigure(Command):
5865
5462
__doc__ = """Reconfigure the type of a bzr directory.
5879
5476
takes_args = ['location?']
5880
5477
takes_options = [
5881
5478
RegistryOption.from_kwargs(
5884
help='The relation between branch and tree.',
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
5885
5482
value_switches=True, enum_switch=False,
5886
5483
branch='Reconfigure to be an unbound branch with no working tree.',
5887
5484
tree='Reconfigure to be an unbound branch with a working tree.',
5888
5485
checkout='Reconfigure to be a bound branch with a working tree.',
5889
5486
lightweight_checkout='Reconfigure to be a lightweight'
5890
5487
' checkout (with no local history).',
5892
RegistryOption.from_kwargs(
5894
title='Repository type',
5895
help='Location fo the repository.',
5896
value_switches=True, enum_switch=False,
5897
5488
standalone='Reconfigure to be a standalone branch '
5898
5489
'(i.e. stop using shared repository).',
5899
5490
use_shared='Reconfigure to use a shared repository.',
5901
RegistryOption.from_kwargs(
5903
title='Trees in Repository',
5904
help='Whether new branches in the repository have trees.',
5905
value_switches=True, enum_switch=False,
5906
5491
with_trees='Reconfigure repository to create '
5907
5492
'working trees on branches by default.',
5908
5493
with_no_trees='Reconfigure repository to not create '
5925
def run(self, location=None, bind_to=None, force=False,
5926
tree_type=None, repository_type=None, repository_trees=None,
5927
stacked_on=None, unstacked=None):
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5928
5513
directory = bzrdir.BzrDir.open(location)
5929
5514
if stacked_on and unstacked:
5930
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5931
5516
elif stacked_on is not None:
5932
5517
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5933
5518
elif unstacked:
5935
5520
# At the moment you can use --stacked-on and a different
5936
5521
# reconfiguration shape at the same time; there seems no good reason
5938
if (tree_type is None and
5939
repository_type is None and
5940
repository_trees is None):
5523
if target_type is None:
5941
5524
if stacked_on or unstacked:
5944
raise errors.BzrCommandError(gettext('No target configuration '
5946
reconfiguration = None
5947
if tree_type == 'branch':
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
5948
5530
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5949
elif tree_type == 'tree':
5531
elif target_type == 'tree':
5950
5532
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5951
elif tree_type == 'checkout':
5533
elif target_type == 'checkout':
5952
5534
reconfiguration = reconfigure.Reconfigure.to_checkout(
5953
5535
directory, bind_to)
5954
elif tree_type == 'lightweight-checkout':
5536
elif target_type == 'lightweight-checkout':
5955
5537
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5956
5538
directory, bind_to)
5958
reconfiguration.apply(force)
5959
reconfiguration = None
5960
if repository_type == 'use-shared':
5539
elif target_type == 'use-shared':
5961
5540
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5962
elif repository_type == 'standalone':
5541
elif target_type == 'standalone':
5963
5542
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5965
reconfiguration.apply(force)
5966
reconfiguration = None
5967
if repository_trees == 'with-trees':
5543
elif target_type == 'with-trees':
5968
5544
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5969
5545
directory, True)
5970
elif repository_trees == 'with-no-trees':
5546
elif target_type == 'with-no-trees':
5971
5547
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5972
5548
directory, False)
5974
reconfiguration.apply(force)
5975
reconfiguration = None
5549
reconfiguration.apply(force)
5978
5552
class cmd_switch(Command):
6011
5584
def run(self, to_location=None, force=False, create_branch=False,
6012
revision=None, directory=u'.'):
6013
5586
from bzrlib import switch
6014
tree_location = directory
6015
5588
revision = _get_one_revision('switch', revision)
6016
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6017
5590
if to_location is None:
6018
5591
if revision is None:
6019
raise errors.BzrCommandError(gettext('You must supply either a'
6020
' revision or a location'))
6021
to_location = tree_location
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6023
5596
branch = control_dir.open_branch()
6024
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
6162
tree, file_list = WorkingTree.open_containing_paths(file_list,
5735
tree, file_list = tree_files(file_list, apply_view=False)
6164
5736
current_view, view_dict = tree.views.get_view_info()
6165
5737
if name is None:
6166
5738
name = current_view
6169
raise errors.BzrCommandError(gettext(
6170
"Both --delete and a file list specified"))
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6172
raise errors.BzrCommandError(gettext(
6173
"Both --delete and --switch specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6175
5747
tree.views.set_view_info(None, {})
6176
self.outf.write(gettext("Deleted all views.\n"))
5748
self.outf.write("Deleted all views.\n")
6177
5749
elif name is None:
6178
raise errors.BzrCommandError(gettext("No current view to delete"))
5750
raise errors.BzrCommandError("No current view to delete")
6180
5752
tree.views.delete_view(name)
6181
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6184
raise errors.BzrCommandError(gettext(
6185
"Both --switch and a file list specified"))
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6187
raise errors.BzrCommandError(gettext(
6188
"Both --switch and --all specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6189
5761
elif switch == 'off':
6190
5762
if current_view is None:
6191
raise errors.BzrCommandError(gettext("No current view to disable"))
5763
raise errors.BzrCommandError("No current view to disable")
6192
5764
tree.views.set_view_info(None, view_dict)
6193
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6195
5767
tree.views.set_view_info(switch, view_dict)
6196
5768
view_str = views.view_display_str(tree.views.lookup_view())
6197
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6200
self.outf.write(gettext('Views defined:\n'))
5772
self.outf.write('Views defined:\n')
6201
5773
for view in sorted(view_dict):
6202
5774
if view == current_view:
6206
5778
view_str = views.view_display_str(view_dict[view])
6207
5779
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
6209
self.outf.write(gettext('No views defined.\n'))
5781
self.outf.write('No views defined.\n')
6210
5782
elif file_list:
6211
5783
if name is None:
6212
5784
# No name given and no current view set
6214
5786
elif name == 'off':
6215
raise errors.BzrCommandError(gettext(
6216
"Cannot change the 'off' pseudo view"))
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6217
5789
tree.views.set_view(name, sorted(file_list))
6218
5790
view_str = views.view_display_str(tree.views.lookup_view())
6219
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6221
5793
# list the files
6222
5794
if name is None:
6223
5795
# No name given and no current view set
6224
self.outf.write(gettext('No current view.\n'))
5796
self.outf.write('No current view.\n')
6226
5798
view_str = views.view_display_str(tree.views.lookup_view(name))
6227
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6230
5802
class cmd_hooks(Command):
6296
5868
You can put multiple items on the shelf, and by default, 'unshelve' will
6297
5869
restore the most recently shelved changes.
6299
For complicated changes, it is possible to edit the changes in a separate
6300
editor program to decide what the file remaining in the working copy
6301
should look like. To do this, add the configuration option
6303
change_editor = PROGRAM @new_path @old_path
6305
where @new_path is replaced with the path of the new version of the
6306
file and @old_path is replaced with the path of the old version of
6307
the file. The PROGRAM should save the new file with the desired
6308
contents of the file in the working tree.
6312
5872
takes_args = ['file*']
6314
5874
takes_options = [
6317
5876
Option('all', help='Shelve all changes.'),
6324
5883
Option('destroy',
6325
5884
help='Destroy removed changes instead of shelving them.'),
6327
_see_also = ['unshelve', 'configuration']
5886
_see_also = ['unshelve']
6329
5888
def run(self, revision=None, all=False, file_list=None, message=None,
6330
writer=None, list=False, destroy=False, directory=None):
5889
writer=None, list=False, destroy=False):
6332
return self.run_for_list(directory=directory)
5891
return self.run_for_list()
6333
5892
from bzrlib.shelf_ui import Shelver
6334
5893
if writer is None:
6335
5894
writer = bzrlib.option.diff_writer_registry.get()
6337
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
6338
file_list, message, destroy=destroy, directory=directory)
5897
file_list, message, destroy=destroy)
6343
5902
except errors.UserAbort:
6346
def run_for_list(self, directory=None):
6347
if directory is None:
6349
tree = WorkingTree.open_containing(directory)[0]
6350
self.add_cleanup(tree.lock_read().unlock)
5905
def run_for_list(self):
5906
tree = WorkingTree.open_containing('.')[0]
5908
self.add_cleanup(tree.unlock)
6351
5909
manager = tree.get_shelf_manager()
6352
5910
shelves = manager.active_shelves()
6353
5911
if len(shelves) == 0:
6354
note(gettext('No shelved changes.'))
5912
note('No shelved changes.')
6356
5914
for shelf_id in reversed(shelves):
6357
5915
message = manager.get_metadata(shelf_id).get('message')
6410
5967
To check what clean-tree will do, use --dry-run.
6412
takes_options = ['directory',
6413
Option('ignored', help='Delete all ignored files.'),
6414
Option('detritus', help='Delete conflict files, merge and revert'
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5970
Option('detritus', help='Delete conflict files, merge'
6415
5971
' backups, and failed selftest dirs.'),
6416
5972
Option('unknown',
6417
5973
help='Delete files unknown to bzr (default).'),
6419
5975
' deleting them.'),
6420
5976
Option('force', help='Do not prompt before deleting.')]
6421
5977
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6422
force=False, directory=u'.'):
6423
5979
from bzrlib.clean_tree import clean_tree
6424
5980
if not (unknown or ignored or detritus):
6428
clean_tree(directory, unknown=unknown, ignored=ignored,
6429
detritus=detritus, dry_run=dry_run, no_prompt=force)
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6432
5988
class cmd_reference(Command):
6476
6032
self.outf.write('%s %s\n' % (path, location))
6479
class cmd_export_pot(Command):
6480
__doc__ = """Export command helps and error messages in po format."""
6483
takes_options = [Option('plugin',
6484
help='Export help text from named command '\
6485
'(defaults to all built in commands).',
6488
def run(self, plugin=None):
6489
from bzrlib.export_pot import export_pot
6490
export_pot(self.outf, plugin)
6493
6035
def _register_lazy_builtins():
6494
6036
# register lazy builtins from other modules; called at startup and should
6495
6037
# be only called once.
6496
6038
for (name, aliases, module_name) in [
6497
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6498
('cmd_config', [], 'bzrlib.config'),
6499
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6500
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6501
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6502
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6503
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6504
('cmd_verify_signatures', [],
6505
'bzrlib.commit_signature_commands'),
6506
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6508
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
