234
230
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.
232
Additionally for directories, symlinks and files with an executable
233
bit, Bazaar indicates their type using a trailing character: '/', '@'
241
236
To see ignored files use 'bzr ignored'. For details on the
242
237
changes to file texts, use 'bzr diff'.
255
250
To skip the display of pending merge information altogether, use
256
251
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'.
253
If a revision argument is given, the status is calculated against
254
that revision, or between two revisions if two are provided.
266
257
# TODO: --no-recurse, --recurse options
286
274
def run(self, show_ids=False, file_list=None, revision=None, short=False,
287
versioned=False, no_pending=False, verbose=False,
275
versioned=False, no_pending=False, verbose=False):
289
276
from bzrlib.status import show_tree_status
291
278
if revision and len(revision) > 2:
292
raise errors.BzrCommandError(gettext('bzr status --revision takes exactly'
293
' one or two revision specifiers'))
279
raise errors.BzrCommandError('bzr status --revision takes exactly'
280
' one or two revision specifiers')
295
282
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
296
283
# Avoid asking for specific files when that is not needed.
305
292
show_tree_status(tree, show_ids=show_ids,
306
293
specific_files=relfile_list, revision=revision,
307
294
to_file=self.outf, short=short, versioned=versioned,
308
show_pending=(not no_pending), verbose=verbose,
309
classify=not no_classify)
295
show_pending=(not no_pending), verbose=verbose)
312
298
class cmd_cat_revision(Command):
334
320
def run(self, revision_id=None, revision=None, directory=u'.'):
335
321
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'))
322
raise errors.BzrCommandError('You can only supply one of'
323
' revision_id or --revision')
338
324
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]
325
raise errors.BzrCommandError('You must supply either'
326
' --revision or a revision_id')
327
b = WorkingTree.open_containing(directory)[0].branch
344
329
revisions = b.repository.revisions
345
330
if revisions is None:
346
raise errors.BzrCommandError(gettext('Repository %r does not support '
347
'access to raw revision texts'))
331
raise errors.BzrCommandError('Repository %r does not support '
332
'access to raw revision texts')
349
334
b.repository.lock_read()
355
340
self.print_revision(revisions, revision_id)
356
341
except errors.NoSuchRevision:
357
msg = gettext("The repository {0} contains no revision {1}.").format(
342
msg = "The repository %s contains no revision %s." % (
358
343
b.repository.base, revision_id)
359
344
raise errors.BzrCommandError(msg)
360
345
elif revision is not None:
361
346
for rev in revision:
363
348
raise errors.BzrCommandError(
364
gettext('You cannot specify a NULL revision.'))
349
'You cannot specify a NULL revision.')
365
350
rev_id = rev.as_revision_id(b)
366
351
self.print_revision(revisions, rev_id)
489
471
raise errors.ShelvedChanges(working)
491
473
if working.user_url != working.branch.user_url:
492
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
493
" from a lightweight checkout"))
474
raise errors.BzrCommandError("You cannot remove the working tree"
475
" from a lightweight checkout")
495
477
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
480
class cmd_revno(Command):
551
481
__doc__ = """Show current revision number.
793
715
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
794
716
if kind and kind not in ['file', 'directory', 'symlink']:
795
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
717
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
797
719
revision = _get_one_revision('inventory', revision)
798
720
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
863
784
return self.run_auto(names_list, after, dry_run)
865
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
786
raise errors.BzrCommandError('--dry-run requires --auto.')
866
787
if names_list is None:
868
789
if len(names_list) < 2:
869
raise errors.BzrCommandError(gettext("missing file argument"))
790
raise errors.BzrCommandError("missing file argument")
870
791
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
871
792
self.add_cleanup(tree.lock_tree_write().unlock)
872
793
self._run(tree, names_list, rel_names, after)
874
795
def run_auto(self, names_list, after, dry_run):
875
796
if names_list is not None and len(names_list) > 1:
876
raise errors.BzrCommandError(gettext('Only one path may be specified to'
797
raise errors.BzrCommandError('Only one path may be specified to'
879
raise errors.BzrCommandError(gettext('--after cannot be specified with'
800
raise errors.BzrCommandError('--after cannot be specified with'
881
802
work_tree, file_list = WorkingTree.open_containing_paths(
882
803
names_list, default_directory='.')
883
804
self.add_cleanup(work_tree.lock_tree_write().unlock)
980
901
match the remote one, use pull --overwrite. This will work even if the two
981
902
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.
904
If there is no default location set, the first pull will set it. After
905
that, you can omit the location to use the default. To change the
906
default, use --remember. The value will only be saved if the remote
907
location can be accessed.
988
909
Note: The location can be specified either in the form of a branch,
989
910
or in the form of a path to a file containing a merge directive generated
1002
923
"branch. Local pulls are not applied to "
1003
924
"the master branch."
1006
help="Show base revision text in conflicts.")
1008
927
takes_args = ['location?']
1009
928
encoding_type = 'replace'
1011
def run(self, location=None, remember=None, overwrite=False,
930
def run(self, location=None, remember=False, overwrite=False,
1012
931
revision=None, verbose=False,
1013
directory=None, local=False,
932
directory=None, local=False):
1015
933
# FIXME: too much stuff is in the command class
1016
934
revision_id = None
1017
935
mergeable = None
1043
958
stored_loc = branch_to.get_parent()
1044
959
if location is None:
1045
960
if stored_loc is None:
1046
raise errors.BzrCommandError(gettext("No pull location known or"
961
raise errors.BzrCommandError("No pull location known or"
1049
964
display_url = urlutils.unescape_for_display(stored_loc,
1050
965
self.outf.encoding)
1051
966
if not is_quiet():
1052
self.outf.write(gettext("Using saved parent location: %s\n") % display_url)
967
self.outf.write("Using saved parent location: %s\n" % display_url)
1053
968
location = stored_loc
1055
970
revision = _get_one_revision('pull', revision)
1056
971
if mergeable is not None:
1057
972
if revision is not None:
1058
raise errors.BzrCommandError(gettext(
1059
'Cannot use -r with merge directives or bundles'))
973
raise errors.BzrCommandError(
974
'Cannot use -r with merge directives or bundles')
1060
975
mergeable.install_revisions(branch_to.repository)
1061
976
base_revision_id, revision_id, verified = \
1062
977
mergeable.get_merge_request(branch_to.repository)
1116
1026
do a merge (see bzr help merge) from the other branch, and commit that.
1117
1027
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.
1029
If there is no default push location set, the first push will set it.
1030
After that, you can omit the location to use the default. To change the
1031
default, use --remember. The value will only be saved if the remote
1032
location can be accessed.
1125
1035
_see_also = ['pull', 'update', 'working-trees']
1146
1056
Option('strict',
1147
1057
help='Refuse to push if there are uncommitted changes in'
1148
1058
' the working tree, --no-strict disables the check.'),
1150
help="Don't populate the working tree, even for protocols"
1151
" that support it."),
1153
1060
takes_args = ['location?']
1154
1061
encoding_type = 'replace'
1156
def run(self, location=None, remember=None, overwrite=False,
1063
def run(self, location=None, remember=False, overwrite=False,
1157
1064
create_prefix=False, verbose=False, revision=None,
1158
1065
use_existing_dir=False, directory=None, stacked_on=None,
1159
stacked=False, strict=None, no_tree=False):
1066
stacked=False, strict=None):
1160
1067
from bzrlib.push import _show_push_branch
1162
1069
if directory is None:
1190
1097
# error by the feedback given to them. RBC 20080227.
1191
1098
stacked_on = parent_url
1192
1099
if not stacked_on:
1193
raise errors.BzrCommandError(gettext(
1194
"Could not determine branch to refer to."))
1100
raise errors.BzrCommandError(
1101
"Could not determine branch to refer to.")
1196
1103
# Get the destination location
1197
1104
if location is None:
1198
1105
stored_loc = br_from.get_push_location()
1199
1106
if stored_loc is None:
1200
raise errors.BzrCommandError(gettext(
1201
"No push location known or specified."))
1107
raise errors.BzrCommandError(
1108
"No push location known or specified.")
1203
1110
display_url = urlutils.unescape_for_display(stored_loc,
1204
1111
self.outf.encoding)
1205
note(gettext("Using saved push location: %s") % display_url)
1112
self.outf.write("Using saved push location: %s\n" % display_url)
1206
1113
location = stored_loc
1208
1115
_show_push_branch(br_from, revision_id, location, self.outf,
1209
1116
verbose=verbose, overwrite=overwrite, remember=remember,
1210
1117
stacked_on=stacked_on, create_prefix=create_prefix,
1211
use_existing_dir=use_existing_dir, no_tree=no_tree)
1118
use_existing_dir=use_existing_dir)
1214
1121
class cmd_branch(Command):
1260
1165
files_from=None):
1261
1166
from bzrlib import switch as _mod_switch
1262
1167
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
1168
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1271
1170
if not (hardlink or files_from):
1315
1214
branch = dir.open_branch()
1316
1215
except errors.NoSuchRevision:
1317
1216
to_transport.delete_tree('.')
1318
msg = gettext("The branch {0} has no revision {1}.").format(
1319
from_location, revision)
1217
msg = "The branch %s has no revision %s." % (from_location,
1320
1219
raise errors.BzrCommandError(msg)
1321
1220
_merge_tags_if_possible(br_from, branch)
1322
1221
# If the source branch is stacked, the new branch may
1323
1222
# be stacked whether we asked for that explicitly or not.
1324
1223
# We therefore need a try/except here and not just 'if stacked:'
1326
note(gettext('Created new stacked branch referring to %s.') %
1225
note('Created new stacked branch referring to %s.' %
1327
1226
branch.get_stacked_on_url())
1328
1227
except (errors.NotStacked, errors.UnstackableBranchFormat,
1329
1228
errors.UnstackableRepositoryFormat), e:
1330
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1229
note('Branched %d revision(s).' % branch.revno())
1332
1231
# Bind to the parent
1333
1232
parent_branch = Branch.open(from_location)
1334
1233
branch.bind(parent_branch)
1335
note(gettext('New branch bound to %s') % from_location)
1234
note('New branch bound to %s' % from_location)
1337
1236
# Switch to the new branch
1338
1237
wt, _ = WorkingTree.open_containing('.')
1339
1238
_mod_switch.switch(wt.bzrdir, branch)
1340
note(gettext('Switched to branch: %s'),
1239
note('Switched to branch: %s',
1341
1240
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
1243
class cmd_checkout(Command):
1378
1244
__doc__ = """Create a new checkout of an existing branch.
1498
1364
_see_also = ['pull', 'working-trees', 'status-flags']
1499
1365
takes_args = ['dir?']
1500
takes_options = ['revision',
1502
help="Show base revision text in conflicts."),
1366
takes_options = ['revision']
1504
1367
aliases = ['up']
1506
def run(self, dir='.', revision=None, show_base=None):
1369
def run(self, dir='.', revision=None):
1507
1370
if revision is not None and len(revision) != 1:
1508
raise errors.BzrCommandError(gettext(
1509
"bzr update --revision takes exactly one revision"))
1371
raise errors.BzrCommandError(
1372
"bzr update --revision takes exactly one revision")
1510
1373
tree = WorkingTree.open_containing(dir)[0]
1511
1374
branch = tree.branch
1512
1375
possible_transports = []
1537
1400
revision_id = branch.last_revision()
1538
1401
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1539
1402
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))
1403
note("Tree is up to date at revision %s of branch %s" %
1404
('.'.join(map(str, revno)), branch_location))
1543
1406
view_info = _get_view_info_for_change_reporter(tree)
1544
1407
change_reporter = delta._ChangeReporter(
1549
1412
change_reporter,
1550
1413
possible_transports=possible_transports,
1551
1414
revision=revision_id,
1553
show_base=show_base)
1554
1416
except errors.NoSuchRevision, e:
1555
raise errors.BzrCommandError(gettext(
1417
raise errors.BzrCommandError(
1556
1418
"branch has no revision %s\n"
1557
1419
"bzr update --revision only works"
1558
" for a revision in the branch history")
1420
" for a revision in the branch history"
1559
1421
% (e.revision))
1560
1422
revno = tree.branch.revision_id_to_dotted_revno(
1561
1423
_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))
1424
note('Updated to revision %s of branch %s' %
1425
('.'.join(map(str, revno)), branch_location))
1564
1426
parent_ids = tree.get_parent_ids()
1565
1427
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'."))
1428
note('Your local commits will now show as pending merges with '
1429
"'bzr status', and can be committed with 'bzr commit'.")
1568
1430
if conflicts != 0:
1632
1494
title='Deletion Strategy', value_switches=True, enum_switch=False,
1633
1495
safe='Backup changed files (default).',
1634
1496
keep='Delete from bzr but leave the working copy.',
1635
no_backup='Don\'t backup changed files.',
1636
1497
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)')]
1498
'recovered and even if they are non-empty directories.')]
1639
1499
aliases = ['rm', 'del']
1640
1500
encoding_type = 'replace'
1642
1502
def run(self, file_list, verbose=False, new=False,
1643
1503
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
1504
tree, file_list = WorkingTree.open_containing_paths(file_list)
1651
1506
if file_list is not None:
1789
1644
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):
1646
revision_ids = b.repository.get_ancestry(last_revision)
1648
for revision_id in revision_ids:
1798
1649
self.outf.write(revision_id + '\n')
1838
1689
Option('append-revisions-only',
1839
1690
help='Never change revnos or the existing log.'
1840
' Append revisions to it only.'),
1842
'Create a branch without a working tree.')
1691
' Append revisions to it only.')
1844
1693
def run(self, location=None, format=None, append_revisions_only=False,
1845
create_prefix=False, no_tree=False):
1694
create_prefix=False):
1846
1695
if format is None:
1847
1696
format = bzrdir.format_registry.make_bzrdir('default')
1848
1697
if location is None:
1887
1731
raise errors.BranchExistsWithoutWorkingTree(location)
1888
1732
raise errors.AlreadyBranchError(location)
1889
1733
branch = a_bzrdir.create_branch()
1891
a_bzrdir.create_workingtree()
1734
a_bzrdir.create_workingtree()
1892
1735
if append_revisions_only:
1894
1737
branch.set_append_revisions_only(True)
1895
1738
except errors.UpgradeRequired:
1896
raise errors.BzrCommandError(gettext('This branch format cannot be set'
1897
' to append-revisions-only. Try --default.'))
1739
raise errors.BzrCommandError('This branch format cannot be set'
1740
' to append-revisions-only. Try --default.')
1898
1741
if not is_quiet():
1899
1742
from bzrlib.info import describe_layout, describe_format
1904
1747
repository = branch.repository
1905
1748
layout = describe_layout(repository, branch, tree).lower()
1906
1749
format = describe_format(a_bzrdir, repository, branch, tree)
1907
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1750
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
1909
1751
if repository.is_shared():
1910
1752
#XXX: maybe this can be refactored into transport.path_or_url()
1911
1753
url = repository.bzrdir.root_transport.external_url()
2110
1939
elif ':' in prefix:
2111
1940
old_label, new_label = prefix.split(":")
2113
raise errors.BzrCommandError(gettext(
1942
raise errors.BzrCommandError(
2114
1943
'--prefix expects two values separated by a colon'
2115
' (eg "old/:new/")'))
1944
' (eg "old/:new/")')
2117
1946
if revision and len(revision) > 2:
2118
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2119
' one or two revision specifiers'))
1947
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1948
' one or two revision specifiers')
2121
1950
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'))
1951
raise errors.BzrCommandError('--using and --format are mutually '
2126
1954
(old_tree, new_tree,
2127
1955
old_branch, new_branch,
2441
2264
Option('show-diff',
2442
2265
short_name='p',
2443
2266
help='Show changes made in each revision as a patch.'),
2444
Option('include-merged',
2267
Option('include-merges',
2445
2268
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
2269
Option('exclude-common-ancestry',
2451
2270
help='Display only the revisions that are not part'
2452
2271
' 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
2274
encoding_type = 'replace'
2507
2295
_get_info_for_log_files,
2509
2297
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
2298
if (exclude_common_ancestry
2526
2299
and (revision is None or len(revision) != 2)):
2527
raise errors.BzrCommandError(gettext(
2528
'--exclude-common-ancestry requires -r with two revisions'))
2300
raise errors.BzrCommandError(
2301
'--exclude-common-ancestry requires -r with two revisions')
2530
2303
if levels is None:
2533
raise errors.BzrCommandError(gettext(
2534
'{0} and {1} are mutually exclusive').format(
2535
'--levels', '--include-merged'))
2306
raise errors.BzrCommandError(
2307
'--levels and --include-merges are mutually exclusive')
2537
2309
if change is not None:
2538
2310
if len(change) > 1:
2539
2311
raise errors.RangeInChangeOption()
2540
2312
if revision is not None:
2541
raise errors.BzrCommandError(gettext(
2542
'{0} and {1} are mutually exclusive').format(
2543
'--revision', '--change'))
2313
raise errors.BzrCommandError(
2314
'--revision and --change are mutually exclusive')
2545
2316
revision = change
2645
2397
start_revision=rev1, end_revision=rev2, limit=limit,
2646
2398
message_search=message, delta_type=delta_type,
2647
2399
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,
2400
exclude_common_ancestry=exclude_common_ancestry,
2651
2402
Logger(b, rqst).show(lf)
2669
2420
# b is taken from revision[0].get_branch(), and
2670
2421
# show_log will use its revision_history. Having
2671
2422
# different branches will lead to weird behaviors.
2672
raise errors.BzrCommandError(gettext(
2423
raise errors.BzrCommandError(
2673
2424
"bzr %s doesn't accept two revisions in different"
2674
" branches.") % command_name)
2425
" branches." % command_name)
2675
2426
if start_spec.spec is None:
2676
2427
# Avoid loading all the history.
2677
2428
rev1 = RevisionInfo(branch, None, None)
2763
2514
null=False, kind=None, show_ids=False, path=None, directory=None):
2765
2516
if kind and kind not in ('file', 'directory', 'symlink'):
2766
raise errors.BzrCommandError(gettext('invalid kind specified'))
2517
raise errors.BzrCommandError('invalid kind specified')
2768
2519
if verbose and null:
2769
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2520
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2770
2521
all = not (unknown or versioned or ignored)
2772
2523
selection = {'I':ignored, '?':unknown, 'V':versioned}
2951
2693
self.outf.write("%s\n" % pattern)
2953
2695
if not name_pattern_list:
2954
raise errors.BzrCommandError(gettext("ignore requires at least one "
2955
"NAME_PATTERN or --default-rules."))
2696
raise errors.BzrCommandError("ignore requires at least one "
2697
"NAME_PATTERN or --default-rules.")
2956
2698
name_pattern_list = [globbing.normalize_pattern(p)
2957
2699
for p in name_pattern_list]
2958
2700
bad_patterns = ''
2959
bad_patterns_count = 0
2960
2701
for p in name_pattern_list:
2961
2702
if not globbing.Globster.is_pattern_valid(p):
2962
bad_patterns_count += 1
2963
2703
bad_patterns += ('\n %s' % p)
2964
2704
if bad_patterns:
2965
msg = (ngettext('Invalid ignore pattern found. %s',
2966
'Invalid ignore patterns found. %s',
2967
bad_patterns_count) % bad_patterns)
2705
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2968
2706
ui.ui_factory.show_error(msg)
2969
2707
raise errors.InvalidPattern('')
2970
2708
for name_pattern in name_pattern_list:
2971
2709
if (name_pattern[0] == '/' or
2972
2710
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2973
raise errors.BzrCommandError(gettext(
2974
"NAME_PATTERN should not be an absolute path"))
2711
raise errors.BzrCommandError(
2712
"NAME_PATTERN should not be an absolute path")
2975
2713
tree, relpath = WorkingTree.open_containing(directory)
2976
2714
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2977
2715
ignored = globbing.Globster(name_pattern_list)
2984
2722
if ignored.match(filename):
2985
2723
matches.append(filename)
2986
2724
if len(matches) > 0:
2987
self.outf.write(gettext("Warning: the following files are version "
2988
"controlled and match your ignore pattern:\n%s"
2725
self.outf.write("Warning: the following files are version controlled and"
2726
" match your ignore pattern:\n%s"
2989
2727
"\nThese files will continue to be version controlled"
2990
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2728
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2993
2731
class cmd_ignored(Command):
3125
2862
def run(self, filename, revision=None, name_from_revision=False,
3126
2863
filters=False, directory=None):
3127
2864
if revision is not None and len(revision) != 1:
3128
raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3129
" one revision specifier"))
2865
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2866
" one revision specifier")
3130
2867
tree, branch, relpath = \
3131
2868
_open_directory_or_containing_tree_or_branch(filename, directory)
3132
2869
self.add_cleanup(branch.lock_read().unlock)
3143
2880
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
2882
if name_from_revision:
3150
2883
# Try in revision if requested
3151
2884
if old_file_id is None:
3152
raise errors.BzrCommandError(gettext(
3153
"{0!r} is not present in revision {1}").format(
2885
raise errors.BzrCommandError(
2886
"%r is not present in revision %s" % (
3154
2887
filename, rev_tree.get_revision_id()))
3156
actual_file_id = old_file_id
2889
content = rev_tree.get_file_text(old_file_id)
3158
2891
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(
2893
if cur_file_id is not None:
2894
# Then try with the actual file id
2896
content = rev_tree.get_file_text(cur_file_id)
2898
except errors.NoSuchId:
2899
# The actual file id didn't exist at that time
2901
if not found and old_file_id is not None:
2902
# Finally try with the old file id
2903
content = rev_tree.get_file_text(old_file_id)
2906
# Can't be found anywhere
2907
raise errors.BzrCommandError(
2908
"%r is not present in revision %s" % (
3166
2909
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)
2911
from bzrlib.filters import (
2912
ContentFilterContext,
2913
filtered_output_bytes,
2915
filters = rev_tree._content_filter_stack(relpath)
2916
chunks = content.splitlines(True)
2917
content = filtered_output_bytes(chunks, filters,
2918
ContentFilterContext(relpath, rev_tree))
2920
self.outf.writelines(content)
3173
content = rev_tree.get_file_text(actual_file_id)
3175
self.outf.write(content)
2923
self.outf.write(content)
3178
2926
class cmd_local_time_offset(Command):
3239
2987
to trigger updates to external systems like bug trackers. The --fixes
3240
2988
option can be used to record the association between a revision and
3241
2989
one or more bugs. See ``bzr help bugs`` for details.
2991
A selective commit may fail in some cases where the committed
2992
tree would be invalid. Consider::
2997
bzr commit foo -m "committing foo"
2998
bzr mv foo/bar foo/baz
3001
bzr commit foo/bar -m "committing bar but not baz"
3003
In the example above, the last commit will fail by design. This gives
3004
the user the opportunity to decide whether they want to commit the
3005
rename at the same time, separately first, or not at all. (As a general
3006
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3008
# TODO: Run hooks on tree to-be-committed, and after commit.
3010
# TODO: Strict commit that fails if there are deleted files.
3011
# (what does "deleted files" mean ??)
3013
# TODO: Give better message for -s, --summary, used by tla people
3015
# XXX: verbose currently does nothing
3244
3017
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3245
3018
takes_args = ['selected*']
3277
3050
Option('show-diff', short_name='p',
3278
3051
help='When no message is supplied, show the diff along'
3279
3052
' 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
3054
aliases = ['ci', 'checkin']
3287
3056
def _iter_bug_fix_urls(self, fixes, branch):
3288
default_bugtracker = None
3289
3057
# Configure the properties for bug fixing attributes.
3290
3058
for fixed_bug in fixes:
3291
3059
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(
3060
if len(tokens) != 2:
3061
raise errors.BzrCommandError(
3308
3062
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3309
3063
"See \"bzr help bugs\" for more information on this "
3310
"feature.\nCommit refused.") % fixed_bug)
3312
tag, bug_id = tokens
3064
"feature.\nCommit refused." % fixed_bug)
3065
tag, bug_id = tokens
3314
3067
yield bugtracker.get_bug_url(tag, branch, bug_id)
3315
3068
except errors.UnknownBugTrackerAbbreviation:
3316
raise errors.BzrCommandError(gettext(
3317
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3069
raise errors.BzrCommandError(
3070
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3318
3071
except errors.MalformedBugIdentifier, e:
3319
raise errors.BzrCommandError(gettext(
3320
"%s\nCommit refused.") % (str(e),))
3072
raise errors.BzrCommandError(
3073
"%s\nCommit refused." % (str(e),))
3322
3075
def run(self, message=None, file=None, verbose=False, selected_list=None,
3323
3076
unchanged=False, strict=False, local=False, fixes=None,
3324
author=None, show_diff=False, exclude=None, commit_time=None,
3077
author=None, show_diff=False, exclude=None, commit_time=None):
3326
3078
from bzrlib.errors import (
3327
3079
PointlessCommit,
3328
3080
ConflictsInTree,
3404
3161
# make_commit_message_template_encoded returns user encoding.
3405
3162
# 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 \"\"."))
3164
start_message = generate_commit_message_template(commit_obj)
3165
my_message = edit_commit_message_encoded(text,
3166
start_message=start_message)
3167
if my_message is None:
3168
raise errors.BzrCommandError("please specify a commit"
3169
" message with either --message or --file")
3170
if my_message == "":
3171
raise errors.BzrCommandError("empty commit message specified")
3420
3172
return my_message
3422
3174
# The API permits a commit with a filter of [] to mean 'select nothing'
3430
3182
reporter=None, verbose=verbose, revprops=properties,
3431
3183
authors=author, timestamp=commit_stamp,
3432
3184
timezone=offset,
3433
exclude=tree.safe_relpath_files(exclude),
3185
exclude=tree.safe_relpath_files(exclude))
3435
3186
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."))
3187
raise errors.BzrCommandError("No changes to commit."
3188
" Use --unchanged to commit anyhow.")
3439
3189
except ConflictsInTree:
3440
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3190
raise errors.BzrCommandError('Conflicts detected in working '
3441
3191
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3443
3193
except StrictCommitFailed:
3444
raise errors.BzrCommandError(gettext("Commit refused because there are"
3445
" unknown files in the working tree."))
3194
raise errors.BzrCommandError("Commit refused because there are"
3195
" unknown files in the working tree.")
3446
3196
except errors.BoundBranchOutOfDate, e:
3447
e.extra_help = (gettext("\n"
3197
e.extra_help = ("\n"
3448
3198
'To commit to master branch, run update and then commit.\n'
3449
3199
'You can also pass --local to commit to continue working '
3524
3274
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/.
3275
__doc__ = """Upgrade branch storage to current format.
3277
The check command or bzr developers may sometimes advise you to run
3278
this command. When the default format has changed you may also be warned
3279
during other operations to upgrade.
3557
_see_also = ['check', 'reconcile', 'formats']
3282
_see_also = ['check']
3558
3283
takes_args = ['url?']
3559
3284
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."),
3285
RegistryOption('format',
3286
help='Upgrade to a specific format. See "bzr help'
3287
' formats" for details.',
3288
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3289
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3290
value_switches=True, title='Branch format'),
3572
def run(self, url='.', format=None, clean=False, dry_run=False):
3293
def run(self, url='.', format=None):
3573
3294
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
3295
upgrade(url, format)
3583
3298
class cmd_whoami(Command):
3792
3503
if typestring == "sftp":
3793
3504
from bzrlib.tests import stub_sftp
3794
3505
return stub_sftp.SFTPAbsoluteServer
3795
elif typestring == "memory":
3506
if typestring == "memory":
3796
3507
from bzrlib.tests import test_server
3797
3508
return memory.MemoryServer
3798
elif typestring == "fakenfs":
3509
if typestring == "fakenfs":
3799
3510
from bzrlib.tests import test_server
3800
3511
return test_server.FakeNFSServer
3801
3512
msg = "No known transport type %s. Supported types are: sftp\n" %\
3835
3546
Option('randomize', type=str, argname="SEED",
3836
3547
help='Randomize the order of tests using the given'
3837
3548
' seed or "now" for the current time.'),
3838
ListOption('exclude', type=str, argname="PATTERN",
3840
help='Exclude tests that match this regular'
3549
Option('exclude', type=str, argname="PATTERN",
3551
help='Exclude tests that match this regular'
3842
3553
Option('subunit',
3843
3554
help='Output test progress via subunit.'),
3844
3555
Option('strict', help='Fail on missing dependencies or '
3867
3575
first=False, list_only=False,
3868
3576
randomize=None, exclude=None, strict=False,
3869
3577
load_list=None, debugflag=None, starting_with=None, subunit=False,
3870
parallel=None, lsprof_tests=False,
3578
parallel=None, lsprof_tests=False):
3872
3579
from bzrlib import tests
3874
3581
if testspecs_list is not None:
3895
3602
self.additional_selftest_args.setdefault(
3896
3603
'suite_decorators', []).append(parallel)
3898
raise errors.BzrCommandError(gettext(
3605
raise errors.BzrCommandError(
3899
3606
"--benchmark is no longer supported from bzr 2.2; "
3900
"use bzr-usertest instead"))
3607
"use bzr-usertest instead")
3901
3608
test_suite_factory = None
3903
exclude_pattern = None
3905
exclude_pattern = '(' + '|'.join(exclude) + ')'
3907
self._disable_fsync()
3908
3609
selftest_kwargs = {"verbose": verbose,
3909
3610
"pattern": pattern,
3910
3611
"stop_on_failure": one,
3933
3634
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
3637
class cmd_version(Command):
3946
3638
__doc__ = """Show version of bzr."""
3999
3691
The source of the merge can be specified either in the form of a branch,
4000
3692
or in the form of a path to a file containing a merge directive generated
4001
3693
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.
3694
or the branch most recently merged using --remember.
3696
When merging a branch, by default the tip will be merged. To pick a different
3697
revision, pass --revision. If you specify two values, the first will be used as
3698
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3699
available revisions, like this is commonly referred to as "cherrypicking".
3701
Revision numbers are always relative to the branch being merged.
3703
By default, bzr will try to merge in all new work from the other
3704
branch, automatically determining an appropriate base. If this
3705
fails, you may need to give an explicit base.
4024
3707
Merge will do its best to combine the changes in two branches, but there
4025
3708
are some kinds of problems only a human can fix. When it encounters those,
4029
3712
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.
3714
If there is no default branch set, the first merge will set it. After
3715
that, you can omit the branch to use the default. To change the
3716
default, use --remember. The value will only be saved if the remote
3717
location can be accessed.
4036
3719
The results of the merge are placed into the destination working
4037
3720
directory, where they can be reviewed (with bzr diff), tested, and then
4038
3721
committed to record the result of the merge.
4040
3723
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
3724
--force is given. The --force option can also be used to create a
4044
3725
merge revision which has more than two parents.
4046
3727
If one would like to merge changes from the working tree of the other
4106
3787
def run(self, location=None, revision=None, force=False,
4107
merge_type=None, show_base=False, reprocess=None, remember=None,
3788
merge_type=None, show_base=False, reprocess=None, remember=False,
4108
3789
uncommitted=False, pull=False,
4109
3790
directory=None,
4148
3825
mergeable = None
4150
3827
if uncommitted:
4151
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4152
' with bundles or merge directives.'))
3828
raise errors.BzrCommandError('Cannot use --uncommitted'
3829
' with bundles or merge directives.')
4154
3831
if revision is not None:
4155
raise errors.BzrCommandError(gettext(
4156
'Cannot use -r with merge directives or bundles'))
3832
raise errors.BzrCommandError(
3833
'Cannot use -r with merge directives or bundles')
4157
3834
merger, verified = _mod_merge.Merger.from_mergeable(tree,
4158
3835
mergeable, None)
4160
3837
if merger is None and uncommitted:
4161
3838
if revision is not None and len(revision) > 0:
4162
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4163
' --revision at the same time.'))
3839
raise errors.BzrCommandError('Cannot use --uncommitted and'
3840
' --revision at the same time.')
4164
3841
merger = self.get_merger_from_uncommitted(tree, location, None)
4165
3842
allow_pending = False
4174
3851
self.sanity_check_merger(merger)
4175
3852
if (merger.base_rev_id == merger.other_rev_id and
4176
3853
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.'))
3854
note('Nothing to do.')
4186
if pull and not preview:
4187
3857
if merger.interesting_files is not None:
4188
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3858
raise errors.BzrCommandError('Cannot pull individual files')
4189
3859
if (merger.base_rev_id == tree.last_revision()):
4190
3860
result = tree.pull(merger.other_branch, False,
4191
3861
merger.other_rev_id)
4192
3862
result.report(self.outf)
4194
3864
if merger.this_basis is None:
4195
raise errors.BzrCommandError(gettext(
3865
raise errors.BzrCommandError(
4196
3866
"This branch has no commits."
4197
" (perhaps you would prefer 'bzr pull')"))
3867
" (perhaps you would prefer 'bzr pull')")
4199
3869
return self._do_preview(merger)
4200
3870
elif interactive:
4260
3930
# Use reprocess if the merger supports it
4261
3931
merger.reprocess = merger.merge_type.supports_reprocess
4262
3932
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.") %
3933
raise errors.BzrCommandError("Conflict reduction is not supported"
3934
" for merge type %s." %
4265
3935
merger.merge_type)
4266
3936
if merger.reprocess and merger.show_base:
4267
raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
3937
raise errors.BzrCommandError("Cannot do conflict reduction and"
4270
3940
def _get_merger_from_branch(self, tree, location, revision, remember,
4271
3941
possible_transports, pb):
4298
3968
if other_revision_id is None:
4299
3969
other_revision_id = _mod_revision.ensure_null(
4300
3970
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)))):
3971
# Remember where we merge from
3972
if ((remember or tree.branch.get_submit_branch() is None) and
3973
user_location is not None):
4310
3974
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)
3975
_merge_tags_if_possible(other_branch, tree.branch)
4314
3976
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4315
3977
other_revision_id, base_revision_id, other_branch, base_branch)
4316
3978
if other_path != '':
4375
4037
stored_location_type = "parent"
4376
4038
mutter("%s", stored_location)
4377
4039
if stored_location is None:
4378
raise errors.BzrCommandError(gettext("No location specified or remembered"))
4040
raise errors.BzrCommandError("No location specified or remembered")
4379
4041
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))
4042
note(u"%s remembered %s location %s", verb_string,
4043
stored_location_type, display_url)
4382
4044
return stored_location
4484
4146
last committed revision is used.
4486
4148
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.
4149
merge instead. For example, "merge . --revision -2..-3" will remove the
4150
changes introduced by -2, without affecting the changes introduced by -1.
4151
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4492
4153
By default, any files that have been manually changed will be backed up
4493
4154
first. (Files changed only by merge are not backed up.) Backup files have
4660
4319
theirs_only=False,
4661
4320
log_format=None, long=False, short=False, line=False,
4662
4321
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):
4322
include_merges=False, revision=None, my_revision=None,
4666
4324
from bzrlib.missing import find_unmerged, iter_log_revisions
4667
4325
def message(s):
4668
4326
if not is_quiet():
4669
4327
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
4330
mine_only = this
4769
4408
if mine_only and not local_extra:
4770
4409
# We checked local, and found nothing extra
4771
message(gettext('This branch has no new revisions.\n'))
4410
message('This branch is up to date.\n')
4772
4411
elif theirs_only and not remote_extra:
4773
4412
# We checked remote, and found nothing extra
4774
message(gettext('Other branch has no new revisions.\n'))
4413
message('Other branch is up to date.\n')
4775
4414
elif not (mine_only or theirs_only or local_extra or
4777
4416
# We checked both branches, and neither one had extra
4779
message(gettext("Branches are up to date.\n"))
4418
message("Branches are up to date.\n")
4780
4419
self.cleanup_now()
4781
4420
if not status_code and parent is None and other_branch is not None:
4782
4421
self.add_cleanup(local_branch.lock_write().unlock)
4845
4484
@display_command
4846
4485
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)))
4486
import bzrlib.plugin
4487
from inspect import getdoc
4489
for name, plugin in bzrlib.plugin.plugins().items():
4490
version = plugin.__version__
4491
if version == 'unknown':
4493
name_ver = '%s %s' % (name, version)
4494
d = getdoc(plugin.module)
4496
doc = d.split('\n')[0]
4498
doc = '(no description)'
4499
result.append((name_ver, doc, plugin.path()))
4500
for name_ver, doc, path in sorted(result):
4501
self.outf.write("%s\n" % name_ver)
4502
self.outf.write(" %s\n" % doc)
4504
self.outf.write(" %s\n" % path)
4505
self.outf.write("\n")
4853
4508
class cmd_testament(Command):
4917
4570
self.add_cleanup(branch.lock_read().unlock)
4918
4571
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4919
4572
self.add_cleanup(tree.lock_read().unlock)
4920
if wt is not None and revision is None:
4921
4574
file_id = wt.path2id(relpath)
4923
4576
file_id = tree.path2id(relpath)
4924
4577
if file_id is None:
4925
4578
raise errors.NotVersionedError(filename)
4579
file_version = tree.inventory[file_id].revision
4926
4580
if wt is not None and revision is None:
4927
4581
# If there is a tree and we're not annotating historical
4928
4582
# versions, annotate the working tree's content.
4929
4583
annotate_file_tree(wt, file_id, self.outf, long, all,
4930
4584
show_ids=show_ids)
4932
annotate_file_tree(tree, file_id, self.outf, long, all,
4933
show_ids=show_ids, branch=branch)
4586
annotate_file(branch, file_version, file_id, long, all, self.outf,
4936
4590
class cmd_re_sign(Command):
4944
4598
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4945
4599
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'))
4600
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4947
4601
if revision_id_list is None and revision is None:
4948
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
4602
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4949
4603
b = WorkingTree.open_containing(directory)[0].branch
4950
4604
self.add_cleanup(b.lock_write().unlock)
4951
4605
return self._run(b, revision_id_list, revision)
5021
4675
location = b.get_old_bound_location()
5022
4676
except errors.UpgradeRequired:
5023
raise errors.BzrCommandError(gettext('No location supplied. '
5024
'This format does not remember old locations.'))
4677
raise errors.BzrCommandError('No location supplied. '
4678
'This format does not remember old locations.')
5026
4680
if location is None:
5027
4681
if b.get_bound_location() is not None:
5028
raise errors.BzrCommandError(gettext('Branch is already bound'))
4682
raise errors.BzrCommandError('Branch is already bound')
5030
raise errors.BzrCommandError(gettext('No location supplied '
5031
'and no previous location known'))
4684
raise errors.BzrCommandError('No location supplied '
4685
'and no previous location known')
5032
4686
b_other = Branch.open(location)
5034
4688
b.bind(b_other)
5035
4689
except errors.DivergedBranches:
5036
raise errors.BzrCommandError(gettext('These branches have diverged.'
5037
' Try merging, and then bind again.'))
4690
raise errors.BzrCommandError('These branches have diverged.'
4691
' Try merging, and then bind again.')
5038
4692
if b.get_config().has_explicit_nickname():
5039
4693
b.nick = b_other.nick
5092
4744
encoding_type = 'replace'
5094
def run(self, location=None, dry_run=False, verbose=False,
5095
revision=None, force=False, local=False, keep_tags=False):
4746
def run(self, location=None,
4747
dry_run=False, verbose=False,
4748
revision=None, force=False, local=False):
5096
4749
if location is None:
5097
4750
location = u'.'
5098
4751
control, relpath = bzrdir.BzrDir.open_containing(location)
5107
4760
self.add_cleanup(tree.lock_write().unlock)
5109
4762
self.add_cleanup(b.lock_write().unlock)
5110
return self._run(b, tree, dry_run, verbose, revision, force,
4763
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5113
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4765
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5115
4766
from bzrlib.log import log_formatter, show_log
5116
4767
from bzrlib.uncommit import uncommit
5147
4798
end_revision=last_revno)
5150
self.outf.write(gettext('Dry-run, pretending to remove'
5151
' the above revisions.\n'))
4801
self.outf.write('Dry-run, pretending to remove'
4802
' the above revisions.\n')
5153
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4804
self.outf.write('The above revision(s) will be removed.\n')
5156
4807
if not ui.ui_factory.confirm_action(
5157
gettext(u'Uncommit these revisions'),
4808
'Uncommit these revisions',
5158
4809
'bzrlib.builtins.uncommit',
5160
self.outf.write(gettext('Canceled\n'))
4811
self.outf.write('Canceled\n')
5163
4814
mutter('Uncommitting from {%s} to {%s}',
5164
4815
last_rev_id, rev_id)
5165
4816
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)
4817
revno=revno, local=local)
4818
self.outf.write('You can restore the old tip by running:\n'
4819
' bzr pull . -r revid:%s\n' % last_rev_id)
5171
4822
class cmd_break_lock(Command):
5190
4841
takes_options = [
5191
4842
Option('config',
5192
4843
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):
4846
def run(self, location=None, config=False):
5198
4847
if location is None:
5199
4848
location = u'.'
5201
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5203
{'bzrlib.lockdir.break': True})
5205
4850
conf = _mod_config.LockableConfig(file_name=location)
5206
4851
conf.break_lock()
5290
4933
if not allow_writes:
5291
4934
url = 'readonly+' + url
5292
4935
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)
4936
protocol(t, host, port, inet)
5308
4939
class cmd_join(Command):
5341
4972
except errors.BadReferenceTarget, e:
5342
4973
# XXX: Would be better to just raise a nicely printable
5343
4974
# exception from the real origin. Also below. mbp 20070306
5344
raise errors.BzrCommandError(
5345
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4975
raise errors.BzrCommandError("Cannot join %s. %s" %
5348
4979
containing_tree.subsume(sub_tree)
5349
4980
except errors.BadSubsumeSource, e:
5350
raise errors.BzrCommandError(
5351
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4981
raise errors.BzrCommandError("Cannot join %s. %s" %
5354
4985
class cmd_split(Command):
5446
5077
elif stored_public_branch is None:
5447
5078
branch.set_public_branch(public_branch)
5448
5079
if not include_bundle and public_branch is None:
5449
raise errors.BzrCommandError(gettext('No public branch specified or'
5080
raise errors.BzrCommandError('No public branch specified or'
5451
5082
base_revision_id = None
5452
5083
if revision is not None:
5453
5084
if len(revision) > 2:
5454
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5455
'at most two one revision identifiers'))
5085
raise errors.BzrCommandError('bzr merge-directive takes '
5086
'at most two one revision identifiers')
5456
5087
revision_id = revision[-1].as_revision_id(branch)
5457
5088
if len(revision) == 2:
5458
5089
base_revision_id = revision[0].as_revision_id(branch)
5460
5091
revision_id = branch.last_revision()
5461
5092
revision_id = ensure_null(revision_id)
5462
5093
if revision_id == NULL_REVISION:
5463
raise errors.BzrCommandError(gettext('No revisions to bundle.'))
5094
raise errors.BzrCommandError('No revisions to bundle.')
5464
5095
directive = merge_directive.MergeDirective2.from_objects(
5465
5096
branch.repository, revision_id, time.time(),
5466
5097
osutils.local_time_offset(), submit_branch,
5510
5141
source branch defaults to that containing the working directory, but can
5511
5142
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
5144
In order to calculate those changes, bzr must analyse the submit branch.
5520
5145
Therefore it is most efficient for the submit branch to be a local mirror.
5521
5146
If a public location is known for the submit_branch, that location is used
5592
5217
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5593
no_patch=False, revision=None, remember=None, output=None,
5218
no_patch=False, revision=None, remember=False, output=None,
5594
5219
format=None, mail_to=None, message=None, body=None,
5595
5220
strict=None, **kwargs):
5596
5221
from bzrlib.send import send
5720
5345
self.add_cleanup(branch.lock_write().unlock)
5722
5347
if tag_name is None:
5723
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5348
raise errors.BzrCommandError("No tag specified to delete.")
5724
5349
branch.tags.delete_tag(tag_name)
5725
note(gettext('Deleted tag %s.') % tag_name)
5350
self.outf.write('Deleted tag %s.\n' % tag_name)
5728
5353
if len(revision) != 1:
5729
raise errors.BzrCommandError(gettext(
5354
raise errors.BzrCommandError(
5730
5355
"Tags can only be placed on a single revision, "
5732
5357
revision_id = revision[0].as_revision_id(branch)
5734
5359
revision_id = branch.last_revision()
5735
5360
if tag_name is None:
5736
5361
tag_name = branch.automatic_tag_name(revision_id)
5737
5362
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):
5363
raise errors.BzrCommandError(
5364
"Please specify a tag name.")
5365
if (not force) and branch.tags.has_tag(tag_name):
5745
5366
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)
5367
branch.tags.set_tag(tag_name, revision_id)
5368
self.outf.write('Created tag %s.\n' % tag_name)
5756
5371
class cmd_tags(Command):
5763
5378
takes_options = [
5764
5379
custom_help('directory',
5765
5380
help='Branch whose tags should be displayed.'),
5766
RegistryOption('sort',
5381
RegistryOption.from_kwargs('sort',
5767
5382
'Sort tags by different criteria.', title='Sorting',
5768
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5383
alpha='Sort tags lexicographically (default).',
5384
time='Sort tags chronologically.',
5774
5390
@display_command
5775
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5776
from bzrlib.tag import tag_sort_methods
5777
5397
branch, relpath = Branch.open_containing(directory)
5779
5399
tags = branch.tags.get_tag_dict().items()
5783
5403
self.add_cleanup(branch.lock_read().unlock)
5785
# Restrict to the specified range
5786
tags = self._tags_for_range(branch, revision)
5788
sort = tag_sort_methods.get()
5405
graph = branch.repository.get_graph()
5406
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5407
revid1, revid2 = rev1.rev_id, rev2.rev_id
5408
# only show revisions between revid1 and revid2 (inclusive)
5409
tags = [(tag, revid) for tag, revid in tags if
5410
graph.is_between(revid, revid1, revid2)]
5413
elif sort == 'time':
5415
for tag, revid in tags:
5417
revobj = branch.repository.get_revision(revid)
5418
except errors.NoSuchRevision:
5419
timestamp = sys.maxint # place them at the end
5421
timestamp = revobj.timestamp
5422
timestamps[revid] = timestamp
5423
tags.sort(key=lambda x: timestamps[x[1]])
5790
5424
if not show_ids:
5791
5425
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5792
5426
for index, (tag, revid) in enumerate(tags):
5804
5437
for tag, revspec in tags:
5805
5438
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
5441
class cmd_reconfigure(Command):
5835
5442
__doc__ = """Reconfigure the type of a bzr directory.
5849
5456
takes_args = ['location?']
5850
5457
takes_options = [
5851
5458
RegistryOption.from_kwargs(
5854
help='The relation between branch and tree.',
5460
title='Target type',
5461
help='The type to reconfigure the directory to.',
5855
5462
value_switches=True, enum_switch=False,
5856
5463
branch='Reconfigure to be an unbound branch with no working tree.',
5857
5464
tree='Reconfigure to be an unbound branch with a working tree.',
5858
5465
checkout='Reconfigure to be a bound branch with a working tree.',
5859
5466
lightweight_checkout='Reconfigure to be a lightweight'
5860
5467
' 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
5468
standalone='Reconfigure to be a standalone branch '
5868
5469
'(i.e. stop using shared repository).',
5869
5470
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
5471
with_trees='Reconfigure repository to create '
5877
5472
'working trees on branches by default.',
5878
5473
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):
5490
def run(self, location=None, target_type=None, bind_to=None, force=False,
5898
5493
directory = bzrdir.BzrDir.open(location)
5899
5494
if stacked_on and unstacked:
5900
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5495
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5901
5496
elif stacked_on is not None:
5902
5497
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5903
5498
elif unstacked:
5905
5500
# At the moment you can use --stacked-on and a different
5906
5501
# 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):
5503
if target_type is None:
5911
5504
if stacked_on or unstacked:
5914
raise errors.BzrCommandError(gettext('No target configuration '
5916
reconfiguration = None
5917
if tree_type == 'branch':
5507
raise errors.BzrCommandError('No target configuration '
5509
elif target_type == 'branch':
5918
5510
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5919
elif tree_type == 'tree':
5511
elif target_type == 'tree':
5920
5512
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5921
elif tree_type == 'checkout':
5513
elif target_type == 'checkout':
5922
5514
reconfiguration = reconfigure.Reconfigure.to_checkout(
5923
5515
directory, bind_to)
5924
elif tree_type == 'lightweight-checkout':
5516
elif target_type == 'lightweight-checkout':
5925
5517
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5926
5518
directory, bind_to)
5928
reconfiguration.apply(force)
5929
reconfiguration = None
5930
if repository_type == 'use-shared':
5519
elif target_type == 'use-shared':
5931
5520
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5932
elif repository_type == 'standalone':
5521
elif target_type == 'standalone':
5933
5522
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5935
reconfiguration.apply(force)
5936
reconfiguration = None
5937
if repository_trees == 'with-trees':
5523
elif target_type == 'with-trees':
5938
5524
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5939
5525
directory, True)
5940
elif repository_trees == 'with-no-trees':
5526
elif target_type == 'with-no-trees':
5941
5527
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5942
5528
directory, False)
5944
reconfiguration.apply(force)
5945
reconfiguration = None
5529
reconfiguration.apply(force)
5948
5532
class cmd_switch(Command):
6136
5720
name = current_view
6139
raise errors.BzrCommandError(gettext(
6140
"Both --delete and a file list specified"))
5723
raise errors.BzrCommandError(
5724
"Both --delete and a file list specified")
6142
raise errors.BzrCommandError(gettext(
6143
"Both --delete and --switch specified"))
5726
raise errors.BzrCommandError(
5727
"Both --delete and --switch specified")
6145
5729
tree.views.set_view_info(None, {})
6146
self.outf.write(gettext("Deleted all views.\n"))
5730
self.outf.write("Deleted all views.\n")
6147
5731
elif name is None:
6148
raise errors.BzrCommandError(gettext("No current view to delete"))
5732
raise errors.BzrCommandError("No current view to delete")
6150
5734
tree.views.delete_view(name)
6151
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5735
self.outf.write("Deleted '%s' view.\n" % name)
6154
raise errors.BzrCommandError(gettext(
6155
"Both --switch and a file list specified"))
5738
raise errors.BzrCommandError(
5739
"Both --switch and a file list specified")
6157
raise errors.BzrCommandError(gettext(
6158
"Both --switch and --all specified"))
5741
raise errors.BzrCommandError(
5742
"Both --switch and --all specified")
6159
5743
elif switch == 'off':
6160
5744
if current_view is None:
6161
raise errors.BzrCommandError(gettext("No current view to disable"))
5745
raise errors.BzrCommandError("No current view to disable")
6162
5746
tree.views.set_view_info(None, view_dict)
6163
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5747
self.outf.write("Disabled '%s' view.\n" % (current_view))
6165
5749
tree.views.set_view_info(switch, view_dict)
6166
5750
view_str = views.view_display_str(tree.views.lookup_view())
6167
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5751
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6170
self.outf.write(gettext('Views defined:\n'))
5754
self.outf.write('Views defined:\n')
6171
5755
for view in sorted(view_dict):
6172
5756
if view == current_view:
6176
5760
view_str = views.view_display_str(view_dict[view])
6177
5761
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
6179
self.outf.write(gettext('No views defined.\n'))
5763
self.outf.write('No views defined.\n')
6180
5764
elif file_list:
6181
5765
if name is None:
6182
5766
# No name given and no current view set
6184
5768
elif name == 'off':
6185
raise errors.BzrCommandError(gettext(
6186
"Cannot change the 'off' pseudo view"))
5769
raise errors.BzrCommandError(
5770
"Cannot change the 'off' pseudo view")
6187
5771
tree.views.set_view(name, sorted(file_list))
6188
5772
view_str = views.view_display_str(tree.views.lookup_view())
6189
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5773
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6191
5775
# list the files
6192
5776
if name is None:
6193
5777
# No name given and no current view set
6194
self.outf.write(gettext('No current view.\n'))
5778
self.outf.write('No current view.\n')
6196
5780
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))
5781
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6200
5784
class cmd_hooks(Command):
6266
5850
You can put multiple items on the shelf, and by default, 'unshelve' will
6267
5851
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
5854
takes_args = ['file*']
6294
5866
Option('destroy',
6295
5867
help='Destroy removed changes instead of shelving them.'),
6297
_see_also = ['unshelve', 'configuration']
5869
_see_also = ['unshelve']
6299
5871
def run(self, revision=None, all=False, file_list=None, message=None,
6300
writer=None, list=False, destroy=False, directory=None):
5872
writer=None, list=False, destroy=False, directory=u'.'):
6302
return self.run_for_list(directory=directory)
5874
return self.run_for_list()
6303
5875
from bzrlib.shelf_ui import Shelver
6304
5876
if writer is None:
6305
5877
writer = bzrlib.option.diff_writer_registry.get()
6313
5885
except errors.UserAbort:
6316
def run_for_list(self, directory=None):
6317
if directory is None:
6319
tree = WorkingTree.open_containing(directory)[0]
5888
def run_for_list(self):
5889
tree = WorkingTree.open_containing('.')[0]
6320
5890
self.add_cleanup(tree.lock_read().unlock)
6321
5891
manager = tree.get_shelf_manager()
6322
5892
shelves = manager.active_shelves()
6323
5893
if len(shelves) == 0:
6324
note(gettext('No shelved changes.'))
5894
note('No shelved changes.')
6326
5896
for shelf_id in reversed(shelves):
6327
5897
message = manager.get_metadata(shelf_id).get('message')
6382
5952
takes_options = ['directory',
6383
5953
Option('ignored', help='Delete all ignored files.'),
6384
Option('detritus', help='Delete conflict files, merge and revert'
5954
Option('detritus', help='Delete conflict files, merge'
6385
5955
' backups, and failed selftest dirs.'),
6386
5956
Option('unknown',
6387
5957
help='Delete files unknown to bzr (default).'),
6446
6016
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
6019
def _register_lazy_builtins():
6460
6020
# register lazy builtins from other modules; called at startup and should
6461
6021
# be only called once.
6462
6022
for (name, aliases, module_name) in [
6463
6023
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6464
('cmd_config', [], 'bzrlib.config'),
6465
6024
('cmd_dpush', [], 'bzrlib.foreign'),
6466
6025
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6467
6026
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6468
6027
('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'),
6028
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6474
6030
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
