275
288
def run(self, show_ids=False, file_list=None, revision=None, short=False,
276
versioned=False, no_pending=False, verbose=False):
289
versioned=False, no_pending=False, verbose=False,
277
291
from bzrlib.status import show_tree_status
279
293
if revision and len(revision) > 2:
280
raise errors.BzrCommandError('bzr status --revision takes exactly'
281
' one or two revision specifiers')
294
raise errors.BzrCommandError(gettext('bzr status --revision takes exactly'
295
' one or two revision specifiers'))
283
297
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
284
298
# Avoid asking for specific files when that is not needed.
321
336
def run(self, revision_id=None, revision=None, directory=u'.'):
322
337
if revision_id is not None and revision is not None:
323
raise errors.BzrCommandError('You can only supply one of'
324
' revision_id or --revision')
338
raise errors.BzrCommandError(gettext('You can only supply one of'
339
' revision_id or --revision'))
325
340
if revision_id is None and revision is None:
326
raise errors.BzrCommandError('You must supply either'
327
' --revision or a revision_id')
328
b = WorkingTree.open_containing(directory)[0].branch
341
raise errors.BzrCommandError(gettext('You must supply either'
342
' --revision or a revision_id'))
344
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
330
346
revisions = b.repository.revisions
331
347
if revisions is None:
332
raise errors.BzrCommandError('Repository %r does not support '
333
'access to raw revision texts')
348
raise errors.BzrCommandError(gettext('Repository %r does not support '
349
'access to raw revision texts'))
335
351
b.repository.lock_read()
472
491
raise errors.ShelvedChanges(working)
474
493
if working.user_url != working.branch.user_url:
475
raise errors.BzrCommandError("You cannot remove the working tree"
476
" from a lightweight checkout")
494
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
495
" from a lightweight checkout"))
478
497
d.destroy_workingtree()
500
class cmd_repair_workingtree(Command):
501
__doc__ = """Reset the working tree state file.
503
This is not meant to be used normally, but more as a way to recover from
504
filesystem corruption, etc. This rebuilds the working inventory back to a
505
'known good' state. Any new modifications (adding a file, renaming, etc)
506
will be lost, though modified files will still be detected as such.
508
Most users will want something more like "bzr revert" or "bzr update"
509
unless the state file has become corrupted.
511
By default this attempts to recover the current state by looking at the
512
headers of the state file. If the state file is too corrupted to even do
513
that, you can supply --revision to force the state of the tree.
516
takes_options = ['revision', 'directory',
518
help='Reset the tree even if it doesn\'t appear to be'
523
def run(self, revision=None, directory='.', force=False):
524
tree, _ = WorkingTree.open_containing(directory)
525
self.add_cleanup(tree.lock_tree_write().unlock)
529
except errors.BzrError:
530
pass # There seems to be a real error here, so we'll reset
533
raise errors.BzrCommandError(gettext(
534
'The tree does not appear to be corrupt. You probably'
535
' want "bzr revert" instead. Use "--force" if you are'
536
' sure you want to reset the working tree.'))
540
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
542
tree.reset_state(revision_ids)
543
except errors.BzrError, e:
544
if revision_ids is None:
545
extra = (gettext(', the header appears corrupt, try passing -r -1'
546
' to set the state to the last commit'))
549
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
481
552
class cmd_revno(Command):
482
553
__doc__ = """Show current revision number.
488
559
takes_args = ['location?']
489
560
takes_options = [
490
561
Option('tree', help='Show revno of working tree'),
494
def run(self, tree=False, location=u'.'):
566
def run(self, tree=False, location=u'.', revision=None):
567
if revision is not None and tree:
568
raise errors.BzrCommandError(gettext("--tree and --revision can "
569
"not be used together"))
497
573
wt = WorkingTree.open_containing(location)[0]
498
574
self.add_cleanup(wt.lock_read().unlock)
499
575
except (errors.NoWorkingTree, errors.NotLocalUrl):
500
576
raise errors.NoWorkingTree(location)
501
578
revid = wt.last_revision()
503
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
504
except errors.NoSuchRevision:
506
revno = ".".join(str(n) for n in revno_t)
508
580
b = Branch.open_containing(location)[0]
509
581
self.add_cleanup(b.lock_read().unlock)
583
if len(revision) != 1:
584
raise errors.BzrCommandError(gettext(
585
"Tags can only be placed on a single revision, "
587
revid = revision[0].as_revision_id(b)
589
revid = b.last_revision()
591
revno_t = b.revision_id_to_dotted_revno(revid)
592
except errors.NoSuchRevision:
594
revno = ".".join(str(n) for n in revno_t)
511
595
self.cleanup_now()
512
self.outf.write(str(revno) + '\n')
596
self.outf.write(revno + '\n')
515
599
class cmd_revision_info(Command):
785
879
return self.run_auto(names_list, after, dry_run)
787
raise errors.BzrCommandError('--dry-run requires --auto.')
881
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
788
882
if names_list is None:
790
884
if len(names_list) < 2:
791
raise errors.BzrCommandError("missing file argument")
885
raise errors.BzrCommandError(gettext("missing file argument"))
792
886
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
793
887
self.add_cleanup(tree.lock_tree_write().unlock)
794
888
self._run(tree, names_list, rel_names, after)
796
890
def run_auto(self, names_list, after, dry_run):
797
891
if names_list is not None and len(names_list) > 1:
798
raise errors.BzrCommandError('Only one path may be specified to'
892
raise errors.BzrCommandError(gettext('Only one path may be specified to'
801
raise errors.BzrCommandError('--after cannot be specified with'
895
raise errors.BzrCommandError(gettext('--after cannot be specified with'
803
897
work_tree, file_list = WorkingTree.open_containing_paths(
804
898
names_list, default_directory='.')
805
899
self.add_cleanup(work_tree.lock_tree_write().unlock)
902
996
match the remote one, use pull --overwrite. This will work even if the two
903
997
branches have diverged.
905
If there is no default location set, the first pull will set it. After
906
that, you can omit the location to use the default. To change the
907
default, use --remember. The value will only be saved if the remote
908
location can be accessed.
999
If there is no default location set, the first pull will set it (use
1000
--no-remember to avoid setting it). After that, you can omit the
1001
location to use the default. To change the default, use --remember. The
1002
value will only be saved if the remote location can be accessed.
1004
The --verbose option will display the revisions pulled using the log_format
1005
configuration option. You can use a different format by overriding it with
1006
-Olog_format=<other_format>.
910
1008
Note: The location can be specified either in the form of a branch,
911
1009
or in the form of a path to a file containing a merge directive generated
959
1063
stored_loc = branch_to.get_parent()
960
1064
if location is None:
961
1065
if stored_loc is None:
962
raise errors.BzrCommandError("No pull location known or"
1066
raise errors.BzrCommandError(gettext("No pull location known or"
965
1069
display_url = urlutils.unescape_for_display(stored_loc,
966
1070
self.outf.encoding)
967
1071
if not is_quiet():
968
self.outf.write("Using saved parent location: %s\n" % display_url)
1072
self.outf.write(gettext("Using saved parent location: %s\n") % display_url)
969
1073
location = stored_loc
971
1075
revision = _get_one_revision('pull', revision)
972
1076
if mergeable is not None:
973
1077
if revision is not None:
974
raise errors.BzrCommandError(
975
'Cannot use -r with merge directives or bundles')
1078
raise errors.BzrCommandError(gettext(
1079
'Cannot use -r with merge directives or bundles'))
976
1080
mergeable.install_revisions(branch_to.repository)
977
1081
base_revision_id, revision_id, verified = \
978
1082
mergeable.get_merge_request(branch_to.repository)
1027
1136
do a merge (see bzr help merge) from the other branch, and commit that.
1028
1137
After that you will be able to do a push without '--overwrite'.
1030
If there is no default push location set, the first push will set it.
1031
After that, you can omit the location to use the default. To change the
1032
default, use --remember. The value will only be saved if the remote
1033
location can be accessed.
1139
If there is no default push location set, the first push will set it (use
1140
--no-remember to avoid setting it). After that, you can omit the
1141
location to use the default. To change the default, use --remember. The
1142
value will only be saved if the remote location can be accessed.
1144
The --verbose option will display the revisions pushed using the log_format
1145
configuration option. You can use a different format by overriding it with
1146
-Olog_format=<other_format>.
1036
1149
_see_also = ['pull', 'update', 'working-trees']
1057
1170
Option('strict',
1058
1171
help='Refuse to push if there are uncommitted changes in'
1059
1172
' the working tree, --no-strict disables the check.'),
1174
help="Don't populate the working tree, even for protocols"
1175
" that support it."),
1061
1177
takes_args = ['location?']
1062
1178
encoding_type = 'replace'
1064
def run(self, location=None, remember=False, overwrite=False,
1180
def run(self, location=None, remember=None, overwrite=False,
1065
1181
create_prefix=False, verbose=False, revision=None,
1066
1182
use_existing_dir=False, directory=None, stacked_on=None,
1067
stacked=False, strict=None):
1183
stacked=False, strict=None, no_tree=False):
1068
1184
from bzrlib.push import _show_push_branch
1070
1186
if directory is None:
1071
1187
directory = '.'
1072
1188
# Get the source branch
1073
1189
(tree, br_from,
1074
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1190
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1075
1191
# Get the tip's revision_id
1076
1192
revision = _get_one_revision('push', revision)
1077
1193
if revision is not None:
1098
1214
# error by the feedback given to them. RBC 20080227.
1099
1215
stacked_on = parent_url
1100
1216
if not stacked_on:
1101
raise errors.BzrCommandError(
1102
"Could not determine branch to refer to.")
1217
raise errors.BzrCommandError(gettext(
1218
"Could not determine branch to refer to."))
1104
1220
# Get the destination location
1105
1221
if location is None:
1106
1222
stored_loc = br_from.get_push_location()
1107
1223
if stored_loc is None:
1108
raise errors.BzrCommandError(
1109
"No push location known or specified.")
1224
raise errors.BzrCommandError(gettext(
1225
"No push location known or specified."))
1111
1227
display_url = urlutils.unescape_for_display(stored_loc,
1112
1228
self.outf.encoding)
1113
self.outf.write("Using saved push location: %s\n" % display_url)
1229
note(gettext("Using saved push location: %s") % display_url)
1114
1230
location = stored_loc
1116
1232
_show_push_branch(br_from, revision_id, location, self.outf,
1117
1233
verbose=verbose, overwrite=overwrite, remember=remember,
1118
1234
stacked_on=stacked_on, create_prefix=create_prefix,
1119
use_existing_dir=use_existing_dir)
1235
use_existing_dir=use_existing_dir, no_tree=no_tree)
1122
1238
class cmd_branch(Command):
1191
1315
to_transport.mkdir('.')
1192
1316
except errors.FileExists:
1193
1317
if not use_existing_dir:
1194
raise errors.BzrCommandError('Target directory "%s" '
1195
'already exists.' % to_location)
1318
raise errors.BzrCommandError(gettext('Target directory "%s" '
1319
'already exists.') % to_location)
1198
bzrdir.BzrDir.open_from_transport(to_transport)
1322
to_dir = controldir.ControlDir.open_from_transport(
1199
1324
except errors.NotBranchError:
1202
raise errors.AlreadyBranchError(to_location)
1328
to_dir.open_branch()
1329
except errors.NotBranchError:
1332
raise errors.AlreadyBranchError(to_location)
1203
1333
except errors.NoSuchFile:
1204
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1334
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1207
# preserve whatever source format we have.
1208
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1209
possible_transports=[to_transport],
1210
accelerator_tree=accelerator_tree,
1211
hardlink=hardlink, stacked=stacked,
1212
force_new_repo=standalone,
1213
create_tree_if_local=not no_tree,
1214
source_branch=br_from)
1215
branch = dir.open_branch()
1216
except errors.NoSuchRevision:
1217
to_transport.delete_tree('.')
1218
msg = "The branch %s has no revision %s." % (from_location,
1220
raise errors.BzrCommandError(msg)
1340
# preserve whatever source format we have.
1341
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1342
possible_transports=[to_transport],
1343
accelerator_tree=accelerator_tree,
1344
hardlink=hardlink, stacked=stacked,
1345
force_new_repo=standalone,
1346
create_tree_if_local=not no_tree,
1347
source_branch=br_from)
1348
branch = to_dir.open_branch()
1349
except errors.NoSuchRevision:
1350
to_transport.delete_tree('.')
1351
msg = gettext("The branch {0} has no revision {1}.").format(
1352
from_location, revision)
1353
raise errors.BzrCommandError(msg)
1355
branch = br_from.sprout(to_dir, revision_id=revision_id)
1221
1356
_merge_tags_if_possible(br_from, branch)
1222
1357
# If the source branch is stacked, the new branch may
1223
1358
# be stacked whether we asked for that explicitly or not.
1224
1359
# We therefore need a try/except here and not just 'if stacked:'
1226
note('Created new stacked branch referring to %s.' %
1361
note(gettext('Created new stacked branch referring to %s.') %
1227
1362
branch.get_stacked_on_url())
1228
1363
except (errors.NotStacked, errors.UnstackableBranchFormat,
1229
1364
errors.UnstackableRepositoryFormat), e:
1230
note('Branched %d revision(s).' % branch.revno())
1365
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1232
1367
# Bind to the parent
1233
1368
parent_branch = Branch.open(from_location)
1234
1369
branch.bind(parent_branch)
1235
note('New branch bound to %s' % from_location)
1370
note(gettext('New branch bound to %s') % from_location)
1237
1372
# Switch to the new branch
1238
1373
wt, _ = WorkingTree.open_containing('.')
1239
1374
_mod_switch.switch(wt.bzrdir, branch)
1240
note('Switched to branch: %s',
1375
note(gettext('Switched to branch: %s'),
1241
1376
urlutils.unescape_for_display(branch.base, 'utf-8'))
1379
class cmd_branches(Command):
1380
__doc__ = """List the branches available at the current location.
1382
This command will print the names of all the branches at the current
1386
takes_args = ['location?']
1388
Option('recursive', short_name='R',
1389
help='Recursively scan for branches rather than '
1390
'just looking in the specified location.')]
1392
def run(self, location=".", recursive=False):
1394
t = transport.get_transport(location)
1395
if not t.listable():
1396
raise errors.BzrCommandError(
1397
"Can't scan this type of location.")
1398
for b in controldir.ControlDir.find_branches(t):
1399
self.outf.write("%s\n" % urlutils.unescape_for_display(
1400
urlutils.relative_url(t.base, b.base),
1401
self.outf.encoding).rstrip("/"))
1403
dir = controldir.ControlDir.open_containing(location)[0]
1404
for branch in dir.list_branches():
1405
if branch.name is None:
1406
self.outf.write(gettext(" (default)\n"))
1408
self.outf.write(" %s\n" % branch.name.encode(
1409
self.outf.encoding))
1244
1412
class cmd_checkout(Command):
1245
1413
__doc__ = """Create a new checkout of an existing branch.
1348
1516
class cmd_update(Command):
1349
__doc__ = """Update a tree to have the latest code committed to its branch.
1351
This will perform a merge into the working tree, and may generate
1352
conflicts. If you have any local changes, you will still
1353
need to commit them after the update for the update to be complete.
1355
If you want to discard your local changes, you can just do a
1356
'bzr revert' instead of 'bzr commit' after the update.
1358
If the tree's branch is bound to a master branch, it will also update
1517
__doc__ = """Update a working tree to a new revision.
1519
This will perform a merge of the destination revision (the tip of the
1520
branch, or the specified revision) into the working tree, and then make
1521
that revision the basis revision for the working tree.
1523
You can use this to visit an older revision, or to update a working tree
1524
that is out of date from its branch.
1526
If there are any uncommitted changes in the tree, they will be carried
1527
across and remain as uncommitted changes after the update. To discard
1528
these changes, use 'bzr revert'. The uncommitted changes may conflict
1529
with the changes brought in by the change in basis revision.
1531
If the tree's branch is bound to a master branch, bzr will also update
1359
1532
the branch from the master.
1534
You cannot update just a single file or directory, because each Bazaar
1535
working tree has just a single basis revision. If you want to restore a
1536
file that has been removed locally, use 'bzr revert' instead of 'bzr
1537
update'. If you want to restore a file to its state in a previous
1538
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1539
out the old content of that file to a new location.
1541
The 'dir' argument, if given, must be the location of the root of a
1542
working tree to update. By default, the working tree that contains the
1543
current working directory is used.
1362
1546
_see_also = ['pull', 'working-trees', 'status-flags']
1363
1547
takes_args = ['dir?']
1364
takes_options = ['revision']
1548
takes_options = ['revision',
1550
help="Show base revision text in conflicts."),
1365
1552
aliases = ['up']
1367
def run(self, dir='.', revision=None):
1554
def run(self, dir=None, revision=None, show_base=None):
1368
1555
if revision is not None and len(revision) != 1:
1369
raise errors.BzrCommandError(
1370
"bzr update --revision takes exactly one revision")
1371
tree = WorkingTree.open_containing(dir)[0]
1556
raise errors.BzrCommandError(gettext(
1557
"bzr update --revision takes exactly one revision"))
1559
tree = WorkingTree.open_containing('.')[0]
1561
tree, relpath = WorkingTree.open_containing(dir)
1564
raise errors.BzrCommandError(gettext(
1565
"bzr update can only update a whole tree, "
1566
"not a file or subdirectory"))
1372
1567
branch = tree.branch
1373
1568
possible_transports = []
1374
1569
master = branch.get_master_branch(
1410
1605
change_reporter,
1411
1606
possible_transports=possible_transports,
1412
1607
revision=revision_id,
1609
show_base=show_base)
1414
1610
except errors.NoSuchRevision, e:
1415
raise errors.BzrCommandError(
1611
raise errors.BzrCommandError(gettext(
1416
1612
"branch has no revision %s\n"
1417
1613
"bzr update --revision only works"
1418
" for a revision in the branch history"
1614
" for a revision in the branch history")
1419
1615
% (e.revision))
1420
1616
revno = tree.branch.revision_id_to_dotted_revno(
1421
1617
_mod_revision.ensure_null(tree.last_revision()))
1422
note('Updated to revision %s of branch %s' %
1423
('.'.join(map(str, revno)), branch_location))
1618
note(gettext('Updated to revision {0} of branch {1}').format(
1619
'.'.join(map(str, revno)), branch_location))
1424
1620
parent_ids = tree.get_parent_ids()
1425
1621
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1426
note('Your local commits will now show as pending merges with '
1427
"'bzr status', and can be committed with 'bzr commit'.")
1622
note(gettext('Your local commits will now show as pending merges with '
1623
"'bzr status', and can be committed with 'bzr commit'."))
1428
1624
if conflicts != 0:
1472
1668
noise_level = 0
1473
1669
from bzrlib.info import show_bzrdir_info
1474
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1670
show_bzrdir_info(controldir.ControlDir.open_containing(location)[0],
1475
1671
verbose=noise_level, outfile=self.outf)
1478
1674
class cmd_remove(Command):
1479
1675
__doc__ = """Remove files or directories.
1481
This makes bzr stop tracking changes to the specified files. bzr will delete
1482
them if they can easily be recovered using revert. If no options or
1483
parameters are given bzr will scan for files that are being tracked by bzr
1484
but missing in your tree and stop tracking them for you.
1677
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1678
delete them if they can easily be recovered using revert otherwise they
1679
will be backed up (adding an extention of the form .~#~). If no options or
1680
parameters are given Bazaar will scan for files that are being tracked by
1681
Bazaar but missing in your tree and stop tracking them for you.
1486
1683
takes_args = ['file*']
1487
1684
takes_options = ['verbose',
1489
1686
RegistryOption.from_kwargs('file-deletion-strategy',
1490
1687
'The file deletion mode to be used.',
1491
1688
title='Deletion Strategy', value_switches=True, enum_switch=False,
1492
safe='Only delete files if they can be'
1493
' safely recovered (default).',
1689
safe='Backup changed files (default).',
1494
1690
keep='Delete from bzr but leave the working copy.',
1691
no_backup='Don\'t backup changed files.',
1495
1692
force='Delete all the specified files, even if they can not be '
1496
'recovered and even if they are non-empty directories.')]
1693
'recovered and even if they are non-empty directories. '
1694
'(deprecated, use no-backup)')]
1497
1695
aliases = ['rm', 'del']
1498
1696
encoding_type = 'replace'
1500
1698
def run(self, file_list, verbose=False, new=False,
1501
1699
file_deletion_strategy='safe'):
1700
if file_deletion_strategy == 'force':
1701
note(gettext("(The --force option is deprecated, rather use --no-backup "
1703
file_deletion_strategy = 'no-backup'
1502
1705
tree, file_list = WorkingTree.open_containing_paths(file_list)
1504
1707
if file_list is not None:
1674
1891
help='Specify a format for this branch. '
1675
1892
'See "help formats".',
1676
1893
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
1677
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
1894
converter=lambda name: controldir.format_registry.make_bzrdir(name),
1678
1895
value_switches=True,
1679
1896
title="Branch format",
1681
1898
Option('append-revisions-only',
1682
1899
help='Never change revnos or the existing log.'
1683
' Append revisions to it only.')
1900
' Append revisions to it only.'),
1902
'Create a branch without a working tree.')
1685
1904
def run(self, location=None, format=None, append_revisions_only=False,
1686
create_prefix=False):
1905
create_prefix=False, no_tree=False):
1687
1906
if format is None:
1688
format = bzrdir.format_registry.make_bzrdir('default')
1907
format = controldir.format_registry.make_bzrdir('default')
1689
1908
if location is None:
1690
1909
location = u'.'
1700
1919
to_transport.ensure_base()
1701
1920
except errors.NoSuchFile:
1702
1921
if not create_prefix:
1703
raise errors.BzrCommandError("Parent directory of %s"
1922
raise errors.BzrCommandError(gettext("Parent directory of %s"
1704
1923
" does not exist."
1705
1924
"\nYou may supply --create-prefix to create all"
1706
" leading parent directories."
1925
" leading parent directories.")
1708
1927
to_transport.create_prefix()
1711
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1930
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1712
1931
except errors.NotBranchError:
1713
1932
# really a NotBzrDir error...
1714
create_branch = bzrdir.BzrDir.create_branch_convenience
1933
create_branch = controldir.ControlDir.create_branch_convenience
1935
force_new_tree = False
1937
force_new_tree = None
1715
1938
branch = create_branch(to_transport.base, format=format,
1716
possible_transports=[to_transport])
1939
possible_transports=[to_transport],
1940
force_new_tree=force_new_tree)
1717
1941
a_bzrdir = branch.bzrdir
1719
1943
from bzrlib.transport.local import LocalTransport
1927
2170
elif ':' in prefix:
1928
2171
old_label, new_label = prefix.split(":")
1930
raise errors.BzrCommandError(
2173
raise errors.BzrCommandError(gettext(
1931
2174
'--prefix expects two values separated by a colon'
1932
' (eg "old/:new/")')
1934
if using is not None and diff_options is not None:
1935
raise errors.BzrCommandError(
1936
'--diff-options and --using are mutually exclusive.')
2175
' (eg "old/:new/")'))
1938
2177
if revision and len(revision) > 2:
1939
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1940
' one or two revision specifiers')
2178
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2179
' one or two revision specifiers'))
1942
2181
if using is not None and format is not None:
1943
raise errors.BzrCommandError('--using and --format are mutually '
2182
raise errors.BzrCommandError(gettext(
2183
'{0} and {1} are mutually exclusive').format(
2184
'--using', '--format'))
1946
2186
(old_tree, new_tree,
1947
2187
old_branch, new_branch,
2256
2501
Option('show-diff',
2257
2502
short_name='p',
2258
2503
help='Show changes made in each revision as a patch.'),
2259
Option('include-merges',
2504
Option('include-merged',
2260
2505
help='Show merged revisions like --levels 0 does.'),
2506
Option('include-merges', hidden=True,
2507
help='Historical alias for --include-merged.'),
2508
Option('omit-merges',
2509
help='Do not report commits with more than one parent.'),
2261
2510
Option('exclude-common-ancestry',
2262
2511
help='Display only the revisions that are not part'
2263
2512
' of both ancestries (require -rX..Y)'
2514
Option('signatures',
2515
help='Show digital signature validity'),
2518
help='Show revisions whose properties match this '
2521
ListOption('match-message',
2522
help='Show revisions whose message matches this '
2525
ListOption('match-committer',
2526
help='Show revisions whose committer matches this '
2529
ListOption('match-author',
2530
help='Show revisions whose authors match this '
2533
ListOption('match-bugs',
2534
help='Show revisions whose bugs match this '
2266
2538
encoding_type = 'replace'
2287
2567
_get_info_for_log_files,
2289
2569
direction = (forward and 'forward') or 'reverse'
2570
if symbol_versioning.deprecated_passed(include_merges):
2571
ui.ui_factory.show_user_warning(
2572
'deprecated_command_option',
2573
deprecated_name='--include-merges',
2574
recommended_name='--include-merged',
2575
deprecated_in_version='2.5',
2576
command=self.invoked_as)
2577
if include_merged is None:
2578
include_merged = include_merges
2580
raise errors.BzrCommandError(gettext(
2581
'{0} and {1} are mutually exclusive').format(
2582
'--include-merges', '--include-merged'))
2583
if include_merged is None:
2584
include_merged = False
2290
2585
if (exclude_common_ancestry
2291
2586
and (revision is None or len(revision) != 2)):
2292
raise errors.BzrCommandError(
2293
'--exclude-common-ancestry requires -r with two revisions')
2587
raise errors.BzrCommandError(gettext(
2588
'--exclude-common-ancestry requires -r with two revisions'))
2295
2590
if levels is None:
2298
raise errors.BzrCommandError(
2299
'--levels and --include-merges are mutually exclusive')
2593
raise errors.BzrCommandError(gettext(
2594
'{0} and {1} are mutually exclusive').format(
2595
'--levels', '--include-merged'))
2301
2597
if change is not None:
2302
2598
if len(change) > 1:
2303
2599
raise errors.RangeInChangeOption()
2304
2600
if revision is not None:
2305
raise errors.BzrCommandError(
2306
'--revision and --change are mutually exclusive')
2601
raise errors.BzrCommandError(gettext(
2602
'{0} and {1} are mutually exclusive').format(
2603
'--revision', '--change'))
2308
2605
revision = change
2685
3011
self.outf.write("%s\n" % pattern)
2687
3013
if not name_pattern_list:
2688
raise errors.BzrCommandError("ignore requires at least one "
2689
"NAME_PATTERN or --default-rules.")
3014
raise errors.BzrCommandError(gettext("ignore requires at least one "
3015
"NAME_PATTERN or --default-rules."))
2690
3016
name_pattern_list = [globbing.normalize_pattern(p)
2691
3017
for p in name_pattern_list]
2692
3018
bad_patterns = ''
3019
bad_patterns_count = 0
2693
3020
for p in name_pattern_list:
2694
3021
if not globbing.Globster.is_pattern_valid(p):
3022
bad_patterns_count += 1
2695
3023
bad_patterns += ('\n %s' % p)
2696
3024
if bad_patterns:
2697
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
3025
msg = (ngettext('Invalid ignore pattern found. %s',
3026
'Invalid ignore patterns found. %s',
3027
bad_patterns_count) % bad_patterns)
2698
3028
ui.ui_factory.show_error(msg)
2699
3029
raise errors.InvalidPattern('')
2700
3030
for name_pattern in name_pattern_list:
2701
3031
if (name_pattern[0] == '/' or
2702
3032
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2703
raise errors.BzrCommandError(
2704
"NAME_PATTERN should not be an absolute path")
3033
raise errors.BzrCommandError(gettext(
3034
"NAME_PATTERN should not be an absolute path"))
2705
3035
tree, relpath = WorkingTree.open_containing(directory)
2706
3036
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2707
3037
ignored = globbing.Globster(name_pattern_list)
2872
3203
old_file_id = rev_tree.path2id(relpath)
3205
# TODO: Split out this code to something that generically finds the
3206
# best id for a path across one or more trees; it's like
3207
# find_ids_across_trees but restricted to find just one. -- mbp
2874
3209
if name_from_revision:
2875
3210
# Try in revision if requested
2876
3211
if old_file_id is None:
2877
raise errors.BzrCommandError(
2878
"%r is not present in revision %s" % (
3212
raise errors.BzrCommandError(gettext(
3213
"{0!r} is not present in revision {1}").format(
2879
3214
filename, rev_tree.get_revision_id()))
2881
content = rev_tree.get_file_text(old_file_id)
3216
actual_file_id = old_file_id
2883
3218
cur_file_id = tree.path2id(relpath)
2885
if cur_file_id is not None:
2886
# Then try with the actual file id
2888
content = rev_tree.get_file_text(cur_file_id)
2890
except errors.NoSuchId:
2891
# The actual file id didn't exist at that time
2893
if not found and old_file_id is not None:
2894
# Finally try with the old file id
2895
content = rev_tree.get_file_text(old_file_id)
2898
# Can't be found anywhere
2899
raise errors.BzrCommandError(
2900
"%r is not present in revision %s" % (
3219
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3220
actual_file_id = cur_file_id
3221
elif old_file_id is not None:
3222
actual_file_id = old_file_id
3224
raise errors.BzrCommandError(gettext(
3225
"{0!r} is not present in revision {1}").format(
2901
3226
filename, rev_tree.get_revision_id()))
2903
from bzrlib.filters import (
2904
ContentFilterContext,
2905
filtered_output_bytes,
2907
filters = rev_tree._content_filter_stack(relpath)
2908
chunks = content.splitlines(True)
2909
content = filtered_output_bytes(chunks, filters,
2910
ContentFilterContext(relpath, rev_tree))
2912
self.outf.writelines(content)
3228
from bzrlib.filter_tree import ContentFilterTree
3229
filter_tree = ContentFilterTree(rev_tree,
3230
rev_tree._content_filter_stack)
3231
content = filter_tree.get_file_text(actual_file_id)
2915
self.outf.write(content)
3233
content = rev_tree.get_file_text(actual_file_id)
3235
self.outf.write(content)
2918
3238
class cmd_local_time_offset(Command):
2979
3299
to trigger updates to external systems like bug trackers. The --fixes
2980
3300
option can be used to record the association between a revision and
2981
3301
one or more bugs. See ``bzr help bugs`` for details.
2983
A selective commit may fail in some cases where the committed
2984
tree would be invalid. Consider::
2989
bzr commit foo -m "committing foo"
2990
bzr mv foo/bar foo/baz
2993
bzr commit foo/bar -m "committing bar but not baz"
2995
In the example above, the last commit will fail by design. This gives
2996
the user the opportunity to decide whether they want to commit the
2997
rename at the same time, separately first, or not at all. (As a general
2998
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3000
# TODO: Run hooks on tree to-be-committed, and after commit.
3002
# TODO: Strict commit that fails if there are deleted files.
3003
# (what does "deleted files" mean ??)
3005
# TODO: Give better message for -s, --summary, used by tla people
3007
# XXX: verbose currently does nothing
3009
3304
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3010
3305
takes_args = ['selected*']
3042
3337
Option('show-diff', short_name='p',
3043
3338
help='When no message is supplied, show the diff along'
3044
3339
' with the status summary in the message editor.'),
3341
help='When committing to a foreign version control '
3342
'system do not push data that can not be natively '
3046
3345
aliases = ['ci', 'checkin']
3048
3347
def _iter_bug_fix_urls(self, fixes, branch):
3348
default_bugtracker = None
3049
3349
# Configure the properties for bug fixing attributes.
3050
3350
for fixed_bug in fixes:
3051
3351
tokens = fixed_bug.split(':')
3052
if len(tokens) != 2:
3053
raise errors.BzrCommandError(
3352
if len(tokens) == 1:
3353
if default_bugtracker is None:
3354
branch_config = branch.get_config()
3355
default_bugtracker = branch_config.get_user_option(
3357
if default_bugtracker is None:
3358
raise errors.BzrCommandError(gettext(
3359
"No tracker specified for bug %s. Use the form "
3360
"'tracker:id' or specify a default bug tracker "
3361
"using the `bugtracker` option.\nSee "
3362
"\"bzr help bugs\" for more information on this "
3363
"feature. Commit refused.") % fixed_bug)
3364
tag = default_bugtracker
3366
elif len(tokens) != 2:
3367
raise errors.BzrCommandError(gettext(
3054
3368
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3055
3369
"See \"bzr help bugs\" for more information on this "
3056
"feature.\nCommit refused." % fixed_bug)
3057
tag, bug_id = tokens
3370
"feature.\nCommit refused.") % fixed_bug)
3372
tag, bug_id = tokens
3059
3374
yield bugtracker.get_bug_url(tag, branch, bug_id)
3060
3375
except errors.UnknownBugTrackerAbbreviation:
3061
raise errors.BzrCommandError(
3062
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3376
raise errors.BzrCommandError(gettext(
3377
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3063
3378
except errors.MalformedBugIdentifier, e:
3064
raise errors.BzrCommandError(
3065
"%s\nCommit refused." % (str(e),))
3379
raise errors.BzrCommandError(gettext(
3380
"%s\nCommit refused.") % (str(e),))
3067
3382
def run(self, message=None, file=None, verbose=False, selected_list=None,
3068
3383
unchanged=False, strict=False, local=False, fixes=None,
3069
author=None, show_diff=False, exclude=None, commit_time=None):
3384
author=None, show_diff=False, exclude=None, commit_time=None,
3070
3386
from bzrlib.errors import (
3071
3387
PointlessCommit,
3072
3388
ConflictsInTree,
3153
3464
# make_commit_message_template_encoded returns user encoding.
3154
3465
# We probably want to be using edit_commit_message instead to
3156
start_message = generate_commit_message_template(commit_obj)
3157
my_message = edit_commit_message_encoded(text,
3158
start_message=start_message)
3159
if my_message is None:
3160
raise errors.BzrCommandError("please specify a commit"
3161
" message with either --message or --file")
3162
if my_message == "":
3163
raise errors.BzrCommandError("empty commit message specified")
3467
my_message = set_commit_message(commit_obj)
3468
if my_message is None:
3469
start_message = generate_commit_message_template(commit_obj)
3470
my_message = edit_commit_message_encoded(text,
3471
start_message=start_message)
3472
if my_message is None:
3473
raise errors.BzrCommandError(gettext("please specify a commit"
3474
" message with either --message or --file"))
3475
if my_message == "":
3476
raise errors.BzrCommandError(gettext("Empty commit message specified."
3477
" Please specify a commit message with either"
3478
" --message or --file or leave a blank message"
3479
" with --message \"\"."))
3164
3480
return my_message
3166
3482
# The API permits a commit with a filter of [] to mean 'select nothing'
3174
3490
reporter=None, verbose=verbose, revprops=properties,
3175
3491
authors=author, timestamp=commit_stamp,
3176
3492
timezone=offset,
3177
exclude=tree.safe_relpath_files(exclude))
3493
exclude=tree.safe_relpath_files(exclude),
3178
3495
except PointlessCommit:
3179
raise errors.BzrCommandError("No changes to commit."
3180
" Use --unchanged to commit anyhow.")
3496
raise errors.BzrCommandError(gettext("No changes to commit."
3497
" Please 'bzr add' the files you want to commit, or use"
3498
" --unchanged to force an empty commit."))
3181
3499
except ConflictsInTree:
3182
raise errors.BzrCommandError('Conflicts detected in working '
3500
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3183
3501
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3185
3503
except StrictCommitFailed:
3186
raise errors.BzrCommandError("Commit refused because there are"
3187
" unknown files in the working tree.")
3504
raise errors.BzrCommandError(gettext("Commit refused because there are"
3505
" unknown files in the working tree."))
3188
3506
except errors.BoundBranchOutOfDate, e:
3189
e.extra_help = ("\n"
3507
e.extra_help = (gettext("\n"
3190
3508
'To commit to master branch, run update and then commit.\n'
3191
3509
'You can also pass --local to commit to continue working '
3266
3584
class cmd_upgrade(Command):
3267
__doc__ = """Upgrade branch storage to current format.
3269
The check command or bzr developers may sometimes advise you to run
3270
this command. When the default format has changed you may also be warned
3271
during other operations to upgrade.
3585
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3587
When the default format has changed after a major new release of
3588
Bazaar, you may be informed during certain operations that you
3589
should upgrade. Upgrading to a newer format may improve performance
3590
or make new features available. It may however limit interoperability
3591
with older repositories or with older versions of Bazaar.
3593
If you wish to upgrade to a particular format rather than the
3594
current default, that can be specified using the --format option.
3595
As a consequence, you can use the upgrade command this way to
3596
"downgrade" to an earlier format, though some conversions are
3597
a one way process (e.g. changing from the 1.x default to the
3598
2.x default) so downgrading is not always possible.
3600
A backup.bzr.~#~ directory is created at the start of the conversion
3601
process (where # is a number). By default, this is left there on
3602
completion. If the conversion fails, delete the new .bzr directory
3603
and rename this one back in its place. Use the --clean option to ask
3604
for the backup.bzr directory to be removed on successful conversion.
3605
Alternatively, you can delete it by hand if everything looks good
3608
If the location given is a shared repository, dependent branches
3609
are also converted provided the repository converts successfully.
3610
If the conversion of a branch fails, remaining branches are still
3613
For more information on upgrades, see the Bazaar Upgrade Guide,
3614
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3274
_see_also = ['check']
3617
_see_also = ['check', 'reconcile', 'formats']
3275
3618
takes_args = ['url?']
3276
3619
takes_options = [
3277
RegistryOption('format',
3278
help='Upgrade to a specific format. See "bzr help'
3279
' formats" for details.',
3280
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3281
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3282
value_switches=True, title='Branch format'),
3620
RegistryOption('format',
3621
help='Upgrade to a specific format. See "bzr help'
3622
' formats" for details.',
3623
lazy_registry=('bzrlib.controldir', 'format_registry'),
3624
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3625
value_switches=True, title='Branch format'),
3627
help='Remove the backup.bzr directory if successful.'),
3629
help="Show what would be done, but don't actually do anything."),
3285
def run(self, url='.', format=None):
3632
def run(self, url='.', format=None, clean=False, dry_run=False):
3286
3633
from bzrlib.upgrade import upgrade
3287
upgrade(url, format)
3634
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3636
if len(exceptions) == 1:
3637
# Compatibility with historical behavior
3290
3643
class cmd_whoami(Command):
3410
3767
def remove_alias(self, alias_name):
3411
3768
if alias_name is None:
3412
raise errors.BzrCommandError(
3413
'bzr alias --remove expects an alias to remove.')
3769
raise errors.BzrCommandError(gettext(
3770
'bzr alias --remove expects an alias to remove.'))
3414
3771
# If alias is not found, print something like:
3415
3772
# unalias: foo: not found
3416
c = config.GlobalConfig()
3773
c = _mod_config.GlobalConfig()
3417
3774
c.unset_alias(alias_name)
3419
3776
@display_command
3420
3777
def print_aliases(self):
3421
3778
"""Print out the defined aliases in a similar format to bash."""
3422
aliases = config.GlobalConfig().get_aliases()
3779
aliases = _mod_config.GlobalConfig().get_aliases()
3423
3780
for key, value in sorted(aliases.iteritems()):
3424
3781
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3608
3975
"matching_tests_first": first,
3609
3976
"list_only": list_only,
3610
3977
"random_seed": randomize,
3611
"exclude_pattern": exclude,
3978
"exclude_pattern": exclude_pattern,
3612
3979
"strict": strict,
3613
3980
"load_list": load_list,
3614
3981
"debug_flags": debugflag,
3615
3982
"starting_with": starting_with
3617
3984
selftest_kwargs.update(self.additional_selftest_args)
3618
result = selftest(**selftest_kwargs)
3986
# Make deprecation warnings visible, unless -Werror is set
3987
cleanup = symbol_versioning.activate_deprecation_warnings(
3990
result = tests.selftest(**selftest_kwargs)
3619
3993
return int(not result)
3995
def _disable_fsync(self):
3996
"""Change the 'os' functionality to not synchronize."""
3997
self._orig_fsync = getattr(os, 'fsync', None)
3998
if self._orig_fsync is not None:
3999
os.fsync = lambda filedes: None
4000
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4001
if self._orig_fdatasync is not None:
4002
os.fdatasync = lambda filedes: None
3622
4005
class cmd_version(Command):
3623
4006
__doc__ = """Show version of bzr."""
3676
4059
The source of the merge can be specified either in the form of a branch,
3677
4060
or in the form of a path to a file containing a merge directive generated
3678
4061
with bzr send. If neither is specified, the default is the upstream branch
3679
or the branch most recently merged using --remember.
3681
When merging a branch, by default the tip will be merged. To pick a different
3682
revision, pass --revision. If you specify two values, the first will be used as
3683
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3684
available revisions, like this is commonly referred to as "cherrypicking".
3686
Revision numbers are always relative to the branch being merged.
3688
By default, bzr will try to merge in all new work from the other
3689
branch, automatically determining an appropriate base. If this
3690
fails, you may need to give an explicit base.
4062
or the branch most recently merged using --remember. The source of the
4063
merge may also be specified in the form of a path to a file in another
4064
branch: in this case, only the modifications to that file are merged into
4065
the current working tree.
4067
When merging from a branch, by default bzr will try to merge in all new
4068
work from the other branch, automatically determining an appropriate base
4069
revision. If this fails, you may need to give an explicit base.
4071
To pick a different ending revision, pass "--revision OTHER". bzr will
4072
try to merge in all new work up to and including revision OTHER.
4074
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4075
through OTHER, excluding BASE but including OTHER, will be merged. If this
4076
causes some revisions to be skipped, i.e. if the destination branch does
4077
not already contain revision BASE, such a merge is commonly referred to as
4078
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4079
cherrypicks. The changes look like a normal commit, and the history of the
4080
changes from the other branch is not stored in the commit.
4082
Revision numbers are always relative to the source branch.
3692
4084
Merge will do its best to combine the changes in two branches, but there
3693
4085
are some kinds of problems only a human can fix. When it encounters those,
3697
4089
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3699
If there is no default branch set, the first merge will set it. After
3700
that, you can omit the branch to use the default. To change the
3701
default, use --remember. The value will only be saved if the remote
3702
location can be accessed.
4091
If there is no default branch set, the first merge will set it (use
4092
--no-remember to avoid setting it). After that, you can omit the branch
4093
to use the default. To change the default, use --remember. The value will
4094
only be saved if the remote location can be accessed.
3704
4096
The results of the merge are placed into the destination working
3705
4097
directory, where they can be reviewed (with bzr diff), tested, and then
3706
4098
committed to record the result of the merge.
3708
4100
merge refuses to run if there are any uncommitted changes, unless
3709
--force is given. The --force option can also be used to create a
4101
--force is given. If --force is given, then the changes from the source
4102
will be merged with the current working tree, including any uncommitted
4103
changes in the tree. The --force option can also be used to create a
3710
4104
merge revision which has more than two parents.
3712
4106
If one would like to merge changes from the working tree of the other
3810
4208
mergeable = None
3812
4210
if uncommitted:
3813
raise errors.BzrCommandError('Cannot use --uncommitted'
3814
' with bundles or merge directives.')
4211
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4212
' with bundles or merge directives.'))
3816
4214
if revision is not None:
3817
raise errors.BzrCommandError(
3818
'Cannot use -r with merge directives or bundles')
4215
raise errors.BzrCommandError(gettext(
4216
'Cannot use -r with merge directives or bundles'))
3819
4217
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3820
4218
mergeable, None)
3822
4220
if merger is None and uncommitted:
3823
4221
if revision is not None and len(revision) > 0:
3824
raise errors.BzrCommandError('Cannot use --uncommitted and'
3825
' --revision at the same time.')
4222
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4223
' --revision at the same time.'))
3826
4224
merger = self.get_merger_from_uncommitted(tree, location, None)
3827
4225
allow_pending = False
3836
4234
self.sanity_check_merger(merger)
3837
4235
if (merger.base_rev_id == merger.other_rev_id and
3838
4236
merger.other_rev_id is not None):
3839
note('Nothing to do.')
4237
# check if location is a nonexistent file (and not a branch) to
4238
# disambiguate the 'Nothing to do'
4239
if merger.interesting_files:
4240
if not merger.other_tree.has_filename(
4241
merger.interesting_files[0]):
4242
note(gettext("merger: ") + str(merger))
4243
raise errors.PathsDoNotExist([location])
4244
note(gettext('Nothing to do.'))
4246
if pull and not preview:
3842
4247
if merger.interesting_files is not None:
3843
raise errors.BzrCommandError('Cannot pull individual files')
4248
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3844
4249
if (merger.base_rev_id == tree.last_revision()):
3845
4250
result = tree.pull(merger.other_branch, False,
3846
4251
merger.other_rev_id)
3847
4252
result.report(self.outf)
3849
4254
if merger.this_basis is None:
3850
raise errors.BzrCommandError(
4255
raise errors.BzrCommandError(gettext(
3851
4256
"This branch has no commits."
3852
" (perhaps you would prefer 'bzr pull')")
4257
" (perhaps you would prefer 'bzr pull')"))
3854
4259
return self._do_preview(merger)
3855
4260
elif interactive:
3953
4358
if other_revision_id is None:
3954
4359
other_revision_id = _mod_revision.ensure_null(
3955
4360
other_branch.last_revision())
3956
# Remember where we merge from
3957
if ((remember or tree.branch.get_submit_branch() is None) and
3958
user_location is not None):
4361
# Remember where we merge from. We need to remember if:
4362
# - user specify a location (and we don't merge from the parent
4364
# - user ask to remember or there is no previous location set to merge
4365
# from and user didn't ask to *not* remember
4366
if (user_location is not None
4368
or (remember is None
4369
and tree.branch.get_submit_branch() is None)))):
3959
4370
tree.branch.set_submit_branch(other_branch.base)
3960
_merge_tags_if_possible(other_branch, tree.branch)
4371
# Merge tags (but don't set them in the master branch yet, the user
4372
# might revert this merge). Commit will propagate them.
4373
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3961
4374
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3962
4375
other_revision_id, base_revision_id, other_branch, base_branch)
3963
4376
if other_path != '':
4304
4720
theirs_only=False,
4305
4721
log_format=None, long=False, short=False, line=False,
4306
4722
show_ids=False, verbose=False, this=False, other=False,
4307
include_merges=False, revision=None, my_revision=None,
4723
include_merged=None, revision=None, my_revision=None,
4725
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4309
4726
from bzrlib.missing import find_unmerged, iter_log_revisions
4310
4727
def message(s):
4311
4728
if not is_quiet():
4312
4729
self.outf.write(s)
4731
if symbol_versioning.deprecated_passed(include_merges):
4732
ui.ui_factory.show_user_warning(
4733
'deprecated_command_option',
4734
deprecated_name='--include-merges',
4735
recommended_name='--include-merged',
4736
deprecated_in_version='2.5',
4737
command=self.invoked_as)
4738
if include_merged is None:
4739
include_merged = include_merges
4741
raise errors.BzrCommandError(gettext(
4742
'{0} and {1} are mutually exclusive').format(
4743
'--include-merges', '--include-merged'))
4744
if include_merged is None:
4745
include_merged = False
4315
4747
mine_only = this
4469
4905
@display_command
4470
4906
def run(self, verbose=False):
4471
import bzrlib.plugin
4472
from inspect import getdoc
4474
for name, plugin in bzrlib.plugin.plugins().items():
4475
version = plugin.__version__
4476
if version == 'unknown':
4478
name_ver = '%s %s' % (name, version)
4479
d = getdoc(plugin.module)
4481
doc = d.split('\n')[0]
4483
doc = '(no description)'
4484
result.append((name_ver, doc, plugin.path()))
4485
for name_ver, doc, path in sorted(result):
4486
self.outf.write("%s\n" % name_ver)
4487
self.outf.write(" %s\n" % doc)
4489
self.outf.write(" %s\n" % path)
4490
self.outf.write("\n")
4907
from bzrlib import plugin
4908
# Don't give writelines a generator as some codecs don't like that
4909
self.outf.writelines(
4910
list(plugin.describe_plugins(show_paths=verbose)))
4493
4913
class cmd_testament(Command):
4555
4977
self.add_cleanup(branch.lock_read().unlock)
4556
4978
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4557
4979
self.add_cleanup(tree.lock_read().unlock)
4980
if wt is not None and revision is None:
4559
4981
file_id = wt.path2id(relpath)
4561
4983
file_id = tree.path2id(relpath)
4562
4984
if file_id is None:
4563
4985
raise errors.NotVersionedError(filename)
4564
file_version = tree.inventory[file_id].revision
4565
4986
if wt is not None and revision is None:
4566
4987
# If there is a tree and we're not annotating historical
4567
4988
# versions, annotate the working tree's content.
4568
4989
annotate_file_tree(wt, file_id, self.outf, long, all,
4569
4990
show_ids=show_ids)
4571
annotate_file(branch, file_version, file_id, long, all, self.outf,
4992
annotate_file_tree(tree, file_id, self.outf, long, all,
4993
show_ids=show_ids, branch=branch)
4575
4996
class cmd_re_sign(Command):
4660
5081
location = b.get_old_bound_location()
4661
5082
except errors.UpgradeRequired:
4662
raise errors.BzrCommandError('No location supplied. '
4663
'This format does not remember old locations.')
5083
raise errors.BzrCommandError(gettext('No location supplied. '
5084
'This format does not remember old locations.'))
4665
5086
if location is None:
4666
5087
if b.get_bound_location() is not None:
4667
raise errors.BzrCommandError('Branch is already bound')
5088
raise errors.BzrCommandError(gettext('Branch is already bound'))
4669
raise errors.BzrCommandError('No location supplied '
4670
'and no previous location known')
5090
raise errors.BzrCommandError(gettext('No location supplied '
5091
'and no previous location known'))
4671
5092
b_other = Branch.open(location)
4673
5094
b.bind(b_other)
4674
5095
except errors.DivergedBranches:
4675
raise errors.BzrCommandError('These branches have diverged.'
4676
' Try merging, and then bind again.')
5096
raise errors.BzrCommandError(gettext('These branches have diverged.'
5097
' Try merging, and then bind again.'))
4677
5098
if b.get_config().has_explicit_nickname():
4678
5099
b.nick = b_other.nick
4745
5167
self.add_cleanup(tree.lock_write().unlock)
4747
5169
self.add_cleanup(b.lock_write().unlock)
4748
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5170
return self._run(b, tree, dry_run, verbose, revision, force,
4750
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5173
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4751
5175
from bzrlib.log import log_formatter, show_log
4752
5176
from bzrlib.uncommit import uncommit
4783
5207
end_revision=last_revno)
4786
self.outf.write('Dry-run, pretending to remove'
4787
' the above revisions.\n')
5210
self.outf.write(gettext('Dry-run, pretending to remove'
5211
' the above revisions.\n'))
4789
self.outf.write('The above revision(s) will be removed.\n')
5213
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4792
if not ui.ui_factory.get_boolean('Are you sure'):
4793
self.outf.write('Canceled')
5216
if not ui.ui_factory.confirm_action(
5217
gettext(u'Uncommit these revisions'),
5218
'bzrlib.builtins.uncommit',
5220
self.outf.write(gettext('Canceled\n'))
4796
5223
mutter('Uncommitting from {%s} to {%s}',
4797
5224
last_rev_id, rev_id)
4798
5225
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4799
revno=revno, local=local)
4800
self.outf.write('You can restore the old tip by running:\n'
4801
' bzr pull . -r revid:%s\n' % last_rev_id)
5226
revno=revno, local=local, keep_tags=keep_tags)
5227
self.outf.write(gettext('You can restore the old tip by running:\n'
5228
' bzr pull . -r revid:%s\n') % last_rev_id)
4804
5231
class cmd_break_lock(Command):
4805
__doc__ = """Break a dead lock on a repository, branch or working directory.
5232
__doc__ = """Break a dead lock.
5234
This command breaks a lock on a repository, branch, working directory or
4807
5237
CAUTION: Locks should only be broken when you are sure that the process
4808
5238
holding the lock has been stopped.
4815
5245
bzr break-lock bzr+ssh://example.com/bzr/foo
5246
bzr break-lock --conf ~/.bazaar
4817
5249
takes_args = ['location?']
5252
help='LOCATION is the directory where the config lock is.'),
5254
help='Do not ask for confirmation before breaking the lock.'),
4819
def run(self, location=None, show=False):
5257
def run(self, location=None, config=False, force=False):
4820
5258
if location is None:
4821
5259
location = u'.'
4822
control, relpath = bzrdir.BzrDir.open_containing(location)
4824
control.break_lock()
4825
except NotImplementedError:
5261
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5263
{'bzrlib.lockdir.break': True})
5265
conf = _mod_config.LockableConfig(file_name=location)
5268
control, relpath = controldir.ControlDir.open_containing(location)
5270
control.break_lock()
5271
except NotImplementedError:
4829
5275
class cmd_wait_until_signalled(Command):
4902
5350
if not allow_writes:
4903
5351
url = 'readonly+' + url
4904
5352
t = transport.get_transport(url)
4905
protocol(t, host, port, inet)
5354
protocol(t, host, port, inet, client_timeout)
5355
except TypeError, e:
5356
# We use symbol_versioning.deprecated_in just so that people
5357
# grepping can find it here.
5358
# symbol_versioning.deprecated_in((2, 5, 0))
5359
symbol_versioning.warn(
5360
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5361
'Most likely it needs to be updated to support a'
5362
' "timeout" parameter (added in bzr 2.5.0)'
5363
% (e, protocol.__module__, protocol),
5365
protocol(t, host, port, inet)
4908
5368
class cmd_join(Command):
5314
5780
self.add_cleanup(branch.lock_write().unlock)
5316
5782
if tag_name is None:
5317
raise errors.BzrCommandError("No tag specified to delete.")
5783
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5318
5784
branch.tags.delete_tag(tag_name)
5319
self.outf.write('Deleted tag %s.\n' % tag_name)
5785
note(gettext('Deleted tag %s.') % tag_name)
5322
5788
if len(revision) != 1:
5323
raise errors.BzrCommandError(
5789
raise errors.BzrCommandError(gettext(
5324
5790
"Tags can only be placed on a single revision, "
5326
5792
revision_id = revision[0].as_revision_id(branch)
5328
5794
revision_id = branch.last_revision()
5329
5795
if tag_name is None:
5330
5796
tag_name = branch.automatic_tag_name(revision_id)
5331
5797
if tag_name is None:
5332
raise errors.BzrCommandError(
5333
"Please specify a tag name.")
5334
if (not force) and branch.tags.has_tag(tag_name):
5798
raise errors.BzrCommandError(gettext(
5799
"Please specify a tag name."))
5801
existing_target = branch.tags.lookup_tag(tag_name)
5802
except errors.NoSuchTag:
5803
existing_target = None
5804
if not force and existing_target not in (None, revision_id):
5335
5805
raise errors.TagAlreadyExists(tag_name)
5336
branch.tags.set_tag(tag_name, revision_id)
5337
self.outf.write('Created tag %s.\n' % tag_name)
5806
if existing_target == revision_id:
5807
note(gettext('Tag %s already exists for that revision.') % tag_name)
5809
branch.tags.set_tag(tag_name, revision_id)
5810
if existing_target is None:
5811
note(gettext('Created tag %s.') % tag_name)
5813
note(gettext('Updated tag %s.') % tag_name)
5340
5816
class cmd_tags(Command):
5372
5843
self.add_cleanup(branch.lock_read().unlock)
5374
graph = branch.repository.get_graph()
5375
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5376
revid1, revid2 = rev1.rev_id, rev2.rev_id
5377
# only show revisions between revid1 and revid2 (inclusive)
5378
tags = [(tag, revid) for tag, revid in tags if
5379
graph.is_between(revid, revid1, revid2)]
5382
elif sort == 'time':
5384
for tag, revid in tags:
5386
revobj = branch.repository.get_revision(revid)
5387
except errors.NoSuchRevision:
5388
timestamp = sys.maxint # place them at the end
5390
timestamp = revobj.timestamp
5391
timestamps[revid] = timestamp
5392
tags.sort(key=lambda x: timestamps[x[1]])
5845
# Restrict to the specified range
5846
tags = self._tags_for_range(branch, revision)
5848
sort = tag_sort_methods.get()
5393
5850
if not show_ids:
5394
5851
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5395
5852
for index, (tag, revid) in enumerate(tags):
5406
5865
for tag, revspec in tags:
5407
5866
self.outf.write('%-20s %s\n' % (tag, revspec))
5868
def _tags_for_range(self, branch, revision):
5870
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5871
revid1, revid2 = rev1.rev_id, rev2.rev_id
5872
# _get_revision_range will always set revid2 if it's not specified.
5873
# If revid1 is None, it means we want to start from the branch
5874
# origin which is always a valid ancestor. If revid1 == revid2, the
5875
# ancestry check is useless.
5876
if revid1 and revid1 != revid2:
5877
# FIXME: We really want to use the same graph than
5878
# branch.iter_merge_sorted_revisions below, but this is not
5879
# easily available -- vila 2011-09-23
5880
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5881
# We don't want to output anything in this case...
5883
# only show revisions between revid1 and revid2 (inclusive)
5884
tagged_revids = branch.tags.get_reverse_tag_dict()
5886
for r in branch.iter_merge_sorted_revisions(
5887
start_revision_id=revid2, stop_revision_id=revid1,
5888
stop_rule='include'):
5889
revid_tags = tagged_revids.get(r[0], None)
5891
found.extend([(tag, r[0]) for tag in revid_tags])
5410
5895
class cmd_reconfigure(Command):
5411
5896
__doc__ = """Reconfigure the type of a bzr directory.
5425
5910
takes_args = ['location?']
5426
5911
takes_options = [
5427
5912
RegistryOption.from_kwargs(
5429
title='Target type',
5430
help='The type to reconfigure the directory to.',
5915
help='The relation between branch and tree.',
5431
5916
value_switches=True, enum_switch=False,
5432
5917
branch='Reconfigure to be an unbound branch with no working tree.',
5433
5918
tree='Reconfigure to be an unbound branch with a working tree.',
5434
5919
checkout='Reconfigure to be a bound branch with a working tree.',
5435
5920
lightweight_checkout='Reconfigure to be a lightweight'
5436
5921
' checkout (with no local history).',
5923
RegistryOption.from_kwargs(
5925
title='Repository type',
5926
help='Location fo the repository.',
5927
value_switches=True, enum_switch=False,
5437
5928
standalone='Reconfigure to be a standalone branch '
5438
5929
'(i.e. stop using shared repository).',
5439
5930
use_shared='Reconfigure to use a shared repository.',
5932
RegistryOption.from_kwargs(
5934
title='Trees in Repository',
5935
help='Whether new branches in the repository have trees.',
5936
value_switches=True, enum_switch=False,
5440
5937
with_trees='Reconfigure repository to create '
5441
5938
'working trees on branches by default.',
5442
5939
with_no_trees='Reconfigure repository to not create '
5459
def run(self, location=None, target_type=None, bind_to=None, force=False,
5462
directory = bzrdir.BzrDir.open(location)
5956
def run(self, location=None, bind_to=None, force=False,
5957
tree_type=None, repository_type=None, repository_trees=None,
5958
stacked_on=None, unstacked=None):
5959
directory = controldir.ControlDir.open(location)
5463
5960
if stacked_on and unstacked:
5464
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5961
raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
5465
5962
elif stacked_on is not None:
5466
5963
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5467
5964
elif unstacked:
5469
5966
# At the moment you can use --stacked-on and a different
5470
5967
# reconfiguration shape at the same time; there seems no good reason
5472
if target_type is None:
5969
if (tree_type is None and
5970
repository_type is None and
5971
repository_trees is None):
5473
5972
if stacked_on or unstacked:
5476
raise errors.BzrCommandError('No target configuration '
5478
elif target_type == 'branch':
5975
raise errors.BzrCommandError(gettext('No target configuration '
5977
reconfiguration = None
5978
if tree_type == 'branch':
5479
5979
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5480
elif target_type == 'tree':
5980
elif tree_type == 'tree':
5481
5981
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5482
elif target_type == 'checkout':
5982
elif tree_type == 'checkout':
5483
5983
reconfiguration = reconfigure.Reconfigure.to_checkout(
5484
5984
directory, bind_to)
5485
elif target_type == 'lightweight-checkout':
5985
elif tree_type == 'lightweight-checkout':
5486
5986
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5487
5987
directory, bind_to)
5488
elif target_type == 'use-shared':
5989
reconfiguration.apply(force)
5990
reconfiguration = None
5991
if repository_type == 'use-shared':
5489
5992
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5490
elif target_type == 'standalone':
5993
elif repository_type == 'standalone':
5491
5994
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5492
elif target_type == 'with-trees':
5996
reconfiguration.apply(force)
5997
reconfiguration = None
5998
if repository_trees == 'with-trees':
5493
5999
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5494
6000
directory, True)
5495
elif target_type == 'with-no-trees':
6001
elif repository_trees == 'with-no-trees':
5496
6002
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5497
6003
directory, False)
5498
reconfiguration.apply(force)
6005
reconfiguration.apply(force)
6006
reconfiguration = None
5501
6009
class cmd_switch(Command):
5689
6197
name = current_view
5692
raise errors.BzrCommandError(
5693
"Both --delete and a file list specified")
6200
raise errors.BzrCommandError(gettext(
6201
"Both --delete and a file list specified"))
5695
raise errors.BzrCommandError(
5696
"Both --delete and --switch specified")
6203
raise errors.BzrCommandError(gettext(
6204
"Both --delete and --switch specified"))
5698
6206
tree.views.set_view_info(None, {})
5699
self.outf.write("Deleted all views.\n")
6207
self.outf.write(gettext("Deleted all views.\n"))
5700
6208
elif name is None:
5701
raise errors.BzrCommandError("No current view to delete")
6209
raise errors.BzrCommandError(gettext("No current view to delete"))
5703
6211
tree.views.delete_view(name)
5704
self.outf.write("Deleted '%s' view.\n" % name)
6212
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5707
raise errors.BzrCommandError(
5708
"Both --switch and a file list specified")
6215
raise errors.BzrCommandError(gettext(
6216
"Both --switch and a file list specified"))
5710
raise errors.BzrCommandError(
5711
"Both --switch and --all specified")
6218
raise errors.BzrCommandError(gettext(
6219
"Both --switch and --all specified"))
5712
6220
elif switch == 'off':
5713
6221
if current_view is None:
5714
raise errors.BzrCommandError("No current view to disable")
6222
raise errors.BzrCommandError(gettext("No current view to disable"))
5715
6223
tree.views.set_view_info(None, view_dict)
5716
self.outf.write("Disabled '%s' view.\n" % (current_view))
6224
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5718
6226
tree.views.set_view_info(switch, view_dict)
5719
6227
view_str = views.view_display_str(tree.views.lookup_view())
5720
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6228
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5723
self.outf.write('Views defined:\n')
6231
self.outf.write(gettext('Views defined:\n'))
5724
6232
for view in sorted(view_dict):
5725
6233
if view == current_view:
5729
6237
view_str = views.view_display_str(view_dict[view])
5730
6238
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5732
self.outf.write('No views defined.\n')
6240
self.outf.write(gettext('No views defined.\n'))
5733
6241
elif file_list:
5734
6242
if name is None:
5735
6243
# No name given and no current view set
5737
6245
elif name == 'off':
5738
raise errors.BzrCommandError(
5739
"Cannot change the 'off' pseudo view")
6246
raise errors.BzrCommandError(gettext(
6247
"Cannot change the 'off' pseudo view"))
5740
6248
tree.views.set_view(name, sorted(file_list))
5741
6249
view_str = views.view_display_str(tree.views.lookup_view())
5742
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6250
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5744
6252
# list the files
5745
6253
if name is None:
5746
6254
# No name given and no current view set
5747
self.outf.write('No current view.\n')
6255
self.outf.write(gettext('No current view.\n'))
5749
6257
view_str = views.view_display_str(tree.views.lookup_view(name))
5750
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6258
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5753
6261
class cmd_hooks(Command):
5985
6507
self.outf.write('%s %s\n' % (path, location))
6510
class cmd_export_pot(Command):
6511
__doc__ = """Export command helps and error messages in po format."""
6514
takes_options = [Option('plugin',
6515
help='Export help text from named command '\
6516
'(defaults to all built in commands).',
6519
def run(self, plugin=None):
6520
from bzrlib.export_pot import export_pot
6521
export_pot(self.outf, plugin)
5988
6524
def _register_lazy_builtins():
5989
6525
# register lazy builtins from other modules; called at startup and should
5990
6526
# be only called once.
5991
6527
for (name, aliases, module_name) in [
5992
6528
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6529
('cmd_config', [], 'bzrlib.config'),
5993
6530
('cmd_dpush', [], 'bzrlib.foreign'),
5994
6531
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5995
6532
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5996
6533
('cmd_conflicts', [], 'bzrlib.conflicts'),
5997
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6534
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6535
('cmd_verify_signatures', [],
6536
'bzrlib.commit_signature_commands'),
6537
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
5999
6539
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
