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.
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.
988
954
Note: The location can be specified either in the form of a branch,
989
955
or in the form of a path to a file containing a merge directive generated
994
960
takes_options = ['remember', 'overwrite', 'revision',
995
961
custom_help('verbose',
996
962
help='Show logs of pulled revisions.'),
997
custom_help('directory',
998
964
help='Branch to pull into, '
999
'rather than the one containing the working directory.'),
965
'rather than the one containing the working directory.',
1001
970
help="Perform a local pull in a bound "
1002
971
"branch. Local pulls are not applied to "
1003
972
"the master branch."
1006
help="Show base revision text in conflicts.")
1008
975
takes_args = ['location?']
1009
976
encoding_type = 'replace'
1011
def run(self, location=None, remember=None, overwrite=False,
978
def run(self, location=None, remember=False, overwrite=False,
1012
979
revision=None, verbose=False,
1013
directory=None, local=False,
980
directory=None, local=False):
1015
981
# FIXME: too much stuff is in the command class
1016
982
revision_id = None
1017
983
mergeable = None
1021
987
tree_to = WorkingTree.open_containing(directory)[0]
1022
988
branch_to = tree_to.branch
1023
self.add_cleanup(tree_to.lock_write().unlock)
990
self.add_cleanup(tree_to.unlock)
1024
991
except errors.NoWorkingTree:
1026
993
branch_to = Branch.open_containing(directory)[0]
1027
self.add_cleanup(branch_to.lock_write().unlock)
1029
if tree_to is None and show_base:
1030
raise errors.BzrCommandError(gettext("Need working tree for --show-base."))
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
1032
997
if local and not branch_to.get_bound_location():
1033
998
raise errors.LocalRequiresBoundBranch()
1043
1008
stored_loc = branch_to.get_parent()
1044
1009
if location is None:
1045
1010
if stored_loc is None:
1046
raise errors.BzrCommandError(gettext("No pull location known or"
1011
raise errors.BzrCommandError("No pull location known or"
1049
1014
display_url = urlutils.unescape_for_display(stored_loc,
1050
1015
self.outf.encoding)
1051
1016
if not is_quiet():
1052
self.outf.write(gettext("Using saved parent location: %s\n") % display_url)
1017
self.outf.write("Using saved parent location: %s\n" % display_url)
1053
1018
location = stored_loc
1055
1020
revision = _get_one_revision('pull', revision)
1056
1021
if mergeable is not None:
1057
1022
if revision is not None:
1058
raise errors.BzrCommandError(gettext(
1059
'Cannot use -r with merge directives or bundles'))
1023
raise errors.BzrCommandError(
1024
'Cannot use -r with merge directives or bundles')
1060
1025
mergeable.install_revisions(branch_to.repository)
1061
1026
base_revision_id, revision_id, verified = \
1062
1027
mergeable.get_merge_request(branch_to.repository)
1116
1077
do a merge (see bzr help merge) from the other branch, and commit that.
1117
1078
After that you will be able to do a push without '--overwrite'.
1119
If there is no default push location set, the first push will set it (use
1120
--no-remember to avoid setting it). After that, you can omit the
1121
location to use the default. To change the default, use --remember. The
1122
value will only be saved if the remote location can be accessed.
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.
1125
1086
_see_also = ['pull', 'update', 'working-trees']
1127
1088
Option('create-prefix',
1128
1089
help='Create the path leading up to the branch '
1129
1090
'if it does not already exist.'),
1130
custom_help('directory',
1131
1092
help='Branch to push from, '
1132
'rather than the one containing the working directory.'),
1093
'rather than the one containing the working directory.',
1133
1097
Option('use-existing-dir',
1134
1098
help='By default push will fail if the target'
1135
1099
' directory exists, but does not already'
1146
1110
Option('strict',
1147
1111
help='Refuse to push if there are uncommitted changes in'
1148
1112
' the working tree, --no-strict disables the check.'),
1150
help="Don't populate the working tree, even for protocols"
1151
" that support it."),
1153
1114
takes_args = ['location?']
1154
1115
encoding_type = 'replace'
1156
def run(self, location=None, remember=None, overwrite=False,
1117
def run(self, location=None, remember=False, overwrite=False,
1157
1118
create_prefix=False, verbose=False, revision=None,
1158
1119
use_existing_dir=False, directory=None, stacked_on=None,
1159
stacked=False, strict=None, no_tree=False):
1120
stacked=False, strict=None):
1160
1121
from bzrlib.push import _show_push_branch
1162
1123
if directory is None:
1190
1151
# error by the feedback given to them. RBC 20080227.
1191
1152
stacked_on = parent_url
1192
1153
if not stacked_on:
1193
raise errors.BzrCommandError(gettext(
1194
"Could not determine branch to refer to."))
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1196
1157
# Get the destination location
1197
1158
if location is None:
1198
1159
stored_loc = br_from.get_push_location()
1199
1160
if stored_loc is None:
1200
raise errors.BzrCommandError(gettext(
1201
"No push location known or specified."))
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1203
1164
display_url = urlutils.unescape_for_display(stored_loc,
1204
1165
self.outf.encoding)
1205
note(gettext("Using saved push location: %s") % display_url)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1206
1167
location = stored_loc
1208
1169
_show_push_branch(br_from, revision_id, location, self.outf,
1209
1170
verbose=verbose, overwrite=overwrite, remember=remember,
1210
1171
stacked_on=stacked_on, create_prefix=create_prefix,
1211
use_existing_dir=use_existing_dir, no_tree=no_tree)
1172
use_existing_dir=use_existing_dir)
1214
1175
class cmd_branch(Command):
1224
1185
To retrieve the branch as of a particular revision, supply the --revision
1225
1186
parameter, as in "branch foo/bar -r 5".
1227
The synonyms 'clone' and 'get' for this command are deprecated.
1230
1189
_see_also = ['checkout']
1231
1190
takes_args = ['from_location', 'to_location?']
1232
takes_options = ['revision',
1233
Option('hardlink', help='Hard-link working tree files where possible.'),
1234
Option('files-from', type=str,
1235
help="Get file contents from this tree."),
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1236
1193
Option('no-tree',
1237
1194
help="Create a branch without a working-tree."),
1238
1195
Option('switch',
1257
1214
def run(self, from_location, to_location=None, revision=None,
1258
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1259
use_existing_dir=False, switch=False, bind=False,
1216
use_existing_dir=False, switch=False, bind=False):
1261
1217
from bzrlib import switch as _mod_switch
1262
1218
from bzrlib.tag import _merge_tags_if_possible
1263
if self.invoked_as in ['get', 'clone']:
1264
ui.ui_factory.show_user_warning(
1265
'deprecated_command',
1266
deprecated_name=self.invoked_as,
1267
recommended_name='branch',
1268
deprecated_in_version='2.4')
1269
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1271
if not (hardlink or files_from):
1272
# accelerator_tree is usually slower because you have to read N
1273
# files (no readahead, lots of seeks, etc), but allow the user to
1274
# explicitly request it
1275
accelerator_tree = None
1276
if files_from is not None and files_from != from_location:
1277
accelerator_tree = WorkingTree.open(files_from)
1278
1221
revision = _get_one_revision('branch', revision)
1279
self.add_cleanup(br_from.lock_read().unlock)
1223
self.add_cleanup(br_from.unlock)
1280
1224
if revision is not None:
1281
1225
revision_id = revision.as_revision_id(br_from)
1315
1259
branch = dir.open_branch()
1316
1260
except errors.NoSuchRevision:
1317
1261
to_transport.delete_tree('.')
1318
msg = gettext("The branch {0} has no revision {1}.").format(
1319
from_location, revision)
1262
msg = "The branch %s has no revision %s." % (from_location,
1320
1264
raise errors.BzrCommandError(msg)
1321
1265
_merge_tags_if_possible(br_from, branch)
1322
1266
# If the source branch is stacked, the new branch may
1323
1267
# be stacked whether we asked for that explicitly or not.
1324
1268
# We therefore need a try/except here and not just 'if stacked:'
1326
note(gettext('Created new stacked branch referring to %s.') %
1270
note('Created new stacked branch referring to %s.' %
1327
1271
branch.get_stacked_on_url())
1328
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1329
1273
errors.UnstackableRepositoryFormat), e:
1330
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1274
note('Branched %d revision(s).' % branch.revno())
1332
1276
# Bind to the parent
1333
1277
parent_branch = Branch.open(from_location)
1334
1278
branch.bind(parent_branch)
1335
note(gettext('New branch bound to %s') % from_location)
1279
note('New branch bound to %s' % from_location)
1337
1281
# Switch to the new branch
1338
1282
wt, _ = WorkingTree.open_containing('.')
1339
1283
_mod_switch.switch(wt.bzrdir, branch)
1340
note(gettext('Switched to branch: %s'),
1284
note('Switched to branch: %s',
1341
1285
urlutils.unescape_for_display(branch.base, 'utf-8'))
1344
class cmd_branches(Command):
1345
__doc__ = """List the branches available at the current location.
1347
This command will print the names of all the branches at the current
1351
takes_args = ['location?']
1353
Option('recursive', short_name='R',
1354
help='Recursively scan for branches rather than '
1355
'just looking in the specified location.')]
1357
def run(self, location=".", recursive=False):
1359
t = transport.get_transport(location)
1360
if not t.listable():
1361
raise errors.BzrCommandError(
1362
"Can't scan this type of location.")
1363
for b in bzrdir.BzrDir.find_branches(t):
1364
self.outf.write("%s\n" % urlutils.unescape_for_display(
1365
urlutils.relative_url(t.base, b.base),
1366
self.outf.encoding).rstrip("/"))
1368
dir = bzrdir.BzrDir.open_containing(location)[0]
1369
for branch in dir.list_branches():
1370
if branch.name is None:
1371
self.outf.write(gettext(" (default)\n"))
1373
self.outf.write(" %s\n" % branch.name.encode(
1374
self.outf.encoding))
1377
1288
class cmd_checkout(Command):
1378
1289
__doc__ = """Create a new checkout of an existing branch.
1420
1331
to_location = branch_location
1421
1332
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1422
1333
branch_location)
1423
if not (hardlink or files_from):
1424
# accelerator_tree is usually slower because you have to read N
1425
# files (no readahead, lots of seeks, etc), but allow the user to
1426
# explicitly request it
1427
accelerator_tree = None
1428
1334
revision = _get_one_revision('checkout', revision)
1429
if files_from is not None and files_from != branch_location:
1335
if files_from is not None:
1430
1336
accelerator_tree = WorkingTree.open(files_from)
1431
1337
if revision is not None:
1432
1338
revision_id = revision.as_revision_id(source)
1488
1396
If you want to discard your local changes, you can just do a
1489
1397
'bzr revert' instead of 'bzr commit' after the update.
1491
If you want to restore a file that has been removed locally, use
1492
'bzr revert' instead of 'bzr update'.
1494
1399
If the tree's branch is bound to a master branch, it will also update
1495
1400
the branch from the master.
1498
1403
_see_also = ['pull', 'working-trees', 'status-flags']
1499
1404
takes_args = ['dir?']
1500
takes_options = ['revision',
1502
help="Show base revision text in conflicts."),
1405
takes_options = ['revision']
1504
1406
aliases = ['up']
1506
def run(self, dir='.', revision=None, show_base=None):
1408
def run(self, dir='.', revision=None):
1507
1409
if revision is not None and len(revision) != 1:
1508
raise errors.BzrCommandError(gettext(
1509
"bzr update --revision takes exactly one revision"))
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1510
1412
tree = WorkingTree.open_containing(dir)[0]
1511
1413
branch = tree.branch
1512
1414
possible_transports = []
1513
1415
master = branch.get_master_branch(
1514
1416
possible_transports=possible_transports)
1515
1417
if master is not None:
1516
1419
branch_location = master.base
1421
tree.lock_tree_write()
1519
1422
branch_location = tree.branch.base
1520
tree.lock_tree_write()
1521
1423
self.add_cleanup(tree.unlock)
1522
1424
# get rid of the final '/' and be ready for display
1523
1425
branch_location = urlutils.unescape_for_display(
1537
1439
revision_id = branch.last_revision()
1538
1440
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1539
1441
revno = branch.revision_id_to_dotted_revno(revision_id)
1540
note(gettext("Tree is up to date at revision {0} of branch {1}"
1541
).format('.'.join(map(str, revno)), branch_location))
1442
note("Tree is up to date at revision %s of branch %s" %
1443
('.'.join(map(str, revno)), branch_location))
1543
1445
view_info = _get_view_info_for_change_reporter(tree)
1544
1446
change_reporter = delta._ChangeReporter(
1549
1451
change_reporter,
1550
1452
possible_transports=possible_transports,
1551
1453
revision=revision_id,
1553
show_base=show_base)
1554
1455
except errors.NoSuchRevision, e:
1555
raise errors.BzrCommandError(gettext(
1456
raise errors.BzrCommandError(
1556
1457
"branch has no revision %s\n"
1557
1458
"bzr update --revision only works"
1558
" for a revision in the branch history")
1459
" for a revision in the branch history"
1559
1460
% (e.revision))
1560
1461
revno = tree.branch.revision_id_to_dotted_revno(
1561
1462
_mod_revision.ensure_null(tree.last_revision()))
1562
note(gettext('Updated to revision {0} of branch {1}').format(
1563
'.'.join(map(str, revno)), branch_location))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1564
1465
parent_ids = tree.get_parent_ids()
1565
1466
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1566
note(gettext('Your local commits will now show as pending merges with '
1567
"'bzr status', and can be committed with 'bzr commit'."))
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1568
1469
if conflicts != 0:
1618
1519
class cmd_remove(Command):
1619
1520
__doc__ = """Remove files or directories.
1621
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1622
delete them if they can easily be recovered using revert otherwise they
1623
will be backed up (adding an extention of the form .~#~). If no options or
1624
parameters are given Bazaar will scan for files that are being tracked by
1625
Bazaar but missing in your tree and stop tracking them for you.
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.
1627
1527
takes_args = ['file*']
1628
1528
takes_options = ['verbose',
1630
1530
RegistryOption.from_kwargs('file-deletion-strategy',
1631
1531
'The file deletion mode to be used.',
1632
1532
title='Deletion Strategy', value_switches=True, enum_switch=False,
1633
safe='Backup changed files (default).',
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1634
1535
keep='Delete from bzr but leave the working copy.',
1635
no_backup='Don\'t backup changed files.',
1636
1536
force='Delete all the specified files, even if they can not be '
1637
'recovered and even if they are non-empty directories. '
1638
'(deprecated, use no-backup)')]
1537
'recovered and even if they are non-empty directories.')]
1639
1538
aliases = ['rm', 'del']
1640
1539
encoding_type = 'replace'
1642
1541
def run(self, file_list, verbose=False, new=False,
1643
1542
file_deletion_strategy='safe'):
1644
if file_deletion_strategy == 'force':
1645
note(gettext("(The --force option is deprecated, rather use --no-backup "
1647
file_deletion_strategy = 'no-backup'
1649
tree, file_list = WorkingTree.open_containing_paths(file_list)
1543
tree, file_list = tree_files(file_list)
1651
1545
if file_list is not None:
1652
1546
file_list = [f for f in file_list]
1654
self.add_cleanup(tree.lock_write().unlock)
1549
self.add_cleanup(tree.unlock)
1655
1550
# Heuristics should probably all move into tree.remove_smart or
1741
1636
_see_also = ['check']
1742
1637
takes_args = ['branch?']
1744
Option('canonicalize-chks',
1745
help='Make sure CHKs are in canonical form (repairs '
1750
def run(self, branch=".", canonicalize_chks=False):
1639
def run(self, branch="."):
1751
1640
from bzrlib.reconcile import reconcile
1752
1641
dir = bzrdir.BzrDir.open(branch)
1753
reconcile(dir, canonicalize_chks=canonicalize_chks)
1756
1645
class cmd_revision_history(Command):
1789
1678
last_revision = wt.last_revision()
1791
self.add_cleanup(b.repository.lock_read().unlock)
1792
graph = b.repository.get_graph()
1793
revisions = [revid for revid, parents in
1794
graph.iter_ancestry([last_revision])]
1795
for revision_id in reversed(revisions):
1796
if _mod_revision.is_null(revision_id):
1680
revision_ids = b.repository.get_ancestry(last_revision)
1682
for revision_id in revision_ids:
1798
1683
self.outf.write(revision_id + '\n')
1838
1723
Option('append-revisions-only',
1839
1724
help='Never change revnos or the existing log.'
1840
' Append revisions to it only.'),
1842
'Create a branch without a working tree.')
1725
' Append revisions to it only.')
1844
1727
def run(self, location=None, format=None, append_revisions_only=False,
1845
create_prefix=False, no_tree=False):
1728
create_prefix=False):
1846
1729
if format is None:
1847
1730
format = bzrdir.format_registry.make_bzrdir('default')
1848
1731
if location is None:
1887
1765
raise errors.BranchExistsWithoutWorkingTree(location)
1888
1766
raise errors.AlreadyBranchError(location)
1889
1767
branch = a_bzrdir.create_branch()
1891
a_bzrdir.create_workingtree()
1768
a_bzrdir.create_workingtree()
1892
1769
if append_revisions_only:
1894
1771
branch.set_append_revisions_only(True)
1895
1772
except errors.UpgradeRequired:
1896
raise errors.BzrCommandError(gettext('This branch format cannot be set'
1897
' to append-revisions-only. Try --default.'))
1773
raise errors.BzrCommandError('This branch format cannot be set'
1774
' to append-revisions-only. Try --default.')
1898
1775
if not is_quiet():
1899
1776
from bzrlib.info import describe_layout, describe_format
1904
1781
repository = branch.repository
1905
1782
layout = describe_layout(repository, branch, tree).lower()
1906
1783
format = describe_format(a_bzrdir, repository, branch, tree)
1907
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1784
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
1909
1785
if repository.is_shared():
1910
1786
#XXX: maybe this can be refactored into transport.path_or_url()
1911
1787
url = repository.bzrdir.root_transport.external_url()
2110
1969
elif ':' in prefix:
2111
1970
old_label, new_label = prefix.split(":")
2113
raise errors.BzrCommandError(gettext(
1972
raise errors.BzrCommandError(
2114
1973
'--prefix expects two values separated by a colon'
2115
' (eg "old/:new/")'))
1974
' (eg "old/:new/")')
2117
1976
if revision and len(revision) > 2:
2118
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2119
' one or two revision specifiers'))
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2121
1980
if using is not None and format is not None:
2122
raise errors.BzrCommandError(gettext(
2123
'{0} and {1} are mutually exclusive').format(
2124
'--using', '--format'))
1981
raise errors.BzrCommandError('--using and --format are mutually '
2126
1984
(old_tree, new_tree,
2127
1985
old_branch, new_branch,
2128
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2129
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2130
# GNU diff on Windows uses ANSI encoding for filenames
2131
path_encoding = osutils.get_diff_header_encoding()
2132
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
2133
1989
specific_files=specific_files,
2134
1990
external_diff_options=diff_options,
2135
1991
old_label=old_label, new_label=new_label,
2136
extra_trees=extra_trees,
2137
path_encoding=path_encoding,
1992
extra_trees=extra_trees, using=using,
2139
1993
format_cls=format)
2149
2003
# level of effort but possibly much less IO. (Or possibly not,
2150
2004
# if the directories are very large...)
2151
2005
_see_also = ['status', 'ls']
2152
takes_options = ['directory', 'show-ids']
2006
takes_options = ['show-ids']
2154
2008
@display_command
2155
def run(self, show_ids=False, directory=u'.'):
2156
tree = WorkingTree.open_containing(directory)[0]
2157
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)
2158
2013
old = tree.basis_tree()
2159
self.add_cleanup(old.lock_read().unlock)
2015
self.add_cleanup(old.unlock)
2160
2016
for path, ie in old.inventory.iter_entries():
2161
2017
if not tree.has_id(ie.file_id):
2162
2018
self.outf.write(path)
2174
2030
_see_also = ['status', 'ls']
2175
takes_options = ['directory', 'null']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2177
2037
@display_command
2178
def run(self, null=False, directory=u'.'):
2179
tree = WorkingTree.open_containing(directory)[0]
2180
self.add_cleanup(tree.lock_read().unlock)
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2181
2040
td = tree.changes_from(tree.basis_tree())
2183
2041
for path, id, kind, text_modified, meta_modified in td.modified:
2185
2043
self.outf.write(path + '\0')
2195
2053
_see_also = ['status', 'ls']
2196
takes_options = ['directory', 'null']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2198
2060
@display_command
2199
def run(self, null=False, directory=u'.'):
2200
wt = WorkingTree.open_containing(directory)[0]
2201
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)
2202
2065
basis = wt.basis_tree()
2203
self.add_cleanup(basis.lock_read().unlock)
2067
self.add_cleanup(basis.unlock)
2204
2068
basis_inv = basis.inventory
2205
2069
inv = wt.inventory
2206
2070
for file_id in inv:
2207
if basis_inv.has_id(file_id):
2071
if file_id in basis_inv:
2209
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2211
2075
path = inv.id2path(file_id)
2212
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2076
if not os.access(osutils.abspath(path), os.F_OK):
2215
2079
self.outf.write(path + '\0')
2418
2279
help='Show just the specified revision.'
2419
2280
' See also "help revisionspec".'),
2421
RegistryOption('authors',
2422
'What names to list as authors - first, all or committer.',
2424
lazy_registry=('bzrlib.log', 'author_list_registry'),
2426
2282
Option('levels',
2427
2283
short_name='n',
2428
2284
help='Number of levels to display - 0 for all, 1 for flat.',
2430
2286
type=_parse_levels),
2431
2287
Option('message',
2432
2289
help='Show revisions whose message matches this '
2433
2290
'regular expression.',
2436
2292
Option('limit',
2437
2293
short_name='l',
2438
2294
help='Limit the output to the first N revisions.',
2441
2297
Option('show-diff',
2442
2298
short_name='p',
2443
2299
help='Show changes made in each revision as a patch.'),
2444
Option('include-merged',
2300
Option('include-merges',
2445
2301
help='Show merged revisions like --levels 0 does.'),
2446
Option('include-merges', hidden=True,
2447
help='Historical alias for --include-merged.'),
2448
Option('omit-merges',
2449
help='Do not report commits with more than one parent.'),
2450
2302
Option('exclude-common-ancestry',
2451
2303
help='Display only the revisions that are not part'
2452
2304
' of both ancestries (require -rX..Y)'
2454
Option('signatures',
2455
help='Show digital signature validity'),
2458
help='Show revisions whose properties match this '
2461
ListOption('match-message',
2462
help='Show revisions whose message matches this '
2465
ListOption('match-committer',
2466
help='Show revisions whose committer matches this '
2469
ListOption('match-author',
2470
help='Show revisions whose authors match this '
2473
ListOption('match-bugs',
2474
help='Show revisions whose bugs match this '
2478
2307
encoding_type = 'replace'
2507
2327
_get_info_for_log_files,
2509
2329
direction = (forward and 'forward') or 'reverse'
2510
if symbol_versioning.deprecated_passed(include_merges):
2511
ui.ui_factory.show_user_warning(
2512
'deprecated_command_option',
2513
deprecated_name='--include-merges',
2514
recommended_name='--include-merged',
2515
deprecated_in_version='2.5',
2516
command=self.invoked_as)
2517
if include_merged is None:
2518
include_merged = include_merges
2520
raise errors.BzrCommandError(gettext(
2521
'{0} and {1} are mutually exclusive').format(
2522
'--include-merges', '--include-merged'))
2523
if include_merged is None:
2524
include_merged = False
2525
2330
if (exclude_common_ancestry
2526
2331
and (revision is None or len(revision) != 2)):
2527
raise errors.BzrCommandError(gettext(
2528
'--exclude-common-ancestry requires -r with two revisions'))
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2530
2335
if levels is None:
2533
raise errors.BzrCommandError(gettext(
2534
'{0} and {1} are mutually exclusive').format(
2535
'--levels', '--include-merged'))
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2537
2341
if change is not None:
2538
2342
if len(change) > 1:
2539
2343
raise errors.RangeInChangeOption()
2540
2344
if revision is not None:
2541
raise errors.BzrCommandError(gettext(
2542
'{0} and {1} are mutually exclusive').format(
2543
'--revision', '--change'))
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2545
2348
revision = change
2550
2353
# find the file ids to log and check for directory filtering
2551
2354
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2552
revision, file_list, self.add_cleanup)
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2553
2357
for relpath, file_id, kind in file_info_list:
2554
2358
if file_id is None:
2555
raise errors.BzrCommandError(gettext(
2556
"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" %
2558
2362
# If the relpath is the top of the tree, we log everything
2559
2363
if relpath == '':
2574
2378
dir, relpath = bzrdir.BzrDir.open_containing(location)
2575
2379
b = dir.open_branch()
2576
self.add_cleanup(b.lock_read().unlock)
2381
self.add_cleanup(b.unlock)
2577
2382
rev1, rev2 = _get_revision_range(revision, b, self.name())
2579
if b.get_config().validate_signatures_in_log():
2583
if not gpg.GPGStrategy.verify_signatures_available():
2584
raise errors.GpgmeNotInstalled(None)
2586
2384
# Decide on the type of delta & diff filtering to use
2587
2385
# TODO: add an --all-files option to make this configurable & consistent
2588
2386
if not verbose:
2645
2430
start_revision=rev1, end_revision=rev2, limit=limit,
2646
2431
message_search=message, delta_type=delta_type,
2647
2432
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2648
exclude_common_ancestry=exclude_common_ancestry, match=match_dict,
2649
signature=signatures, omit_merges=omit_merges,
2433
exclude_common_ancestry=exclude_common_ancestry,
2651
2435
Logger(b, rqst).show(lf)
2669
2453
# b is taken from revision[0].get_branch(), and
2670
2454
# show_log will use its revision_history. Having
2671
2455
# different branches will lead to weird behaviors.
2672
raise errors.BzrCommandError(gettext(
2456
raise errors.BzrCommandError(
2673
2457
"bzr %s doesn't accept two revisions in different"
2674
" branches.") % command_name)
2458
" branches." % command_name)
2675
2459
if start_spec.spec is None:
2676
2460
# Avoid loading all the history.
2677
2461
rev1 = RevisionInfo(branch, None, None)
2743
2528
help='Recurse into subdirectories.'),
2744
2529
Option('from-root',
2745
2530
help='Print paths relative to the root of the branch.'),
2746
Option('unknown', short_name='u',
2747
help='Print unknown files.'),
2531
Option('unknown', help='Print unknown files.'),
2748
2532
Option('versioned', help='Print versioned files.',
2749
2533
short_name='V'),
2750
Option('ignored', short_name='i',
2751
help='Print ignored files.'),
2752
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.'),
2753
2539
help='List entries of a particular kind: file, directory, symlink.',
2759
2543
@display_command
2760
2544
def run(self, revision=None, verbose=False,
2761
2545
recursive=False, from_root=False,
2762
2546
unknown=False, versioned=False, ignored=False,
2763
null=False, kind=None, show_ids=False, path=None, directory=None):
2547
null=False, kind=None, show_ids=False, path=None):
2765
2549
if kind and kind not in ('file', 'directory', 'symlink'):
2766
raise errors.BzrCommandError(gettext('invalid kind specified'))
2550
raise errors.BzrCommandError('invalid kind specified')
2768
2552
if verbose and null:
2769
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2770
2554
all = not (unknown or versioned or ignored)
2772
2556
selection = {'I':ignored, '?':unknown, 'V':versioned}
2799
2583
apply_view = True
2800
2584
view_str = views.view_display_str(view_files)
2801
note(gettext("Ignoring files outside view. View is %s") % view_str)
2585
note("Ignoring files outside view. View is %s" % view_str)
2803
self.add_cleanup(tree.lock_read().unlock)
2588
self.add_cleanup(tree.unlock)
2804
2589
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2805
2590
from_dir=relpath, recursive=recursive):
2806
2591
# Apply additional masking
2938
2713
_see_also = ['status', 'ignored', 'patterns']
2939
2714
takes_args = ['name_pattern*']
2940
takes_options = ['directory',
2941
2716
Option('default-rules',
2942
2717
help='Display the default ignore rules that bzr uses.')
2945
def run(self, name_pattern_list=None, default_rules=None,
2720
def run(self, name_pattern_list=None, default_rules=None):
2947
2721
from bzrlib import ignores
2948
2722
if default_rules is not None:
2949
2723
# dump the default rules and exit
2951
2725
self.outf.write("%s\n" % pattern)
2953
2727
if not name_pattern_list:
2954
raise errors.BzrCommandError(gettext("ignore requires at least one "
2955
"NAME_PATTERN or --default-rules."))
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2956
2730
name_pattern_list = [globbing.normalize_pattern(p)
2957
2731
for p in name_pattern_list]
2959
bad_patterns_count = 0
2960
for p in name_pattern_list:
2961
if not globbing.Globster.is_pattern_valid(p):
2962
bad_patterns_count += 1
2963
bad_patterns += ('\n %s' % p)
2965
msg = (ngettext('Invalid ignore pattern found. %s',
2966
'Invalid ignore patterns found. %s',
2967
bad_patterns_count) % bad_patterns)
2968
ui.ui_factory.show_error(msg)
2969
raise errors.InvalidPattern('')
2970
2732
for name_pattern in name_pattern_list:
2971
2733
if (name_pattern[0] == '/' or
2972
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2973
raise errors.BzrCommandError(gettext(
2974
"NAME_PATTERN should not be an absolute path"))
2975
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'.')
2976
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2977
2739
ignored = globbing.Globster(name_pattern_list)
2979
self.add_cleanup(tree.lock_read().unlock)
2980
2742
for entry in tree.list_files():
2982
2744
if id is not None:
2983
2745
filename = entry[0]
2984
2746
if ignored.match(filename):
2985
2747
matches.append(filename)
2986
2749
if len(matches) > 0:
2987
self.outf.write(gettext("Warning: the following files are version "
2988
"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"
2989
2752
"\nThese files will continue to be version controlled"
2990
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2993
2756
class cmd_ignored(Command):
3004
2767
encoding_type = 'replace'
3005
2768
_see_also = ['ignore', 'ls']
3006
takes_options = ['directory']
3008
2770
@display_command
3009
def run(self, directory=u'.'):
3010
tree = WorkingTree.open_containing(directory)[0]
3011
self.add_cleanup(tree.lock_read().unlock)
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
3012
2775
for path, file_class, kind, file_id, entry in tree.list_files():
3013
2776
if file_class != 'I':
3083
2844
'revision in which it was changed.'),
3085
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
3086
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2847
root=None, filters=False, per_file_timestamps=False):
3087
2848
from bzrlib.export import export
3089
2850
if branch_or_subdir is None:
3090
tree = WorkingTree.open_containing(directory)[0]
2851
tree = WorkingTree.open_containing(u'.')[0]
3091
2852
b = tree.branch
3124
2885
@display_command
3125
2886
def run(self, filename, revision=None, name_from_revision=False,
3126
filters=False, directory=None):
3127
2888
if revision is not None and len(revision) != 1:
3128
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3129
" one revision specifier"))
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3130
2891
tree, branch, relpath = \
3131
_open_directory_or_containing_tree_or_branch(filename, directory)
3132
self.add_cleanup(branch.lock_read().unlock)
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3133
2895
return self._run(tree, branch, relpath, filename, revision,
3134
2896
name_from_revision, filters)
3138
2900
if tree is None:
3139
2901
tree = b.basis_tree()
3140
2902
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
3141
self.add_cleanup(rev_tree.lock_read().unlock)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3143
2906
old_file_id = rev_tree.path2id(relpath)
3145
# TODO: Split out this code to something that generically finds the
3146
# best id for a path across one or more trees; it's like
3147
# find_ids_across_trees but restricted to find just one. -- mbp
3149
2908
if name_from_revision:
3150
2909
# Try in revision if requested
3151
2910
if old_file_id is None:
3152
raise errors.BzrCommandError(gettext(
3153
"{0!r} is not present in revision {1}").format(
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3154
2913
filename, rev_tree.get_revision_id()))
3156
actual_file_id = old_file_id
2915
content = rev_tree.get_file_text(old_file_id)
3158
2917
cur_file_id = tree.path2id(relpath)
3159
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3160
actual_file_id = cur_file_id
3161
elif old_file_id is not None:
3162
actual_file_id = old_file_id
3164
raise errors.BzrCommandError(gettext(
3165
"{0!r} is not present in revision {1}").format(
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" % (
3166
2935
filename, rev_tree.get_revision_id()))
3168
from bzrlib.filter_tree import ContentFilterTree
3169
filter_tree = ContentFilterTree(rev_tree,
3170
rev_tree._content_filter_stack)
3171
content = filter_tree.get_file_text(actual_file_id)
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)
3173
content = rev_tree.get_file_text(actual_file_id)
3175
self.outf.write(content)
2949
self.outf.write(content)
3178
2952
class cmd_local_time_offset(Command):
3239
3013
to trigger updates to external systems like bug trackers. The --fixes
3240
3014
option can be used to record the association between a revision and
3241
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
3244
3043
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3245
3044
takes_args = ['selected*']
3277
3076
Option('show-diff', short_name='p',
3278
3077
help='When no message is supplied, show the diff along'
3279
3078
' with the status summary in the message editor.'),
3281
help='When committing to a foreign version control '
3282
'system do not push data that can not be natively '
3285
3080
aliases = ['ci', 'checkin']
3287
3082
def _iter_bug_fix_urls(self, fixes, branch):
3288
default_bugtracker = None
3289
3083
# Configure the properties for bug fixing attributes.
3290
3084
for fixed_bug in fixes:
3291
3085
tokens = fixed_bug.split(':')
3292
if len(tokens) == 1:
3293
if default_bugtracker is None:
3294
branch_config = branch.get_config()
3295
default_bugtracker = branch_config.get_user_option(
3297
if default_bugtracker is None:
3298
raise errors.BzrCommandError(gettext(
3299
"No tracker specified for bug %s. Use the form "
3300
"'tracker:id' or specify a default bug tracker "
3301
"using the `bugtracker` option.\nSee "
3302
"\"bzr help bugs\" for more information on this "
3303
"feature. Commit refused.") % fixed_bug)
3304
tag = default_bugtracker
3306
elif len(tokens) != 2:
3307
raise errors.BzrCommandError(gettext(
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3308
3088
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3309
3089
"See \"bzr help bugs\" for more information on this "
3310
"feature.\nCommit refused.") % fixed_bug)
3312
tag, bug_id = tokens
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3314
3093
yield bugtracker.get_bug_url(tag, branch, bug_id)
3315
3094
except errors.UnknownBugTrackerAbbreviation:
3316
raise errors.BzrCommandError(gettext(
3317
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3318
3097
except errors.MalformedBugIdentifier, e:
3319
raise errors.BzrCommandError(gettext(
3320
"%s\nCommit refused.") % (str(e),))
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3322
3101
def run(self, message=None, file=None, verbose=False, selected_list=None,
3323
3102
unchanged=False, strict=False, local=False, fixes=None,
3324
author=None, show_diff=False, exclude=None, commit_time=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3326
3104
from bzrlib.errors import (
3327
3105
PointlessCommit,
3328
3106
ConflictsInTree,
3341
3118
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3342
3119
except ValueError, e:
3343
raise errors.BzrCommandError(gettext(
3344
"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.
3346
3129
properties = {}
3348
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3131
tree, selected_list = tree_files(selected_list)
3349
3132
if selected_list == ['']:
3350
3133
# workaround - commit of root of tree should be exactly the same
3351
3134
# as just default commit in that tree, and succeed even though
3380
3163
message = message.replace('\r\n', '\n')
3381
3164
message = message.replace('\r', '\n')
3383
raise errors.BzrCommandError(gettext(
3384
"please specify either --message or --file"))
3166
raise errors.BzrCommandError(
3167
"please specify either --message or --file")
3386
3169
def get_message(commit_obj):
3387
3170
"""Callback to get commit message"""
3391
my_message = f.read().decode(osutils.get_user_encoding())
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3394
3174
elif message is not None:
3395
3175
my_message = message
3404
3184
# make_commit_message_template_encoded returns user encoding.
3405
3185
# We probably want to be using edit_commit_message instead to
3407
my_message = set_commit_message(commit_obj)
3408
if my_message is None:
3409
start_message = generate_commit_message_template(commit_obj)
3410
my_message = edit_commit_message_encoded(text,
3411
start_message=start_message)
3412
if my_message is None:
3413
raise errors.BzrCommandError(gettext("please specify a commit"
3414
" message with either --message or --file"))
3415
if my_message == "":
3416
raise errors.BzrCommandError(gettext("Empty commit message specified."
3417
" Please specify a commit message with either"
3418
" --message or --file or leave a blank message"
3419
" with --message \"\"."))
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")
3420
3195
return my_message
3422
3197
# The API permits a commit with a filter of [] to mean 'select nothing'
3430
3205
reporter=None, verbose=verbose, revprops=properties,
3431
3206
authors=author, timestamp=commit_stamp,
3432
3207
timezone=offset,
3433
exclude=tree.safe_relpath_files(exclude),
3208
exclude=safe_relpath_files(tree, exclude))
3435
3209
except PointlessCommit:
3436
raise errors.BzrCommandError(gettext("No changes to commit."
3437
" Please 'bzr add' the files you want to commit, or use"
3438
" --unchanged to force an empty commit."))
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3439
3212
except ConflictsInTree:
3440
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3213
raise errors.BzrCommandError('Conflicts detected in working '
3441
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3443
3216
except StrictCommitFailed:
3444
raise errors.BzrCommandError(gettext("Commit refused because there are"
3445
" unknown files in the working tree."))
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3446
3219
except errors.BoundBranchOutOfDate, e:
3447
e.extra_help = (gettext("\n"
3220
e.extra_help = ("\n"
3448
3221
'To commit to master branch, run update and then commit.\n'
3449
3222
'You can also pass --local to commit to continue working '
3524
3297
class cmd_upgrade(Command):
3525
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3527
When the default format has changed after a major new release of
3528
Bazaar, you may be informed during certain operations that you
3529
should upgrade. Upgrading to a newer format may improve performance
3530
or make new features available. It may however limit interoperability
3531
with older repositories or with older versions of Bazaar.
3533
If you wish to upgrade to a particular format rather than the
3534
current default, that can be specified using the --format option.
3535
As a consequence, you can use the upgrade command this way to
3536
"downgrade" to an earlier format, though some conversions are
3537
a one way process (e.g. changing from the 1.x default to the
3538
2.x default) so downgrading is not always possible.
3540
A backup.bzr.~#~ directory is created at the start of the conversion
3541
process (where # is a number). By default, this is left there on
3542
completion. If the conversion fails, delete the new .bzr directory
3543
and rename this one back in its place. Use the --clean option to ask
3544
for the backup.bzr directory to be removed on successful conversion.
3545
Alternatively, you can delete it by hand if everything looks good
3548
If the location given is a shared repository, dependent branches
3549
are also converted provided the repository converts successfully.
3550
If the conversion of a branch fails, remaining branches are still
3553
For more information on upgrades, see the Bazaar Upgrade Guide,
3554
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
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.
3557
_see_also = ['check', 'reconcile', 'formats']
3305
_see_also = ['check']
3558
3306
takes_args = ['url?']
3559
3307
takes_options = [
3560
RegistryOption('format',
3561
help='Upgrade to a specific format. See "bzr help'
3562
' formats" for details.',
3563
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3564
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3565
value_switches=True, title='Branch format'),
3567
help='Remove the backup.bzr directory if successful.'),
3569
help="Show what would be done, but don't actually do anything."),
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'),
3572
def run(self, url='.', format=None, clean=False, dry_run=False):
3316
def run(self, url='.', format=None):
3573
3317
from bzrlib.upgrade import upgrade
3574
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3576
if len(exceptions) == 1:
3577
# Compatibility with historical behavior
3318
upgrade(url, format)
3583
3321
class cmd_whoami(Command):
3603
3340
encoding_type = 'replace'
3605
3342
@display_command
3606
def run(self, email=False, branch=False, name=None, directory=None):
3343
def run(self, email=False, branch=False, name=None):
3607
3344
if name is None:
3608
if directory is None:
3609
# use branch if we're inside one; otherwise global config
3611
c = Branch.open_containing(u'.')[0].get_config()
3612
except errors.NotBranchError:
3613
c = _mod_config.GlobalConfig()
3615
c = Branch.open(directory).get_config()
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()
3617
3351
self.outf.write(c.user_email() + '\n')
3619
3353
self.outf.write(c.username() + '\n')
3623
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3626
3356
# display a warning if an email address isn't included in the given name.
3628
_mod_config.extract_email_address(name)
3358
config.extract_email_address(name)
3629
3359
except errors.NoEmailInUsername, e:
3630
3360
warning('"%s" does not seem to contain an email address. '
3631
3361
'This is allowed, but not recommended.', name)
3633
3363
# use global config unless --branch given
3635
if directory is None:
3636
c = Branch.open_containing(u'.')[0].get_config()
3638
c = Branch.open(directory).get_config()
3365
c = Branch.open_containing('.')[0].get_config()
3640
c = _mod_config.GlobalConfig()
3367
c = config.GlobalConfig()
3641
3368
c.set_user_option('email', name)
3707
3433
def remove_alias(self, alias_name):
3708
3434
if alias_name is None:
3709
raise errors.BzrCommandError(gettext(
3710
'bzr alias --remove expects an alias to remove.'))
3435
raise errors.BzrCommandError(
3436
'bzr alias --remove expects an alias to remove.')
3711
3437
# If alias is not found, print something like:
3712
3438
# unalias: foo: not found
3713
c = _mod_config.GlobalConfig()
3439
c = config.GlobalConfig()
3714
3440
c.unset_alias(alias_name)
3716
3442
@display_command
3717
3443
def print_aliases(self):
3718
3444
"""Print out the defined aliases in a similar format to bash."""
3719
aliases = _mod_config.GlobalConfig().get_aliases()
3445
aliases = config.GlobalConfig().get_aliases()
3720
3446
for key, value in sorted(aliases.iteritems()):
3721
3447
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3792
3515
if typestring == "sftp":
3793
3516
from bzrlib.tests import stub_sftp
3794
3517
return stub_sftp.SFTPAbsoluteServer
3795
elif typestring == "memory":
3518
if typestring == "memory":
3796
3519
from bzrlib.tests import test_server
3797
3520
return memory.MemoryServer
3798
elif typestring == "fakenfs":
3521
if typestring == "fakenfs":
3799
3522
from bzrlib.tests import test_server
3800
3523
return test_server.FakeNFSServer
3801
3524
msg = "No known transport type %s. Supported types are: sftp\n" %\
3814
3537
'throughout the test suite.',
3815
3538
type=get_transport_type),
3816
3539
Option('benchmark',
3817
help='Run the benchmarks rather than selftests.',
3540
help='Run the benchmarks rather than selftests.'),
3819
3541
Option('lsprof-timed',
3820
3542
help='Generate lsprof output for benchmarked'
3821
3543
' sections of code.'),
3822
3544
Option('lsprof-tests',
3823
3545
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3824
3549
Option('first',
3825
3550
help='Run all tests, but run specified tests first.',
3826
3551
short_name='f',
3835
3560
Option('randomize', type=str, argname="SEED",
3836
3561
help='Randomize the order of tests using the given'
3837
3562
' seed or "now" for the current time.'),
3838
ListOption('exclude', type=str, argname="PATTERN",
3840
help='Exclude tests that match this regular'
3563
Option('exclude', type=str, argname="PATTERN",
3565
help='Exclude tests that match this regular'
3842
3567
Option('subunit',
3843
3568
help='Output test progress via subunit.'),
3844
3569
Option('strict', help='Fail on missing dependencies or '
3864
3586
def run(self, testspecs_list=None, verbose=False, one=False,
3865
3587
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3867
3589
first=False, list_only=False,
3868
3590
randomize=None, exclude=None, strict=False,
3869
3591
load_list=None, debugflag=None, starting_with=None, subunit=False,
3870
parallel=None, lsprof_tests=False,
3872
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)
3874
3602
if testspecs_list is not None:
3875
3603
pattern = '|'.join(testspecs_list)
3880
3608
from bzrlib.tests import SubUnitBzrRunner
3881
3609
except ImportError:
3882
raise errors.BzrCommandError(gettext("subunit not available. subunit "
3883
"needs to be installed to use --subunit."))
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3884
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3885
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3886
3614
# stdout, which would corrupt the subunit stream.
3887
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3888
# following code can be deleted when it's sufficiently deployed
3889
# -- vila/mgz 20100514
3890
if (sys.platform == "win32"
3891
and getattr(sys.stdout, 'fileno', None) is not None):
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3893
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3895
3619
self.additional_selftest_args.setdefault(
3896
3620
'suite_decorators', []).append(parallel)
3898
raise errors.BzrCommandError(gettext(
3899
"--benchmark is no longer supported from bzr 2.2; "
3900
"use bzr-usertest instead"))
3901
test_suite_factory = None
3903
exclude_pattern = None
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)
3905
exclude_pattern = '(' + '|'.join(exclude) + ')'
3907
self._disable_fsync()
3629
test_suite_factory = None
3908
3631
selftest_kwargs = {"verbose": verbose,
3909
3632
"pattern": pattern,
3910
3633
"stop_on_failure": one,
3912
3635
"test_suite_factory": test_suite_factory,
3913
3636
"lsprof_timed": lsprof_timed,
3914
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3915
3639
"matching_tests_first": first,
3916
3640
"list_only": list_only,
3917
3641
"random_seed": randomize,
3918
"exclude_pattern": exclude_pattern,
3642
"exclude_pattern": exclude,
3919
3643
"strict": strict,
3920
3644
"load_list": load_list,
3921
3645
"debug_flags": debugflag,
3922
3646
"starting_with": starting_with
3924
3648
selftest_kwargs.update(self.additional_selftest_args)
3926
# Make deprecation warnings visible, unless -Werror is set
3927
cleanup = symbol_versioning.activate_deprecation_warnings(
3930
result = tests.selftest(**selftest_kwargs)
3649
result = selftest(**selftest_kwargs)
3933
3650
return int(not result)
3935
def _disable_fsync(self):
3936
"""Change the 'os' functionality to not synchronize."""
3937
self._orig_fsync = getattr(os, 'fsync', None)
3938
if self._orig_fsync is not None:
3939
os.fsync = lambda filedes: None
3940
self._orig_fdatasync = getattr(os, 'fdatasync', None)
3941
if self._orig_fdatasync is not None:
3942
os.fdatasync = lambda filedes: None
3945
3653
class cmd_version(Command):
3946
3654
__doc__ = """Show version of bzr."""
3983
3691
branch1 = Branch.open_containing(branch)[0]
3984
3692
branch2 = Branch.open_containing(other)[0]
3985
self.add_cleanup(branch1.lock_read().unlock)
3986
self.add_cleanup(branch2.lock_read().unlock)
3694
self.add_cleanup(branch1.unlock)
3696
self.add_cleanup(branch2.unlock)
3987
3697
last1 = ensure_null(branch1.last_revision())
3988
3698
last2 = ensure_null(branch2.last_revision())
3990
3700
graph = branch1.repository.get_graph(branch2.repository)
3991
3701
base_rev_id = graph.find_unique_lca(last1, last2)
3993
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)
3996
3706
class cmd_merge(Command):
3999
3709
The source of the merge can be specified either in the form of a branch,
4000
3710
or in the form of a path to a file containing a merge directive generated
4001
3711
with bzr send. If neither is specified, the default is the upstream branch
4002
or the branch most recently merged using --remember. The source of the
4003
merge may also be specified in the form of a path to a file in another
4004
branch: in this case, only the modifications to that file are merged into
4005
the current working tree.
4007
When merging from a branch, by default bzr will try to merge in all new
4008
work from the other branch, automatically determining an appropriate base
4009
revision. If this fails, you may need to give an explicit base.
4011
To pick a different ending revision, pass "--revision OTHER". bzr will
4012
try to merge in all new work up to and including revision OTHER.
4014
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4015
through OTHER, excluding BASE but including OTHER, will be merged. If this
4016
causes some revisions to be skipped, i.e. if the destination branch does
4017
not already contain revision BASE, such a merge is commonly referred to as
4018
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4019
cherrypicks. The changes look like a normal commit, and the history of the
4020
changes from the other branch is not stored in the commit.
4022
Revision numbers are always relative to the source branch.
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.
4024
3725
Merge will do its best to combine the changes in two branches, but there
4025
3726
are some kinds of problems only a human can fix. When it encounters those,
4029
3730
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
4031
If there is no default branch set, the first merge will set it (use
4032
--no-remember to avoid setting it). After that, you can omit the branch
4033
to use the default. To change the default, use --remember. The value will
4034
only be saved if the remote location can be accessed.
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.
4036
3737
The results of the merge are placed into the destination working
4037
3738
directory, where they can be reviewed (with bzr diff), tested, and then
4038
3739
committed to record the result of the merge.
4040
3741
merge refuses to run if there are any uncommitted changes, unless
4041
--force is given. If --force is given, then the changes from the source
4042
will be merged with the current working tree, including any uncommitted
4043
changes in the tree. The --force option can also be used to create a
3742
--force is given. The --force option can also be used to create a
4044
3743
merge revision which has more than two parents.
4046
3745
If one would like to merge changes from the working tree of the other
4094
3793
' completely merged into the source, pull from the'
4095
3794
' source rather than merging. When this happens,'
4096
3795
' you do not need to commit the result.'),
4097
custom_help('directory',
4098
3797
help='Branch to merge into, '
4099
'rather than the one containing the working directory.'),
3798
'rather than the one containing the working directory.',
4100
3802
Option('preview', help='Instead of merging, show a diff of the'
4102
3804
Option('interactive', help='Select changes interactively.',
4106
3808
def run(self, location=None, revision=None, force=False,
4107
merge_type=None, show_base=False, reprocess=None, remember=None,
3809
merge_type=None, show_base=False, reprocess=None, remember=False,
4108
3810
uncommitted=False, pull=False,
4109
3811
directory=None,
4148
3847
mergeable = None
4150
3849
if uncommitted:
4151
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4152
' with bundles or merge directives.'))
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
4154
3853
if revision is not None:
4155
raise errors.BzrCommandError(gettext(
4156
'Cannot use -r with merge directives or bundles'))
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
4157
3856
merger, verified = _mod_merge.Merger.from_mergeable(tree,
4158
3857
mergeable, None)
4160
3859
if merger is None and uncommitted:
4161
3860
if revision is not None and len(revision) > 0:
4162
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4163
' --revision at the same time.'))
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
4164
3863
merger = self.get_merger_from_uncommitted(tree, location, None)
4165
3864
allow_pending = False
4174
3873
self.sanity_check_merger(merger)
4175
3874
if (merger.base_rev_id == merger.other_rev_id and
4176
3875
merger.other_rev_id is not None):
4177
# check if location is a nonexistent file (and not a branch) to
4178
# disambiguate the 'Nothing to do'
4179
if merger.interesting_files:
4180
if not merger.other_tree.has_filename(
4181
merger.interesting_files[0]):
4182
note(gettext("merger: ") + str(merger))
4183
raise errors.PathsDoNotExist([location])
4184
note(gettext('Nothing to do.'))
3876
note('Nothing to do.')
4186
if pull and not preview:
4187
3879
if merger.interesting_files is not None:
4188
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3880
raise errors.BzrCommandError('Cannot pull individual files')
4189
3881
if (merger.base_rev_id == tree.last_revision()):
4190
3882
result = tree.pull(merger.other_branch, False,
4191
3883
merger.other_rev_id)
4192
3884
result.report(self.outf)
4194
3886
if merger.this_basis is None:
4195
raise errors.BzrCommandError(gettext(
3887
raise errors.BzrCommandError(
4196
3888
"This branch has no commits."
4197
" (perhaps you would prefer 'bzr pull')"))
3889
" (perhaps you would prefer 'bzr pull')")
4199
3891
return self._do_preview(merger)
4200
3892
elif interactive:
4213
3905
def _do_preview(self, merger):
4214
3906
from bzrlib.diff import show_diff_trees
4215
3907
result_tree = self._get_preview(merger)
4216
path_encoding = osutils.get_diff_header_encoding()
4217
3908
show_diff_trees(merger.this_tree, result_tree, self.outf,
4218
old_label='', new_label='',
4219
path_encoding=path_encoding)
3909
old_label='', new_label='')
4221
3911
def _do_merge(self, merger, change_reporter, allow_pending, verified):
4222
3912
merger.change_reporter = change_reporter
4260
3950
# Use reprocess if the merger supports it
4261
3951
merger.reprocess = merger.merge_type.supports_reprocess
4262
3952
if merger.reprocess and not merger.merge_type.supports_reprocess:
4263
raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4264
" for merge type %s.") %
3953
raise errors.BzrCommandError("Conflict reduction is not supported"
3954
" for merge type %s." %
4265
3955
merger.merge_type)
4266
3956
if merger.reprocess and merger.show_base:
4267
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
3957
raise errors.BzrCommandError("Cannot do conflict reduction and"
4270
3960
def _get_merger_from_branch(self, tree, location, revision, remember,
4271
3961
possible_transports, pb):
4298
3988
if other_revision_id is None:
4299
3989
other_revision_id = _mod_revision.ensure_null(
4300
3990
other_branch.last_revision())
4301
# Remember where we merge from. We need to remember if:
4302
# - user specify a location (and we don't merge from the parent
4304
# - user ask to remember or there is no previous location set to merge
4305
# from and user didn't ask to *not* remember
4306
if (user_location is not None
4308
or (remember is None
4309
and tree.branch.get_submit_branch() is None)))):
3991
# Remember where we merge from
3992
if ((remember or tree.branch.get_submit_branch() is None) and
3993
user_location is not None):
4310
3994
tree.branch.set_submit_branch(other_branch.base)
4311
# Merge tags (but don't set them in the master branch yet, the user
4312
# might revert this merge). Commit will propagate them.
4313
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4314
3996
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4315
3997
other_revision_id, base_revision_id, other_branch, base_branch)
4316
3998
if other_path != '':
4375
4057
stored_location_type = "parent"
4376
4058
mutter("%s", stored_location)
4377
4059
if stored_location is None:
4378
raise errors.BzrCommandError(gettext("No location specified or remembered"))
4060
raise errors.BzrCommandError("No location specified or remembered")
4379
4061
display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
4380
note(gettext("{0} remembered {1} location {2}").format(verb_string,
4381
stored_location_type, display_url))
4062
note(u"%s remembered %s location %s", verb_string,
4063
stored_location_type, display_url)
4382
4064
return stored_location
4417
4099
from bzrlib.conflicts import restore
4418
4100
if merge_type is None:
4419
4101
merge_type = _mod_merge.Merge3Merger
4420
tree, file_list = WorkingTree.open_containing_paths(file_list)
4421
self.add_cleanup(tree.lock_write().unlock)
4102
tree, file_list = tree_files(file_list)
4104
self.add_cleanup(tree.unlock)
4422
4105
parents = tree.get_parent_ids()
4423
4106
if len(parents) != 2:
4424
raise errors.BzrCommandError(gettext("Sorry, remerge only works after normal"
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4425
4108
" merges. Not cherrypicking or"
4427
4110
repository = tree.branch.repository
4428
4111
interesting_ids = None
4429
4112
new_conflicts = []
4484
4167
last committed revision is used.
4486
4169
To remove only some changes, without reverting to a prior version, use
4487
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4488
will remove the changes introduced by the second last commit (-2), without
4489
affecting the changes introduced by the last commit (-1). To remove
4490
certain changes on a hunk-by-hunk basis, see the shelve command.
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.
4492
4174
By default, any files that have been manually changed will be backed up
4493
4175
first. (Files changed only by merge are not backed up.) Backup files have
4660
4340
theirs_only=False,
4661
4341
log_format=None, long=False, short=False, line=False,
4662
4342
show_ids=False, verbose=False, this=False, other=False,
4663
include_merged=None, revision=None, my_revision=None,
4665
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4343
include_merges=False, revision=None, my_revision=None):
4666
4344
from bzrlib.missing import find_unmerged, iter_log_revisions
4667
4345
def message(s):
4668
4346
if not is_quiet():
4669
4347
self.outf.write(s)
4671
if symbol_versioning.deprecated_passed(include_merges):
4672
ui.ui_factory.show_user_warning(
4673
'deprecated_command_option',
4674
deprecated_name='--include-merges',
4675
recommended_name='--include-merged',
4676
deprecated_in_version='2.5',
4677
command=self.invoked_as)
4678
if include_merged is None:
4679
include_merged = include_merges
4681
raise errors.BzrCommandError(gettext(
4682
'{0} and {1} are mutually exclusive').format(
4683
'--include-merges', '--include-merged'))
4684
if include_merged is None:
4685
include_merged = False
4687
4350
mine_only = this
4696
4359
elif theirs_only:
4697
4360
restrict = 'remote'
4699
local_branch = Branch.open_containing(directory)[0]
4700
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)
4702
4366
parent = local_branch.get_parent()
4703
4367
if other_branch is None:
4704
4368
other_branch = parent
4705
4369
if other_branch is None:
4706
raise errors.BzrCommandError(gettext("No peer location known"
4370
raise errors.BzrCommandError("No peer location known"
4708
4372
display_url = urlutils.unescape_for_display(parent,
4709
4373
self.outf.encoding)
4710
message(gettext("Using saved parent location: {0}\n").format(
4374
message("Using saved parent location: "
4375
+ display_url + "\n")
4713
4377
remote_branch = Branch.open(other_branch)
4714
4378
if remote_branch.base == local_branch.base:
4715
4379
remote_branch = local_branch
4717
self.add_cleanup(remote_branch.lock_read().unlock)
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4719
4384
local_revid_range = _revision_range_to_revid_range(
4720
4385
_get_revision_range(my_revision, local_branch,
4769
4430
if mine_only and not local_extra:
4770
4431
# We checked local, and found nothing extra
4771
message(gettext('This branch has no new revisions.\n'))
4432
message('This branch is up to date.\n')
4772
4433
elif theirs_only and not remote_extra:
4773
4434
# We checked remote, and found nothing extra
4774
message(gettext('Other branch has no new revisions.\n'))
4435
message('Other branch is up to date.\n')
4775
4436
elif not (mine_only or theirs_only or local_extra or
4777
4438
# We checked both branches, and neither one had extra
4779
message(gettext("Branches are up to date.\n"))
4440
message("Branches are up to date.\n")
4780
4441
self.cleanup_now()
4781
4442
if not status_code and parent is None and other_branch is not None:
4782
self.add_cleanup(local_branch.lock_write().unlock)
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4783
4445
# handle race conditions - a parent might be set while we run.
4784
4446
if local_branch.get_parent() is None:
4785
4447
local_branch.set_parent(remote_branch.base)
4845
4507
@display_command
4846
4508
def run(self, verbose=False):
4847
from bzrlib import plugin
4848
# Don't give writelines a generator as some codecs don't like that
4849
self.outf.writelines(
4850
list(plugin.describe_plugins(show_paths=verbose)))
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")
4853
4531
class cmd_testament(Command):
4899
4578
Option('long', help='Show commit date in annotations.'),
4904
4582
encoding_type = 'exact'
4906
4584
@display_command
4907
4585
def run(self, filename, all=False, long=False, revision=None,
4908
show_ids=False, directory=None):
4909
from bzrlib.annotate import (
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4912
4588
wt, branch, relpath = \
4913
_open_directory_or_containing_tree_or_branch(filename, directory)
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4914
4590
if wt is not None:
4915
self.add_cleanup(wt.lock_read().unlock)
4592
self.add_cleanup(wt.unlock)
4917
self.add_cleanup(branch.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4918
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4919
self.add_cleanup(tree.lock_read().unlock)
4920
if wt is not None and revision is None:
4598
self.add_cleanup(tree.unlock)
4921
4600
file_id = wt.path2id(relpath)
4923
4602
file_id = tree.path2id(relpath)
4924
4603
if file_id is None:
4925
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4926
4606
if wt is not None and revision is None:
4927
4607
# If there is a tree and we're not annotating historical
4928
4608
# versions, annotate the working tree's content.
4929
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
4930
4610
show_ids=show_ids)
4932
annotate_file_tree(tree, file_id, self.outf, long, all,
4933
show_ids=show_ids, branch=branch)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4936
4616
class cmd_re_sign(Command):
4940
4620
hidden = True # is this right ?
4941
4621
takes_args = ['revision_id*']
4942
takes_options = ['directory', 'revision']
4622
takes_options = ['revision']
4944
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4624
def run(self, revision_id_list=None, revision=None):
4945
4625
if revision_id_list is not None and revision is not None:
4946
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4947
4627
if revision_id_list is None and revision is None:
4948
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
4949
b = WorkingTree.open_containing(directory)[0].branch
4950
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)
4951
4632
return self._run(b, revision_id_list, revision)
4953
4634
def _run(self, b, revision_id_list, revision):
5013
4694
_see_also = ['checkouts', 'unbind']
5014
4695
takes_args = ['location?']
5015
takes_options = ['directory']
5017
def run(self, location=None, directory=u'.'):
5018
b, relpath = Branch.open_containing(directory)
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5019
4700
if location is None:
5021
4702
location = b.get_old_bound_location()
5022
4703
except errors.UpgradeRequired:
5023
raise errors.BzrCommandError(gettext('No location supplied. '
5024
'This format does not remember old locations.'))
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5026
4707
if location is None:
5027
4708
if b.get_bound_location() is not None:
5028
raise errors.BzrCommandError(gettext('Branch is already bound'))
4709
raise errors.BzrCommandError('Branch is already bound')
5030
raise errors.BzrCommandError(gettext('No location supplied '
5031
'and no previous location known'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5032
4713
b_other = Branch.open(location)
5034
4715
b.bind(b_other)
5035
4716
except errors.DivergedBranches:
5036
raise errors.BzrCommandError(gettext('These branches have diverged.'
5037
' Try merging, and then bind again.'))
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5038
4719
if b.get_config().has_explicit_nickname():
5039
4720
b.nick = b_other.nick
5092
4771
encoding_type = 'replace'
5094
def run(self, location=None, dry_run=False, verbose=False,
5095
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):
5096
4776
if location is None:
5097
4777
location = u'.'
5098
4778
control, relpath = bzrdir.BzrDir.open_containing(location)
5104
4784
b = control.open_branch()
5106
4786
if tree is not None:
5107
self.add_cleanup(tree.lock_write().unlock)
4788
self.add_cleanup(tree.unlock)
5109
self.add_cleanup(b.lock_write().unlock)
5110
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)
5113
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5115
4795
from bzrlib.log import log_formatter, show_log
5116
4796
from bzrlib.uncommit import uncommit
5147
4827
end_revision=last_revno)
5150
self.outf.write(gettext('Dry-run, pretending to remove'
5151
' the above revisions.\n'))
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5153
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5156
if not ui.ui_factory.confirm_action(
5157
gettext(u'Uncommit these revisions'),
5158
'bzrlib.builtins.uncommit',
5160
self.outf.write(gettext('Canceled\n'))
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5163
4840
mutter('Uncommitting from {%s} to {%s}',
5164
4841
last_rev_id, rev_id)
5165
4842
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5166
revno=revno, local=local, keep_tags=keep_tags)
5167
self.outf.write(gettext('You can restore the old tip by running:\n'
5168
' bzr pull . -r revid:%s\n') % last_rev_id)
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)
5171
4848
class cmd_break_lock(Command):
5172
__doc__ = """Break a dead lock.
5174
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.
5177
4851
CAUTION: Locks should only be broken when you are sure that the process
5178
4852
holding the lock has been stopped.
5185
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
5186
bzr break-lock --conf ~/.bazaar
5189
4861
takes_args = ['location?']
5192
help='LOCATION is the directory where the config lock is.'),
5194
help='Do not ask for confirmation before breaking the lock.'),
5197
def run(self, location=None, config=False, force=False):
4863
def run(self, location=None, show=False):
5198
4864
if location is None:
5199
4865
location = u'.'
5201
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5203
{'bzrlib.lockdir.break': True})
5205
conf = _mod_config.LockableConfig(file_name=location)
5208
control, relpath = bzrdir.BzrDir.open_containing(location)
5210
control.break_lock()
5211
except NotImplementedError:
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5215
4873
class cmd_wait_until_signalled(Command):
5279
4936
return host, port
5281
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5282
protocol=None, client_timeout=None):
5283
from bzrlib import transport
4940
from bzrlib.transport import get_transport, transport_server_registry
5284
4941
if directory is None:
5285
4942
directory = os.getcwd()
5286
4943
if protocol is None:
5287
protocol = transport.transport_server_registry.get()
4944
protocol = transport_server_registry.get()
5288
4945
host, port = self.get_host_and_port(port)
5289
4946
url = urlutils.local_path_to_url(directory)
5290
4947
if not allow_writes:
5291
4948
url = 'readonly+' + url
5292
t = transport.get_transport(url)
5294
protocol(t, host, port, inet, client_timeout)
5295
except TypeError, e:
5296
# We use symbol_versioning.deprecated_in just so that people
5297
# grepping can find it here.
5298
# symbol_versioning.deprecated_in((2, 5, 0))
5299
symbol_versioning.warn(
5300
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5301
'Most likely it needs to be updated to support a'
5302
' "timeout" parameter (added in bzr 2.5.0)'
5303
% (e, protocol.__module__, protocol),
5305
protocol(t, host, port, inet)
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5308
4953
class cmd_join(Command):
5341
4986
except errors.BadReferenceTarget, e:
5342
4987
# XXX: Would be better to just raise a nicely printable
5343
4988
# exception from the real origin. Also below. mbp 20070306
5344
raise errors.BzrCommandError(
5345
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4989
raise errors.BzrCommandError("Cannot join %s. %s" %
5348
4993
containing_tree.subsume(sub_tree)
5349
4994
except errors.BadSubsumeSource, e:
5350
raise errors.BzrCommandError(
5351
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4995
raise errors.BzrCommandError("Cannot join %s. %s" %
5354
4999
class cmd_split(Command):
5420
5064
encoding_type = 'exact'
5422
5066
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5423
sign=False, revision=None, mail_to=None, message=None,
5067
sign=False, revision=None, mail_to=None, message=None):
5425
5068
from bzrlib.revision import ensure_null, NULL_REVISION
5426
5069
include_patch, include_bundle = {
5427
5070
'plain': (False, False),
5428
5071
'diff': (True, False),
5429
5072
'bundle': (True, True),
5431
branch = Branch.open(directory)
5074
branch = Branch.open('.')
5432
5075
stored_submit_branch = branch.get_submit_branch()
5433
5076
if submit_branch is None:
5434
5077
submit_branch = stored_submit_branch
5446
5089
elif stored_public_branch is None:
5447
5090
branch.set_public_branch(public_branch)
5448
5091
if not include_bundle and public_branch is None:
5449
raise errors.BzrCommandError(gettext('No public branch specified or'
5092
raise errors.BzrCommandError('No public branch specified or'
5451
5094
base_revision_id = None
5452
5095
if revision is not None:
5453
5096
if len(revision) > 2:
5454
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5455
'at most two one revision identifiers'))
5097
raise errors.BzrCommandError('bzr merge-directive takes '
5098
'at most two one revision identifiers')
5456
5099
revision_id = revision[-1].as_revision_id(branch)
5457
5100
if len(revision) == 2:
5458
5101
base_revision_id = revision[0].as_revision_id(branch)
5460
5103
revision_id = branch.last_revision()
5461
5104
revision_id = ensure_null(revision_id)
5462
5105
if revision_id == NULL_REVISION:
5463
raise errors.BzrCommandError(gettext('No revisions to bundle.'))
5106
raise errors.BzrCommandError('No revisions to bundle.')
5464
5107
directive = merge_directive.MergeDirective2.from_objects(
5465
5108
branch.repository, revision_id, time.time(),
5466
5109
osutils.local_time_offset(), submit_branch,
5510
5153
source branch defaults to that containing the working directory, but can
5511
5154
be changed using --from.
5513
Both the submit branch and the public branch follow the usual behavior with
5514
respect to --remember: If there is no default location set, the first send
5515
will set it (use --no-remember to avoid setting it). After that, you can
5516
omit the location to use the default. To change the default, use
5517
--remember. The value will only be saved if the location can be accessed.
5519
5156
In order to calculate those changes, bzr must analyse the submit branch.
5520
5157
Therefore it is most efficient for the submit branch to be a local mirror.
5521
5158
If a public location is known for the submit_branch, that location is used
5592
5229
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5593
no_patch=False, revision=None, remember=None, output=None,
5230
no_patch=False, revision=None, remember=False, output=None,
5594
5231
format=None, mail_to=None, message=None, body=None,
5595
5232
strict=None, **kwargs):
5596
5233
from bzrlib.send import send
5719
5359
branch, relpath = Branch.open_containing(directory)
5720
self.add_cleanup(branch.lock_write().unlock)
5361
self.add_cleanup(branch.unlock)
5722
5363
if tag_name is None:
5723
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5364
raise errors.BzrCommandError("No tag specified to delete.")
5724
5365
branch.tags.delete_tag(tag_name)
5725
note(gettext('Deleted tag %s.') % tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5728
5369
if len(revision) != 1:
5729
raise errors.BzrCommandError(gettext(
5370
raise errors.BzrCommandError(
5730
5371
"Tags can only be placed on a single revision, "
5732
5373
revision_id = revision[0].as_revision_id(branch)
5734
5375
revision_id = branch.last_revision()
5735
5376
if tag_name is None:
5736
5377
tag_name = branch.automatic_tag_name(revision_id)
5737
5378
if tag_name is None:
5738
raise errors.BzrCommandError(gettext(
5739
"Please specify a tag name."))
5741
existing_target = branch.tags.lookup_tag(tag_name)
5742
except errors.NoSuchTag:
5743
existing_target = None
5744
if not force and existing_target not in (None, revision_id):
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5745
5382
raise errors.TagAlreadyExists(tag_name)
5746
if existing_target == revision_id:
5747
note(gettext('Tag %s already exists for that revision.') % tag_name)
5749
branch.tags.set_tag(tag_name, revision_id)
5750
if existing_target is None:
5751
note(gettext('Created tag %s.') % tag_name)
5753
note(gettext('Updated tag %s.') % tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5756
5387
class cmd_tags(Command):
5762
5393
_see_also = ['tag']
5763
5394
takes_options = [
5764
custom_help('directory',
5765
help='Branch whose tags should be displayed.'),
5766
RegistryOption('sort',
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5767
5401
'Sort tags by different criteria.', title='Sorting',
5768
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5774
5409
@display_command
5775
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5776
from bzrlib.tag import tag_sort_methods
5777
5416
branch, relpath = Branch.open_containing(directory)
5779
5418
tags = branch.tags.get_tag_dict().items()
5783
self.add_cleanup(branch.lock_read().unlock)
5423
self.add_cleanup(branch.unlock)
5785
# Restrict to the specified range
5786
tags = self._tags_for_range(branch, revision)
5788
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]])
5790
5444
if not show_ids:
5791
5445
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5792
5446
for index, (tag, revid) in enumerate(tags):
5804
5457
for tag, revspec in tags:
5805
5458
self.outf.write('%-20s %s\n' % (tag, revspec))
5807
def _tags_for_range(self, branch, revision):
5809
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5810
revid1, revid2 = rev1.rev_id, rev2.rev_id
5811
# _get_revision_range will always set revid2 if it's not specified.
5812
# If revid1 is None, it means we want to start from the branch
5813
# origin which is always a valid ancestor. If revid1 == revid2, the
5814
# ancestry check is useless.
5815
if revid1 and revid1 != revid2:
5816
# FIXME: We really want to use the same graph than
5817
# branch.iter_merge_sorted_revisions below, but this is not
5818
# easily available -- vila 2011-09-23
5819
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5820
# We don't want to output anything in this case...
5822
# only show revisions between revid1 and revid2 (inclusive)
5823
tagged_revids = branch.tags.get_reverse_tag_dict()
5825
for r in branch.iter_merge_sorted_revisions(
5826
start_revision_id=revid2, stop_revision_id=revid1,
5827
stop_rule='include'):
5828
revid_tags = tagged_revids.get(r[0], None)
5830
found.extend([(tag, r[0]) for tag in revid_tags])
5834
5461
class cmd_reconfigure(Command):
5835
5462
__doc__ = """Reconfigure the type of a bzr directory.
5849
5476
takes_args = ['location?']
5850
5477
takes_options = [
5851
5478
RegistryOption.from_kwargs(
5854
help='The relation between branch and tree.',
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
5855
5482
value_switches=True, enum_switch=False,
5856
5483
branch='Reconfigure to be an unbound branch with no working tree.',
5857
5484
tree='Reconfigure to be an unbound branch with a working tree.',
5858
5485
checkout='Reconfigure to be a bound branch with a working tree.',
5859
5486
lightweight_checkout='Reconfigure to be a lightweight'
5860
5487
' checkout (with no local history).',
5862
RegistryOption.from_kwargs(
5864
title='Repository type',
5865
help='Location fo the repository.',
5866
value_switches=True, enum_switch=False,
5867
5488
standalone='Reconfigure to be a standalone branch '
5868
5489
'(i.e. stop using shared repository).',
5869
5490
use_shared='Reconfigure to use a shared repository.',
5871
RegistryOption.from_kwargs(
5873
title='Trees in Repository',
5874
help='Whether new branches in the repository have trees.',
5875
value_switches=True, enum_switch=False,
5876
5491
with_trees='Reconfigure repository to create '
5877
5492
'working trees on branches by default.',
5878
5493
with_no_trees='Reconfigure repository to not create '
5895
def run(self, location=None, bind_to=None, force=False,
5896
tree_type=None, repository_type=None, repository_trees=None,
5897
stacked_on=None, unstacked=None):
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5898
5513
directory = bzrdir.BzrDir.open(location)
5899
5514
if stacked_on and unstacked:
5900
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5901
5516
elif stacked_on is not None:
5902
5517
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5903
5518
elif unstacked:
5905
5520
# At the moment you can use --stacked-on and a different
5906
5521
# reconfiguration shape at the same time; there seems no good reason
5908
if (tree_type is None and
5909
repository_type is None and
5910
repository_trees is None):
5523
if target_type is None:
5911
5524
if stacked_on or unstacked:
5914
raise errors.BzrCommandError(gettext('No target configuration '
5916
reconfiguration = None
5917
if tree_type == 'branch':
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
5918
5530
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5919
elif tree_type == 'tree':
5531
elif target_type == 'tree':
5920
5532
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5921
elif tree_type == 'checkout':
5533
elif target_type == 'checkout':
5922
5534
reconfiguration = reconfigure.Reconfigure.to_checkout(
5923
5535
directory, bind_to)
5924
elif tree_type == 'lightweight-checkout':
5536
elif target_type == 'lightweight-checkout':
5925
5537
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5926
5538
directory, bind_to)
5928
reconfiguration.apply(force)
5929
reconfiguration = None
5930
if repository_type == 'use-shared':
5539
elif target_type == 'use-shared':
5931
5540
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5932
elif repository_type == 'standalone':
5541
elif target_type == 'standalone':
5933
5542
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5935
reconfiguration.apply(force)
5936
reconfiguration = None
5937
if repository_trees == 'with-trees':
5543
elif target_type == 'with-trees':
5938
5544
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5939
5545
directory, True)
5940
elif repository_trees == 'with-no-trees':
5546
elif target_type == 'with-no-trees':
5941
5547
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5942
5548
directory, False)
5944
reconfiguration.apply(force)
5945
reconfiguration = None
5549
reconfiguration.apply(force)
5948
5552
class cmd_switch(Command):
5981
5584
def run(self, to_location=None, force=False, create_branch=False,
5982
revision=None, directory=u'.'):
5983
5586
from bzrlib import switch
5984
tree_location = directory
5985
5588
revision = _get_one_revision('switch', revision)
5986
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5987
5590
if to_location is None:
5988
5591
if revision is None:
5989
raise errors.BzrCommandError(gettext('You must supply either a'
5990
' revision or a location'))
5991
to_location = tree_location
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
5993
5596
branch = control_dir.open_branch()
5994
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
6132
tree, file_list = WorkingTree.open_containing_paths(file_list,
5735
tree, file_list = tree_files(file_list, apply_view=False)
6134
5736
current_view, view_dict = tree.views.get_view_info()
6135
5737
if name is None:
6136
5738
name = current_view
6139
raise errors.BzrCommandError(gettext(
6140
"Both --delete and a file list specified"))
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6142
raise errors.BzrCommandError(gettext(
6143
"Both --delete and --switch specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6145
5747
tree.views.set_view_info(None, {})
6146
self.outf.write(gettext("Deleted all views.\n"))
5748
self.outf.write("Deleted all views.\n")
6147
5749
elif name is None:
6148
raise errors.BzrCommandError(gettext("No current view to delete"))
5750
raise errors.BzrCommandError("No current view to delete")
6150
5752
tree.views.delete_view(name)
6151
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6154
raise errors.BzrCommandError(gettext(
6155
"Both --switch and a file list specified"))
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6157
raise errors.BzrCommandError(gettext(
6158
"Both --switch and --all specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6159
5761
elif switch == 'off':
6160
5762
if current_view is None:
6161
raise errors.BzrCommandError(gettext("No current view to disable"))
5763
raise errors.BzrCommandError("No current view to disable")
6162
5764
tree.views.set_view_info(None, view_dict)
6163
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6165
5767
tree.views.set_view_info(switch, view_dict)
6166
5768
view_str = views.view_display_str(tree.views.lookup_view())
6167
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))
6170
self.outf.write(gettext('Views defined:\n'))
5772
self.outf.write('Views defined:\n')
6171
5773
for view in sorted(view_dict):
6172
5774
if view == current_view:
6176
5778
view_str = views.view_display_str(view_dict[view])
6177
5779
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
6179
self.outf.write(gettext('No views defined.\n'))
5781
self.outf.write('No views defined.\n')
6180
5782
elif file_list:
6181
5783
if name is None:
6182
5784
# No name given and no current view set
6184
5786
elif name == 'off':
6185
raise errors.BzrCommandError(gettext(
6186
"Cannot change the 'off' pseudo view"))
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6187
5789
tree.views.set_view(name, sorted(file_list))
6188
5790
view_str = views.view_display_str(tree.views.lookup_view())
6189
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))
6191
5793
# list the files
6192
5794
if name is None:
6193
5795
# No name given and no current view set
6194
self.outf.write(gettext('No current view.\n'))
5796
self.outf.write('No current view.\n')
6196
5798
view_str = views.view_display_str(tree.views.lookup_view(name))
6197
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6200
5802
class cmd_hooks(Command):
6266
5868
You can put multiple items on the shelf, and by default, 'unshelve' will
6267
5869
restore the most recently shelved changes.
6269
For complicated changes, it is possible to edit the changes in a separate
6270
editor program to decide what the file remaining in the working copy
6271
should look like. To do this, add the configuration option
6273
change_editor = PROGRAM @new_path @old_path
6275
where @new_path is replaced with the path of the new version of the
6276
file and @old_path is replaced with the path of the old version of
6277
the file. The PROGRAM should save the new file with the desired
6278
contents of the file in the working tree.
6282
5872
takes_args = ['file*']
6284
5874
takes_options = [
6287
5876
Option('all', help='Shelve all changes.'),
6294
5883
Option('destroy',
6295
5884
help='Destroy removed changes instead of shelving them.'),
6297
_see_also = ['unshelve', 'configuration']
5886
_see_also = ['unshelve']
6299
5888
def run(self, revision=None, all=False, file_list=None, message=None,
6300
writer=None, list=False, destroy=False, directory=None):
5889
writer=None, list=False, destroy=False):
6302
return self.run_for_list(directory=directory)
5891
return self.run_for_list()
6303
5892
from bzrlib.shelf_ui import Shelver
6304
5893
if writer is None:
6305
5894
writer = bzrlib.option.diff_writer_registry.get()
6307
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
6308
file_list, message, destroy=destroy, directory=directory)
5897
file_list, message, destroy=destroy)
6313
5902
except errors.UserAbort:
6316
def run_for_list(self, directory=None):
6317
if directory is None:
6319
tree = WorkingTree.open_containing(directory)[0]
6320
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)
6321
5909
manager = tree.get_shelf_manager()
6322
5910
shelves = manager.active_shelves()
6323
5911
if len(shelves) == 0:
6324
note(gettext('No shelved changes.'))
5912
note('No shelved changes.')
6326
5914
for shelf_id in reversed(shelves):
6327
5915
message = manager.get_metadata(shelf_id).get('message')
6380
5967
To check what clean-tree will do, use --dry-run.
6382
takes_options = ['directory',
6383
Option('ignored', help='Delete all ignored files.'),
6384
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'
6385
5971
' backups, and failed selftest dirs.'),
6386
5972
Option('unknown',
6387
5973
help='Delete files unknown to bzr (default).'),
6389
5975
' deleting them.'),
6390
5976
Option('force', help='Do not prompt before deleting.')]
6391
5977
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6392
force=False, directory=u'.'):
6393
5979
from bzrlib.clean_tree import clean_tree
6394
5980
if not (unknown or ignored or detritus):
6398
clean_tree(directory, unknown=unknown, ignored=ignored,
6399
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)
6402
5988
class cmd_reference(Command):
6446
6032
self.outf.write('%s %s\n' % (path, location))
6449
class cmd_export_pot(Command):
6450
__doc__ = """Export command helps and error messages in po format."""
6455
from bzrlib.export_pot import export_pot
6456
export_pot(self.outf)
6459
6035
def _register_lazy_builtins():
6460
6036
# register lazy builtins from other modules; called at startup and should
6461
6037
# be only called once.
6462
6038
for (name, aliases, module_name) in [
6463
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6464
('cmd_config', [], 'bzrlib.config'),
6465
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6466
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6467
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6468
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6469
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6470
('cmd_verify_signatures', [],
6471
'bzrlib.commit_signature_commands'),
6472
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6474
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
