72
78
_parse_revision_str,
74
80
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
77
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
80
return internal_tree_files(file_list, default_branch, canonicalize,
86
def _get_branch_location(control_dir, possible_transports=None):
87
"""Return location of branch for this control dir."""
89
target = control_dir.get_branch_reference()
90
except errors.NotBranchError:
91
return control_dir.root_transport.base
92
if target is not None:
94
this_branch = control_dir.open_branch(
95
possible_transports=possible_transports)
96
# This may be a heavy checkout, where we want the master branch
97
master_location = this_branch.get_bound_location()
98
if master_location is not None:
99
return master_location
100
# If not, use a local sibling
101
return this_branch.base
104
def _is_colocated(control_dir, possible_transports=None):
105
"""Check if the branch in control_dir is colocated.
107
:param control_dir: Control directory
108
:return: Tuple with boolean indicating whether the branch is colocated
109
and the full URL to the actual branch
111
# This path is meant to be relative to the existing branch
112
this_url = _get_branch_location(control_dir,
113
possible_transports=possible_transports)
114
# Perhaps the target control dir supports colocated branches?
116
root = controldir.ControlDir.open(this_url,
117
possible_transports=possible_transports)
118
except errors.NotBranchError:
119
return (False, this_url)
122
wt = control_dir.open_workingtree()
123
except (errors.NoWorkingTree, errors.NotLocalUrl):
124
return (False, this_url)
127
root._format.colocated_branches and
128
control_dir.control_url == root.control_url,
132
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
133
"""Lookup the location for a new sibling branch.
135
:param control_dir: Control directory to find sibling branches from
136
:param location: Name of the new branch
137
:return: Full location to the new branch
139
location = directory_service.directories.dereference(location)
140
if '/' not in location and '\\' not in location:
141
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
144
return urlutils.join_segment_parameters(this_url,
145
{"branch": urlutils.escape(location)})
147
return urlutils.join(this_url, '..', urlutils.escape(location))
151
def open_sibling_branch(control_dir, location, possible_transports=None):
152
"""Open a branch, possibly a sibling of another.
154
:param control_dir: Control directory relative to which to lookup the
156
:param location: Location to look up
157
:return: branch to open
160
# Perhaps it's a colocated branch?
161
return control_dir.open_branch(location,
162
possible_transports=possible_transports)
163
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
164
this_url = _get_branch_location(control_dir)
167
this_url, '..', urlutils.escape(location)))
170
def open_nearby_branch(near=None, location=None, possible_transports=None):
171
"""Open a nearby branch.
173
:param near: Optional location of container from which to open branch
174
:param location: Location of the branch
175
:return: Branch instance
181
return Branch.open(location,
182
possible_transports=possible_transports)
183
except errors.NotBranchError:
185
cdir = controldir.ControlDir.open(near,
186
possible_transports=possible_transports)
187
return open_sibling_branch(cdir, location,
188
possible_transports=possible_transports)
191
def iter_sibling_branches(control_dir, possible_transports=None):
192
"""Iterate over the siblings of a branch.
194
:param control_dir: Control directory for which to look up the siblings
195
:return: Iterator over tuples with branch name and branch object
199
reference = control_dir.get_branch_reference()
200
except errors.NotBranchError:
201
# There is no active branch, just return the colocated branches.
202
for name, branch in control_dir.get_branches().iteritems():
205
if reference is not None:
206
ref_branch = Branch.open(reference,
207
possible_transports=possible_transports)
210
if ref_branch is None or ref_branch.name:
211
if ref_branch is not None:
212
control_dir = ref_branch.bzrdir
213
for name, branch in control_dir.get_branches().iteritems():
216
repo = ref_branch.bzrdir.find_repository()
217
for branch in repo.find_branches(using=True):
218
name = urlutils.relative_url(repo.user_url,
219
branch.user_url).rstrip("/")
84
223
def tree_files_for_add(file_list):
149
# XXX: Bad function name; should possibly also be a class method of
150
# WorkingTree rather than a function.
151
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
152
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
154
"""Convert command-line paths to a WorkingTree and relative paths.
156
Deprecated: use WorkingTree.open_containing_paths instead.
158
This is typically used for command-line processors that take one or
159
more filenames, and infer the workingtree that contains them.
161
The filenames given are not required to exist.
163
:param file_list: Filenames to convert.
165
:param default_branch: Fallback tree path to use if file_list is empty or
168
:param apply_view: if True and a view is set, apply it or check that
169
specified files are within it
171
:return: workingtree, [relative_paths]
173
return WorkingTree.open_containing_paths(
174
file_list, default_directory='.',
179
288
def _get_view_info_for_change_reporter(tree):
180
289
"""Get the view information from a tree for change reporting."""
471
594
raise errors.ShelvedChanges(working)
473
596
if working.user_url != working.branch.user_url:
474
raise errors.BzrCommandError("You cannot remove the working tree"
475
" from a lightweight checkout")
597
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
598
" from a lightweight checkout"))
477
600
d.destroy_workingtree()
603
class cmd_repair_workingtree(Command):
604
__doc__ = """Reset the working tree state file.
606
This is not meant to be used normally, but more as a way to recover from
607
filesystem corruption, etc. This rebuilds the working inventory back to a
608
'known good' state. Any new modifications (adding a file, renaming, etc)
609
will be lost, though modified files will still be detected as such.
611
Most users will want something more like "bzr revert" or "bzr update"
612
unless the state file has become corrupted.
614
By default this attempts to recover the current state by looking at the
615
headers of the state file. If the state file is too corrupted to even do
616
that, you can supply --revision to force the state of the tree.
619
takes_options = ['revision', 'directory',
621
help='Reset the tree even if it doesn\'t appear to be'
626
def run(self, revision=None, directory='.', force=False):
627
tree, _ = WorkingTree.open_containing(directory)
628
self.add_cleanup(tree.lock_tree_write().unlock)
632
except errors.BzrError:
633
pass # There seems to be a real error here, so we'll reset
636
raise errors.BzrCommandError(gettext(
637
'The tree does not appear to be corrupt. You probably'
638
' want "bzr revert" instead. Use "--force" if you are'
639
' sure you want to reset the working tree.'))
643
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
645
tree.reset_state(revision_ids)
646
except errors.BzrError, e:
647
if revision_ids is None:
648
extra = (gettext(', the header appears corrupt, try passing -r -1'
649
' to set the state to the last commit'))
652
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
480
655
class cmd_revno(Command):
481
656
__doc__ = """Show current revision number.
486
661
_see_also = ['info']
487
662
takes_args = ['location?']
488
663
takes_options = [
489
Option('tree', help='Show revno of working tree'),
664
Option('tree', help='Show revno of working tree.'),
493
def run(self, tree=False, location=u'.'):
669
def run(self, tree=False, location=u'.', revision=None):
670
if revision is not None and tree:
671
raise errors.BzrCommandError(gettext("--tree and --revision can "
672
"not be used together"))
496
676
wt = WorkingTree.open_containing(location)[0]
497
677
self.add_cleanup(wt.lock_read().unlock)
498
678
except (errors.NoWorkingTree, errors.NotLocalUrl):
499
679
raise errors.NoWorkingTree(location)
500
681
revid = wt.last_revision()
502
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
503
except errors.NoSuchRevision:
505
revno = ".".join(str(n) for n in revno_t)
507
683
b = Branch.open_containing(location)[0]
508
684
self.add_cleanup(b.lock_read().unlock)
686
if len(revision) != 1:
687
raise errors.BzrCommandError(gettext(
688
"Tags can only be placed on a single revision, "
690
revid = revision[0].as_revision_id(b)
692
revid = b.last_revision()
694
revno_t = b.revision_id_to_dotted_revno(revid)
695
except errors.NoSuchRevision:
697
revno = ".".join(str(n) for n in revno_t)
510
698
self.cleanup_now()
511
self.outf.write(str(revno) + '\n')
699
self.outf.write(revno + '\n')
514
702
class cmd_revision_info(Command):
662
859
takes_args = ['dir+']
863
help='No error if existing, make parent directories as needed.',
663
867
encoding_type = 'replace'
665
def run(self, dir_list):
667
wt, dd = WorkingTree.open_containing(d)
668
base = os.path.dirname(dd)
669
id = wt.path2id(base)
673
self.outf.write('added %s\n' % d)
870
def add_file_with_parents(cls, wt, relpath):
871
if wt.path2id(relpath) is not None:
873
cls.add_file_with_parents(wt, osutils.dirname(relpath))
877
def add_file_single(cls, wt, relpath):
880
def run(self, dir_list, parents=False):
882
add_file = self.add_file_with_parents
884
add_file = self.add_file_single
886
wt, relpath = WorkingTree.open_containing(dir)
891
if e.errno != errno.EEXIST:
675
raise errors.NotVersionedError(path=base)
895
add_file(wt, relpath)
897
self.outf.write(gettext('added %s\n') % dir)
678
900
class cmd_relpath(Command):
784
1007
return self.run_auto(names_list, after, dry_run)
786
raise errors.BzrCommandError('--dry-run requires --auto.')
1009
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
787
1010
if names_list is None:
789
1012
if len(names_list) < 2:
790
raise errors.BzrCommandError("missing file argument")
1013
raise errors.BzrCommandError(gettext("missing file argument"))
791
1014
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1015
for file_name in rel_names[0:-1]:
1017
raise errors.BzrCommandError(gettext("can not move root of branch"))
792
1018
self.add_cleanup(tree.lock_tree_write().unlock)
793
1019
self._run(tree, names_list, rel_names, after)
795
1021
def run_auto(self, names_list, after, dry_run):
796
1022
if names_list is not None and len(names_list) > 1:
797
raise errors.BzrCommandError('Only one path may be specified to'
1023
raise errors.BzrCommandError(gettext('Only one path may be specified to'
800
raise errors.BzrCommandError('--after cannot be specified with'
1026
raise errors.BzrCommandError(gettext('--after cannot be specified with'
802
1028
work_tree, file_list = WorkingTree.open_containing_paths(
803
1029
names_list, default_directory='.')
804
1030
self.add_cleanup(work_tree.lock_tree_write().unlock)
1056
1311
Option('strict',
1057
1312
help='Refuse to push if there are uncommitted changes in'
1058
1313
' the working tree, --no-strict disables the check.'),
1315
help="Don't populate the working tree, even for protocols"
1316
" that support it."),
1317
Option('overwrite-tags',
1318
help="Overwrite tags only."),
1060
1320
takes_args = ['location?']
1061
1321
encoding_type = 'replace'
1063
def run(self, location=None, remember=False, overwrite=False,
1323
def run(self, location=None, remember=None, overwrite=False,
1064
1324
create_prefix=False, verbose=False, revision=None,
1065
1325
use_existing_dir=False, directory=None, stacked_on=None,
1066
stacked=False, strict=None):
1326
stacked=False, strict=None, no_tree=False,
1327
overwrite_tags=False):
1067
1328
from bzrlib.push import _show_push_branch
1331
overwrite = ["history", "tags"]
1332
elif overwrite_tags:
1333
overwrite = ["tags"]
1069
1337
if directory is None:
1070
1338
directory = '.'
1071
1339
# Get the source branch
1072
1340
(tree, br_from,
1073
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1341
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1074
1342
# Get the tip's revision_id
1075
1343
revision = _get_one_revision('push', revision)
1076
1344
if revision is not None:
1097
1365
# error by the feedback given to them. RBC 20080227.
1098
1366
stacked_on = parent_url
1099
1367
if not stacked_on:
1100
raise errors.BzrCommandError(
1101
"Could not determine branch to refer to.")
1368
raise errors.BzrCommandError(gettext(
1369
"Could not determine branch to refer to."))
1103
1371
# Get the destination location
1104
1372
if location is None:
1105
1373
stored_loc = br_from.get_push_location()
1106
1374
if stored_loc is None:
1107
raise errors.BzrCommandError(
1108
"No push location known or specified.")
1375
parent_loc = br_from.get_parent()
1377
raise errors.BzrCommandError(gettext(
1378
"No push location known or specified. To push to the "
1379
"parent branch (at %s), use 'bzr push :parent'." %
1380
urlutils.unescape_for_display(parent_loc,
1381
self.outf.encoding)))
1383
raise errors.BzrCommandError(gettext(
1384
"No push location known or specified."))
1110
1386
display_url = urlutils.unescape_for_display(stored_loc,
1111
1387
self.outf.encoding)
1112
self.outf.write("Using saved push location: %s\n" % display_url)
1388
note(gettext("Using saved push location: %s") % display_url)
1113
1389
location = stored_loc
1115
1391
_show_push_branch(br_from, revision_id, location, self.outf,
1116
1392
verbose=verbose, overwrite=overwrite, remember=remember,
1117
1393
stacked_on=stacked_on, create_prefix=create_prefix,
1118
use_existing_dir=use_existing_dir)
1394
use_existing_dir=use_existing_dir, no_tree=no_tree)
1121
1397
class cmd_branch(Command):
1185
1469
revision_id = br_from.last_revision()
1186
1470
if to_location is None:
1187
to_location = urlutils.derive_to_location(from_location)
1471
to_location = getattr(br_from, "name", None)
1473
to_location = urlutils.derive_to_location(from_location)
1188
1474
to_transport = transport.get_transport(to_location)
1190
1476
to_transport.mkdir('.')
1191
1477
except errors.FileExists:
1192
if not use_existing_dir:
1193
raise errors.BzrCommandError('Target directory "%s" '
1194
'already exists.' % to_location)
1479
to_dir = controldir.ControlDir.open_from_transport(
1481
except errors.NotBranchError:
1482
if not use_existing_dir:
1483
raise errors.BzrCommandError(gettext('Target directory "%s" '
1484
'already exists.') % to_location)
1197
bzrdir.BzrDir.open_from_transport(to_transport)
1489
to_dir.open_branch()
1198
1490
except errors.NotBranchError:
1201
1493
raise errors.AlreadyBranchError(to_location)
1202
1494
except errors.NoSuchFile:
1203
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1495
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1206
# preserve whatever source format we have.
1207
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1208
possible_transports=[to_transport],
1209
accelerator_tree=accelerator_tree,
1210
hardlink=hardlink, stacked=stacked,
1211
force_new_repo=standalone,
1212
create_tree_if_local=not no_tree,
1213
source_branch=br_from)
1214
branch = dir.open_branch()
1215
except errors.NoSuchRevision:
1216
to_transport.delete_tree('.')
1217
msg = "The branch %s has no revision %s." % (from_location,
1219
raise errors.BzrCommandError(msg)
1501
# preserve whatever source format we have.
1502
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1503
possible_transports=[to_transport],
1504
accelerator_tree=accelerator_tree,
1505
hardlink=hardlink, stacked=stacked,
1506
force_new_repo=standalone,
1507
create_tree_if_local=not no_tree,
1508
source_branch=br_from)
1509
branch = to_dir.open_branch(
1510
possible_transports=[
1511
br_from.bzrdir.root_transport, to_transport])
1512
except errors.NoSuchRevision:
1513
to_transport.delete_tree('.')
1514
msg = gettext("The branch {0} has no revision {1}.").format(
1515
from_location, revision)
1516
raise errors.BzrCommandError(msg)
1519
to_repo = to_dir.open_repository()
1520
except errors.NoRepositoryPresent:
1521
to_repo = to_dir.create_repository()
1522
to_repo.fetch(br_from.repository, revision_id=revision_id)
1523
branch = br_from.sprout(to_dir, revision_id=revision_id)
1220
1524
_merge_tags_if_possible(br_from, branch)
1221
1525
# If the source branch is stacked, the new branch may
1222
1526
# be stacked whether we asked for that explicitly or not.
1223
1527
# We therefore need a try/except here and not just 'if stacked:'
1225
note('Created new stacked branch referring to %s.' %
1529
note(gettext('Created new stacked branch referring to %s.') %
1226
1530
branch.get_stacked_on_url())
1227
1531
except (errors.NotStacked, errors.UnstackableBranchFormat,
1228
1532
errors.UnstackableRepositoryFormat), e:
1229
note('Branched %d revision(s).' % branch.revno())
1533
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1231
1535
# Bind to the parent
1232
1536
parent_branch = Branch.open(from_location)
1233
1537
branch.bind(parent_branch)
1234
note('New branch bound to %s' % from_location)
1538
note(gettext('New branch bound to %s') % from_location)
1236
1540
# Switch to the new branch
1237
1541
wt, _ = WorkingTree.open_containing('.')
1238
1542
_mod_switch.switch(wt.bzrdir, branch)
1239
note('Switched to branch: %s',
1543
note(gettext('Switched to branch: %s'),
1240
1544
urlutils.unescape_for_display(branch.base, 'utf-8'))
1547
class cmd_branches(Command):
1548
__doc__ = """List the branches available at the current location.
1550
This command will print the names of all the branches at the current
1554
takes_args = ['location?']
1556
Option('recursive', short_name='R',
1557
help='Recursively scan for branches rather than '
1558
'just looking in the specified location.')]
1560
def run(self, location=".", recursive=False):
1562
t = transport.get_transport(location)
1563
if not t.listable():
1564
raise errors.BzrCommandError(
1565
"Can't scan this type of location.")
1566
for b in controldir.ControlDir.find_branches(t):
1567
self.outf.write("%s\n" % urlutils.unescape_for_display(
1568
urlutils.relative_url(t.base, b.base),
1569
self.outf.encoding).rstrip("/"))
1571
dir = controldir.ControlDir.open_containing(location)[0]
1573
active_branch = dir.open_branch(name="")
1574
except errors.NotBranchError:
1575
active_branch = None
1577
for name, branch in iter_sibling_branches(dir):
1580
active = (active_branch is not None and
1581
active_branch.base == branch.base)
1582
names[name] = active
1583
# Only mention the current branch explicitly if it's not
1584
# one of the colocated branches
1585
if not any(names.values()) and active_branch is not None:
1586
self.outf.write("* %s\n" % gettext("(default)"))
1587
for name in sorted(names.keys()):
1588
active = names[name]
1593
self.outf.write("%s %s\n" % (
1594
prefix, name.encode(self.outf.encoding)))
1243
1597
class cmd_checkout(Command):
1244
1598
__doc__ = """Create a new checkout of an existing branch.
1347
1699
class cmd_update(Command):
1348
__doc__ = """Update a tree to have the latest code committed to its branch.
1350
This will perform a merge into the working tree, and may generate
1351
conflicts. If you have any local changes, you will still
1352
need to commit them after the update for the update to be complete.
1354
If you want to discard your local changes, you can just do a
1355
'bzr revert' instead of 'bzr commit' after the update.
1357
If you want to restore a file that has been removed locally, use
1358
'bzr revert' instead of 'bzr update'.
1360
If the tree's branch is bound to a master branch, it will also update
1700
__doc__ = """Update a working tree to a new revision.
1702
This will perform a merge of the destination revision (the tip of the
1703
branch, or the specified revision) into the working tree, and then make
1704
that revision the basis revision for the working tree.
1706
You can use this to visit an older revision, or to update a working tree
1707
that is out of date from its branch.
1709
If there are any uncommitted changes in the tree, they will be carried
1710
across and remain as uncommitted changes after the update. To discard
1711
these changes, use 'bzr revert'. The uncommitted changes may conflict
1712
with the changes brought in by the change in basis revision.
1714
If the tree's branch is bound to a master branch, bzr will also update
1361
1715
the branch from the master.
1717
You cannot update just a single file or directory, because each Bazaar
1718
working tree has just a single basis revision. If you want to restore a
1719
file that has been removed locally, use 'bzr revert' instead of 'bzr
1720
update'. If you want to restore a file to its state in a previous
1721
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1722
out the old content of that file to a new location.
1724
The 'dir' argument, if given, must be the location of the root of a
1725
working tree to update. By default, the working tree that contains the
1726
current working directory is used.
1364
1729
_see_also = ['pull', 'working-trees', 'status-flags']
1365
1730
takes_args = ['dir?']
1366
takes_options = ['revision']
1731
takes_options = ['revision',
1733
help="Show base revision text in conflicts."),
1367
1735
aliases = ['up']
1369
def run(self, dir='.', revision=None):
1737
def run(self, dir=None, revision=None, show_base=None):
1370
1738
if revision is not None and len(revision) != 1:
1371
raise errors.BzrCommandError(
1372
"bzr update --revision takes exactly one revision")
1373
tree = WorkingTree.open_containing(dir)[0]
1739
raise errors.BzrCommandError(gettext(
1740
"bzr update --revision takes exactly one revision"))
1742
tree = WorkingTree.open_containing('.')[0]
1744
tree, relpath = WorkingTree.open_containing(dir)
1747
raise errors.BzrCommandError(gettext(
1748
"bzr update can only update a whole tree, "
1749
"not a file or subdirectory"))
1374
1750
branch = tree.branch
1375
1751
possible_transports = []
1376
1752
master = branch.get_master_branch(
1412
1788
change_reporter,
1413
1789
possible_transports=possible_transports,
1414
1790
revision=revision_id,
1792
show_base=show_base)
1416
1793
except errors.NoSuchRevision, e:
1417
raise errors.BzrCommandError(
1794
raise errors.BzrCommandError(gettext(
1418
1795
"branch has no revision %s\n"
1419
1796
"bzr update --revision only works"
1420
" for a revision in the branch history"
1797
" for a revision in the branch history")
1421
1798
% (e.revision))
1422
1799
revno = tree.branch.revision_id_to_dotted_revno(
1423
1800
_mod_revision.ensure_null(tree.last_revision()))
1424
note('Updated to revision %s of branch %s' %
1425
('.'.join(map(str, revno)), branch_location))
1801
note(gettext('Updated to revision {0} of branch {1}').format(
1802
'.'.join(map(str, revno)), branch_location))
1426
1803
parent_ids = tree.get_parent_ids()
1427
1804
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1428
note('Your local commits will now show as pending merges with '
1429
"'bzr status', and can be committed with 'bzr commit'.")
1805
note(gettext('Your local commits will now show as pending merges with '
1806
"'bzr status', and can be committed with 'bzr commit'."))
1430
1807
if conflicts != 0:
1708
2096
to_transport.ensure_base()
1709
2097
except errors.NoSuchFile:
1710
2098
if not create_prefix:
1711
raise errors.BzrCommandError("Parent directory of %s"
2099
raise errors.BzrCommandError(gettext("Parent directory of %s"
1712
2100
" does not exist."
1713
2101
"\nYou may supply --create-prefix to create all"
1714
" leading parent directories."
2102
" leading parent directories.")
1716
2104
to_transport.create_prefix()
1719
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2107
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1720
2108
except errors.NotBranchError:
1721
2109
# really a NotBzrDir error...
1722
create_branch = bzrdir.BzrDir.create_branch_convenience
2110
create_branch = controldir.ControlDir.create_branch_convenience
2112
force_new_tree = False
2114
force_new_tree = None
1723
2115
branch = create_branch(to_transport.base, format=format,
1724
possible_transports=[to_transport])
2116
possible_transports=[to_transport],
2117
force_new_tree=force_new_tree)
1725
2118
a_bzrdir = branch.bzrdir
1727
2120
from bzrlib.transport.local import LocalTransport
1803
2198
def run(self, location, format=None, no_trees=False):
1804
2199
if format is None:
1805
format = bzrdir.format_registry.make_bzrdir('default')
2200
format = controldir.format_registry.make_bzrdir('default')
1807
2202
if location is None:
1810
2205
to_transport = transport.get_transport(location)
1811
to_transport.ensure_base()
1813
newdir = format.initialize_on_transport(to_transport)
1814
repo = newdir.create_repository(shared=True)
1815
repo.set_make_working_trees(not no_trees)
2207
(repo, newdir, require_stacking, repository_policy) = (
2208
format.initialize_on_transport_ex(to_transport,
2209
create_prefix=True, make_working_trees=not no_trees,
2210
shared_repo=True, force_new_repo=True,
2211
use_existing_dir=True,
2212
repo_format_name=format.repository_format.get_format_string()))
1816
2213
if not is_quiet():
1817
2214
from bzrlib.info import show_bzrdir_info
1818
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2215
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1821
2218
class cmd_diff(Command):
2264
2684
Option('show-diff',
2265
2685
short_name='p',
2266
2686
help='Show changes made in each revision as a patch.'),
2267
Option('include-merges',
2687
Option('include-merged',
2268
2688
help='Show merged revisions like --levels 0 does.'),
2689
Option('include-merges', hidden=True,
2690
help='Historical alias for --include-merged.'),
2691
Option('omit-merges',
2692
help='Do not report commits with more than one parent.'),
2269
2693
Option('exclude-common-ancestry',
2270
2694
help='Display only the revisions that are not part'
2271
' of both ancestries (require -rX..Y)'
2695
' of both ancestries (require -rX..Y).'
2697
Option('signatures',
2698
help='Show digital signature validity.'),
2701
help='Show revisions whose properties match this '
2704
ListOption('match-message',
2705
help='Show revisions whose message matches this '
2708
ListOption('match-committer',
2709
help='Show revisions whose committer matches this '
2712
ListOption('match-author',
2713
help='Show revisions whose authors match this '
2716
ListOption('match-bugs',
2717
help='Show revisions whose bugs match this '
2274
2721
encoding_type = 'replace'
2295
2750
_get_info_for_log_files,
2297
2752
direction = (forward and 'forward') or 'reverse'
2753
if symbol_versioning.deprecated_passed(include_merges):
2754
ui.ui_factory.show_user_warning(
2755
'deprecated_command_option',
2756
deprecated_name='--include-merges',
2757
recommended_name='--include-merged',
2758
deprecated_in_version='2.5',
2759
command=self.invoked_as)
2760
if include_merged is None:
2761
include_merged = include_merges
2763
raise errors.BzrCommandError(gettext(
2764
'{0} and {1} are mutually exclusive').format(
2765
'--include-merges', '--include-merged'))
2766
if include_merged is None:
2767
include_merged = False
2298
2768
if (exclude_common_ancestry
2299
2769
and (revision is None or len(revision) != 2)):
2300
raise errors.BzrCommandError(
2301
'--exclude-common-ancestry requires -r with two revisions')
2770
raise errors.BzrCommandError(gettext(
2771
'--exclude-common-ancestry requires -r with two revisions'))
2303
2773
if levels is None:
2306
raise errors.BzrCommandError(
2307
'--levels and --include-merges are mutually exclusive')
2776
raise errors.BzrCommandError(gettext(
2777
'{0} and {1} are mutually exclusive').format(
2778
'--levels', '--include-merged'))
2309
2780
if change is not None:
2310
2781
if len(change) > 1:
2311
2782
raise errors.RangeInChangeOption()
2312
2783
if revision is not None:
2313
raise errors.BzrCommandError(
2314
'--revision and --change are mutually exclusive')
2784
raise errors.BzrCommandError(gettext(
2785
'{0} and {1} are mutually exclusive').format(
2786
'--revision', '--change'))
2316
2788
revision = change
2693
3194
self.outf.write("%s\n" % pattern)
2695
3196
if not name_pattern_list:
2696
raise errors.BzrCommandError("ignore requires at least one "
2697
"NAME_PATTERN or --default-rules.")
3197
raise errors.BzrCommandError(gettext("ignore requires at least one "
3198
"NAME_PATTERN or --default-rules."))
2698
3199
name_pattern_list = [globbing.normalize_pattern(p)
2699
3200
for p in name_pattern_list]
2700
3201
bad_patterns = ''
3202
bad_patterns_count = 0
2701
3203
for p in name_pattern_list:
2702
3204
if not globbing.Globster.is_pattern_valid(p):
3205
bad_patterns_count += 1
2703
3206
bad_patterns += ('\n %s' % p)
2704
3207
if bad_patterns:
2705
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
3208
msg = (ngettext('Invalid ignore pattern found. %s',
3209
'Invalid ignore patterns found. %s',
3210
bad_patterns_count) % bad_patterns)
2706
3211
ui.ui_factory.show_error(msg)
2707
3212
raise errors.InvalidPattern('')
2708
3213
for name_pattern in name_pattern_list:
2709
3214
if (name_pattern[0] == '/' or
2710
3215
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2711
raise errors.BzrCommandError(
2712
"NAME_PATTERN should not be an absolute path")
3216
raise errors.BzrCommandError(gettext(
3217
"NAME_PATTERN should not be an absolute path"))
2713
3218
tree, relpath = WorkingTree.open_containing(directory)
2714
3219
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2715
3220
ignored = globbing.Globster(name_pattern_list)
2818
3324
Option('per-file-timestamps',
2819
3325
help='Set modification time of files to that of the last '
2820
3326
'revision in which it was changed.'),
3327
Option('uncommitted',
3328
help='Export the working tree contents rather than that of the '
2822
3331
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2823
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
3332
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2824
3334
from bzrlib.export import export
2826
3336
if branch_or_subdir is None:
2827
tree = WorkingTree.open_containing(directory)[0]
3337
branch_or_subdir = directory
3339
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3341
if tree is not None:
3342
self.add_cleanup(tree.lock_read().unlock)
3346
raise errors.BzrCommandError(
3347
gettext("--uncommitted requires a working tree"))
2831
b, subdir = Branch.open_containing(branch_or_subdir)
2834
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3350
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2836
export(rev_tree, dest, format, root, subdir, filtered=filters,
3352
export(export_tree, dest, format, root, subdir, filtered=filters,
2837
3353
per_file_timestamps=per_file_timestamps)
2838
3354
except errors.NoSuchExportFormat, e:
2839
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3355
raise errors.BzrCommandError(
3356
gettext('Unsupported export format: %s') % e.format)
2842
3359
class cmd_cat(Command):
2880
3397
old_file_id = rev_tree.path2id(relpath)
3399
# TODO: Split out this code to something that generically finds the
3400
# best id for a path across one or more trees; it's like
3401
# find_ids_across_trees but restricted to find just one. -- mbp
2882
3403
if name_from_revision:
2883
3404
# Try in revision if requested
2884
3405
if old_file_id is None:
2885
raise errors.BzrCommandError(
2886
"%r is not present in revision %s" % (
3406
raise errors.BzrCommandError(gettext(
3407
"{0!r} is not present in revision {1}").format(
2887
3408
filename, rev_tree.get_revision_id()))
2889
content = rev_tree.get_file_text(old_file_id)
3410
actual_file_id = old_file_id
2891
3412
cur_file_id = tree.path2id(relpath)
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" % (
3413
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3414
actual_file_id = cur_file_id
3415
elif old_file_id is not None:
3416
actual_file_id = old_file_id
3418
raise errors.BzrCommandError(gettext(
3419
"{0!r} is not present in revision {1}").format(
2909
3420
filename, rev_tree.get_revision_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)
3422
from bzrlib.filter_tree import ContentFilterTree
3423
filter_tree = ContentFilterTree(rev_tree,
3424
rev_tree._content_filter_stack)
3425
content = filter_tree.get_file_text(actual_file_id)
2923
self.outf.write(content)
3427
content = rev_tree.get_file_text(actual_file_id)
3429
self.outf.write(content)
2926
3432
class cmd_local_time_offset(Command):
2987
3493
to trigger updates to external systems like bug trackers. The --fixes
2988
3494
option can be used to record the association between a revision and
2989
3495
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
3017
3498
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3018
3499
takes_args = ['selected*']
3050
3531
Option('show-diff', short_name='p',
3051
3532
help='When no message is supplied, show the diff along'
3052
3533
' with the status summary in the message editor.'),
3535
help='When committing to a foreign version control '
3536
'system do not push data that can not be natively '
3054
3539
aliases = ['ci', 'checkin']
3056
3541
def _iter_bug_fix_urls(self, fixes, branch):
3542
default_bugtracker = None
3057
3543
# Configure the properties for bug fixing attributes.
3058
3544
for fixed_bug in fixes:
3059
3545
tokens = fixed_bug.split(':')
3060
if len(tokens) != 2:
3061
raise errors.BzrCommandError(
3546
if len(tokens) == 1:
3547
if default_bugtracker is None:
3548
branch_config = branch.get_config_stack()
3549
default_bugtracker = branch_config.get(
3551
if default_bugtracker is None:
3552
raise errors.BzrCommandError(gettext(
3553
"No tracker specified for bug %s. Use the form "
3554
"'tracker:id' or specify a default bug tracker "
3555
"using the `bugtracker` option.\nSee "
3556
"\"bzr help bugs\" for more information on this "
3557
"feature. Commit refused.") % fixed_bug)
3558
tag = default_bugtracker
3560
elif len(tokens) != 2:
3561
raise errors.BzrCommandError(gettext(
3062
3562
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3063
3563
"See \"bzr help bugs\" for more information on this "
3064
"feature.\nCommit refused." % fixed_bug)
3065
tag, bug_id = tokens
3564
"feature.\nCommit refused.") % fixed_bug)
3566
tag, bug_id = tokens
3067
3568
yield bugtracker.get_bug_url(tag, branch, bug_id)
3068
3569
except errors.UnknownBugTrackerAbbreviation:
3069
raise errors.BzrCommandError(
3070
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3570
raise errors.BzrCommandError(gettext(
3571
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3071
3572
except errors.MalformedBugIdentifier, e:
3072
raise errors.BzrCommandError(
3073
"%s\nCommit refused." % (str(e),))
3573
raise errors.BzrCommandError(gettext(
3574
"%s\nCommit refused.") % (str(e),))
3075
3576
def run(self, message=None, file=None, verbose=False, selected_list=None,
3076
3577
unchanged=False, strict=False, local=False, fixes=None,
3077
author=None, show_diff=False, exclude=None, commit_time=None):
3578
author=None, show_diff=False, exclude=None, commit_time=None,
3078
3580
from bzrlib.errors import (
3079
3581
PointlessCommit,
3080
3582
ConflictsInTree,
3161
3658
# make_commit_message_template_encoded returns user encoding.
3162
3659
# We probably want to be using edit_commit_message instead to
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")
3661
my_message = set_commit_message(commit_obj)
3662
if my_message is None:
3663
start_message = generate_commit_message_template(commit_obj)
3664
my_message = edit_commit_message_encoded(text,
3665
start_message=start_message)
3666
if my_message is None:
3667
raise errors.BzrCommandError(gettext("please specify a commit"
3668
" message with either --message or --file"))
3669
if my_message == "":
3670
raise errors.BzrCommandError(gettext("Empty commit message specified."
3671
" Please specify a commit message with either"
3672
" --message or --file or leave a blank message"
3673
" with --message \"\"."))
3172
3674
return my_message
3174
3676
# The API permits a commit with a filter of [] to mean 'select nothing'
3182
3684
reporter=None, verbose=verbose, revprops=properties,
3183
3685
authors=author, timestamp=commit_stamp,
3184
3686
timezone=offset,
3185
exclude=tree.safe_relpath_files(exclude))
3687
exclude=tree.safe_relpath_files(exclude),
3186
3689
except PointlessCommit:
3187
raise errors.BzrCommandError("No changes to commit."
3188
" Use --unchanged to commit anyhow.")
3690
raise errors.BzrCommandError(gettext("No changes to commit."
3691
" Please 'bzr add' the files you want to commit, or use"
3692
" --unchanged to force an empty commit."))
3189
3693
except ConflictsInTree:
3190
raise errors.BzrCommandError('Conflicts detected in working '
3694
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3191
3695
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3193
3697
except StrictCommitFailed:
3194
raise errors.BzrCommandError("Commit refused because there are"
3195
" unknown files in the working tree.")
3698
raise errors.BzrCommandError(gettext("Commit refused because there are"
3699
" unknown files in the working tree."))
3196
3700
except errors.BoundBranchOutOfDate, e:
3197
e.extra_help = ("\n"
3701
e.extra_help = (gettext("\n"
3198
3702
'To commit to master branch, run update and then commit.\n'
3199
3703
'You can also pass --local to commit to continue working '
3274
3778
class cmd_upgrade(Command):
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.
3779
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3781
When the default format has changed after a major new release of
3782
Bazaar, you may be informed during certain operations that you
3783
should upgrade. Upgrading to a newer format may improve performance
3784
or make new features available. It may however limit interoperability
3785
with older repositories or with older versions of Bazaar.
3787
If you wish to upgrade to a particular format rather than the
3788
current default, that can be specified using the --format option.
3789
As a consequence, you can use the upgrade command this way to
3790
"downgrade" to an earlier format, though some conversions are
3791
a one way process (e.g. changing from the 1.x default to the
3792
2.x default) so downgrading is not always possible.
3794
A backup.bzr.~#~ directory is created at the start of the conversion
3795
process (where # is a number). By default, this is left there on
3796
completion. If the conversion fails, delete the new .bzr directory
3797
and rename this one back in its place. Use the --clean option to ask
3798
for the backup.bzr directory to be removed on successful conversion.
3799
Alternatively, you can delete it by hand if everything looks good
3802
If the location given is a shared repository, dependent branches
3803
are also converted provided the repository converts successfully.
3804
If the conversion of a branch fails, remaining branches are still
3807
For more information on upgrades, see the Bazaar Upgrade Guide,
3808
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3282
_see_also = ['check']
3811
_see_also = ['check', 'reconcile', 'formats']
3283
3812
takes_args = ['url?']
3284
3813
takes_options = [
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'),
3814
RegistryOption('format',
3815
help='Upgrade to a specific format. See "bzr help'
3816
' formats" for details.',
3817
lazy_registry=('bzrlib.controldir', 'format_registry'),
3818
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3819
value_switches=True, title='Branch format'),
3821
help='Remove the backup.bzr directory if successful.'),
3823
help="Show what would be done, but don't actually do anything."),
3293
def run(self, url='.', format=None):
3826
def run(self, url='.', format=None, clean=False, dry_run=False):
3294
3827
from bzrlib.upgrade import upgrade
3295
upgrade(url, format)
3828
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3830
if len(exceptions) == 1:
3831
# Compatibility with historical behavior
3298
3837
class cmd_whoami(Command):
3691
4267
The source of the merge can be specified either in the form of a branch,
3692
4268
or in the form of a path to a file containing a merge directive generated
3693
4269
with bzr send. If neither is specified, the default is the upstream 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.
4270
or the branch most recently merged using --remember. The source of the
4271
merge may also be specified in the form of a path to a file in another
4272
branch: in this case, only the modifications to that file are merged into
4273
the current working tree.
4275
When merging from a branch, by default bzr will try to merge in all new
4276
work from the other branch, automatically determining an appropriate base
4277
revision. If this fails, you may need to give an explicit base.
4279
To pick a different ending revision, pass "--revision OTHER". bzr will
4280
try to merge in all new work up to and including revision OTHER.
4282
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4283
through OTHER, excluding BASE but including OTHER, will be merged. If this
4284
causes some revisions to be skipped, i.e. if the destination branch does
4285
not already contain revision BASE, such a merge is commonly referred to as
4286
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4287
cherrypicks. The changes look like a normal commit, and the history of the
4288
changes from the other branch is not stored in the commit.
4290
Revision numbers are always relative to the source branch.
3707
4292
Merge will do its best to combine the changes in two branches, but there
3708
4293
are some kinds of problems only a human can fix. When it encounters those,
3709
4294
it will mark a conflict. A conflict means that you need to fix something,
3710
before you should commit.
4295
before you can commit.
3712
4297
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
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.
4299
If there is no default branch set, the first merge will set it (use
4300
--no-remember to avoid setting it). After that, you can omit the branch
4301
to use the default. To change the default, use --remember. The value will
4302
only be saved if the remote location can be accessed.
3719
4304
The results of the merge are placed into the destination working
3720
4305
directory, where they can be reviewed (with bzr diff), tested, and then
3721
4306
committed to record the result of the merge.
3723
4308
merge refuses to run if there are any uncommitted changes, unless
3724
--force is given. The --force option can also be used to create a
4309
--force is given. If --force is given, then the changes from the source
4310
will be merged with the current working tree, including any uncommitted
4311
changes in the tree. The --force option can also be used to create a
3725
4312
merge revision which has more than two parents.
3727
4314
If one would like to merge changes from the working tree of the other
3851
4442
self.sanity_check_merger(merger)
3852
4443
if (merger.base_rev_id == merger.other_rev_id and
3853
4444
merger.other_rev_id is not None):
3854
note('Nothing to do.')
4445
# check if location is a nonexistent file (and not a branch) to
4446
# disambiguate the 'Nothing to do'
4447
if merger.interesting_files:
4448
if not merger.other_tree.has_filename(
4449
merger.interesting_files[0]):
4450
note(gettext("merger: ") + str(merger))
4451
raise errors.PathsDoNotExist([location])
4452
note(gettext('Nothing to do.'))
4454
if pull and not preview:
3857
4455
if merger.interesting_files is not None:
3858
raise errors.BzrCommandError('Cannot pull individual files')
4456
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3859
4457
if (merger.base_rev_id == tree.last_revision()):
3860
4458
result = tree.pull(merger.other_branch, False,
3861
4459
merger.other_rev_id)
3862
4460
result.report(self.outf)
3864
4462
if merger.this_basis is None:
3865
raise errors.BzrCommandError(
4463
raise errors.BzrCommandError(gettext(
3866
4464
"This branch has no commits."
3867
" (perhaps you would prefer 'bzr pull')")
4465
" (perhaps you would prefer 'bzr pull')"))
3869
4467
return self._do_preview(merger)
3870
4468
elif interactive:
3968
4566
if other_revision_id is None:
3969
4567
other_revision_id = _mod_revision.ensure_null(
3970
4568
other_branch.last_revision())
3971
# Remember where we merge from
3972
if ((remember or tree.branch.get_submit_branch() is None) and
3973
user_location is not None):
4569
# Remember where we merge from. We need to remember if:
4570
# - user specify a location (and we don't merge from the parent
4572
# - user ask to remember or there is no previous location set to merge
4573
# from and user didn't ask to *not* remember
4574
if (user_location is not None
4576
or (remember is None
4577
and tree.branch.get_submit_branch() is None)))):
3974
4578
tree.branch.set_submit_branch(other_branch.base)
3975
_merge_tags_if_possible(other_branch, tree.branch)
4579
# Merge tags (but don't set them in the master branch yet, the user
4580
# might revert this merge). Commit will propagate them.
4581
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3976
4582
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3977
4583
other_revision_id, base_revision_id, other_branch, base_branch)
3978
4584
if other_path != '':
4141
4748
class cmd_revert(Command):
4142
__doc__ = """Revert files to a previous revision.
4750
Set files in the working tree back to the contents of a previous revision.
4144
4752
Giving a list of files will revert only those files. Otherwise, all files
4145
4753
will be reverted. If the revision is not specified with '--revision', the
4146
last committed revision is used.
4754
working tree basis revision is used. A revert operation affects only the
4755
working tree, not any revision history like the branch and repository or
4756
the working tree basis revision.
4148
4758
To remove only some changes, without reverting to a prior version, use
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.
4759
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4760
will remove the changes introduced by the second last commit (-2), without
4761
affecting the changes introduced by the last commit (-1). To remove
4762
certain changes on a hunk-by-hunk basis, see the shelve command.
4763
To update the branch to a specific revision or the latest revision and
4764
update the working tree accordingly while preserving local changes, see the
4153
By default, any files that have been manually changed will be backed up
4154
first. (Files changed only by merge are not backed up.) Backup files have
4155
'.~#~' appended to their name, where # is a number.
4767
Uncommitted changes to files that are reverted will be discarded.
4768
Howver, by default, any files that have been manually changed will be
4769
backed up first. (Files changed only by merge are not backed up.) Backup
4770
files have '.~#~' appended to their name, where # is a number.
4157
4772
When you provide files, you can use their current pathname or the pathname
4158
4773
from the target revision. So you can use revert to "undelete" a file by
4319
4936
theirs_only=False,
4320
4937
log_format=None, long=False, short=False, line=False,
4321
4938
show_ids=False, verbose=False, this=False, other=False,
4322
include_merges=False, revision=None, my_revision=None,
4939
include_merged=None, revision=None, my_revision=None,
4941
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4324
4942
from bzrlib.missing import find_unmerged, iter_log_revisions
4325
4943
def message(s):
4326
4944
if not is_quiet():
4327
4945
self.outf.write(s)
4947
if symbol_versioning.deprecated_passed(include_merges):
4948
ui.ui_factory.show_user_warning(
4949
'deprecated_command_option',
4950
deprecated_name='--include-merges',
4951
recommended_name='--include-merged',
4952
deprecated_in_version='2.5',
4953
command=self.invoked_as)
4954
if include_merged is None:
4955
include_merged = include_merges
4957
raise errors.BzrCommandError(gettext(
4958
'{0} and {1} are mutually exclusive').format(
4959
'--include-merges', '--include-merged'))
4960
if include_merged is None:
4961
include_merged = False
4330
4963
mine_only = this
4397
5036
if remote_extra and not mine_only:
4398
5037
if printed_local is True:
4399
5038
message("\n\n\n")
4400
message("You are missing %d revision(s):\n" %
5039
message(ngettext("You are missing %d revision:\n",
5040
"You are missing %d revisions:\n",
5041
len(remote_extra)) %
4401
5042
len(remote_extra))
5043
if remote_branch.supports_tags():
5044
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4402
5045
for revision in iter_log_revisions(remote_extra,
4403
5046
remote_branch.repository,
4405
5049
lf.log_revision(revision)
4406
5050
status_code = 1
4408
5052
if mine_only and not local_extra:
4409
5053
# We checked local, and found nothing extra
4410
message('This branch is up to date.\n')
5054
message(gettext('This branch has no new revisions.\n'))
4411
5055
elif theirs_only and not remote_extra:
4412
5056
# We checked remote, and found nothing extra
4413
message('Other branch is up to date.\n')
5057
message(gettext('Other branch has no new revisions.\n'))
4414
5058
elif not (mine_only or theirs_only or local_extra or
4416
5060
# We checked both branches, and neither one had extra
4418
message("Branches are up to date.\n")
5062
message(gettext("Branches are up to date.\n"))
4419
5063
self.cleanup_now()
4420
5064
if not status_code and parent is None and other_branch is not None:
4421
5065
self.add_cleanup(local_branch.lock_write().unlock)
4570
5200
self.add_cleanup(branch.lock_read().unlock)
4571
5201
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4572
5202
self.add_cleanup(tree.lock_read().unlock)
5203
if wt is not None and revision is None:
4574
5204
file_id = wt.path2id(relpath)
4576
5206
file_id = tree.path2id(relpath)
4577
5207
if file_id is None:
4578
5208
raise errors.NotVersionedError(filename)
4579
file_version = tree.inventory[file_id].revision
4580
5209
if wt is not None and revision is None:
4581
5210
# If there is a tree and we're not annotating historical
4582
5211
# versions, annotate the working tree's content.
4583
5212
annotate_file_tree(wt, file_id, self.outf, long, all,
4584
5213
show_ids=show_ids)
4586
annotate_file(branch, file_version, file_id, long, all, self.outf,
5215
annotate_file_tree(tree, file_id, self.outf, long, all,
5216
show_ids=show_ids, branch=branch)
4590
5219
class cmd_re_sign(Command):
4675
5304
location = b.get_old_bound_location()
4676
5305
except errors.UpgradeRequired:
4677
raise errors.BzrCommandError('No location supplied. '
4678
'This format does not remember old locations.')
5306
raise errors.BzrCommandError(gettext('No location supplied. '
5307
'This format does not remember old locations.'))
4680
5309
if location is None:
4681
5310
if b.get_bound_location() is not None:
4682
raise errors.BzrCommandError('Branch is already bound')
5311
raise errors.BzrCommandError(
5312
gettext('Branch is already bound'))
4684
raise errors.BzrCommandError('No location supplied '
4685
'and no previous location known')
5314
raise errors.BzrCommandError(
5315
gettext('No location supplied'
5316
' and no previous location known'))
4686
5317
b_other = Branch.open(location)
4688
5319
b.bind(b_other)
4689
5320
except errors.DivergedBranches:
4690
raise errors.BzrCommandError('These branches have diverged.'
4691
' Try merging, and then bind again.')
5321
raise errors.BzrCommandError(gettext('These branches have diverged.'
5322
' Try merging, and then bind again.'))
4692
5323
if b.get_config().has_explicit_nickname():
4693
5324
b.nick = b_other.nick
4798
5432
end_revision=last_revno)
4801
self.outf.write('Dry-run, pretending to remove'
4802
' the above revisions.\n')
5435
self.outf.write(gettext('Dry-run, pretending to remove'
5436
' the above revisions.\n'))
4804
self.outf.write('The above revision(s) will be removed.\n')
5438
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4807
5441
if not ui.ui_factory.confirm_action(
4808
'Uncommit these revisions',
5442
gettext(u'Uncommit these revisions'),
4809
5443
'bzrlib.builtins.uncommit',
4811
self.outf.write('Canceled\n')
5445
self.outf.write(gettext('Canceled\n'))
4814
5448
mutter('Uncommitting from {%s} to {%s}',
4815
5449
last_rev_id, rev_id)
4816
5450
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
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)
5451
revno=revno, local=local, keep_tags=keep_tags)
5452
self.outf.write(gettext('You can restore the old tip by running:\n'
5453
' bzr pull . -r revid:%s\n') % last_rev_id)
4822
5456
class cmd_break_lock(Command):
4906
5541
'option leads to global uncontrolled write access to your '
5544
Option('client-timeout', type=float,
5545
help='Override the default idle client timeout (5min).'),
4911
def get_host_and_port(self, port):
4912
"""Return the host and port to run the smart server on.
4914
If 'port' is None, None will be returned for the host and port.
4916
If 'port' has a colon in it, the string before the colon will be
4917
interpreted as the host.
4919
:param port: A string of the port to run the server on.
4920
:return: A tuple of (host, port), where 'host' is a host name or IP,
4921
and port is an integer TCP/IP port.
4924
if port is not None:
4926
host, port = port.split(':')
4930
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5548
def run(self, listen=None, port=None, inet=False, directory=None,
5549
allow_writes=False, protocol=None, client_timeout=None):
4932
5550
from bzrlib import transport
4933
5551
if directory is None:
4934
5552
directory = os.getcwd()
4935
5553
if protocol is None:
4936
5554
protocol = transport.transport_server_registry.get()
4937
host, port = self.get_host_and_port(port)
4938
url = urlutils.local_path_to_url(directory)
5555
url = transport.location_to_url(directory)
4939
5556
if not allow_writes:
4940
5557
url = 'readonly+' + url
4941
t = transport.get_transport(url)
4942
protocol(t, host, port, inet)
5558
t = transport.get_transport_from_url(url)
5559
protocol(t, listen, port, inet, client_timeout)
4945
5562
class cmd_join(Command):
5075
5692
if submit_branch is None:
5076
5693
submit_branch = branch.get_parent()
5077
5694
if submit_branch is None:
5078
raise errors.BzrCommandError('No submit branch specified or known')
5695
raise errors.BzrCommandError(gettext('No submit branch specified or known'))
5080
5697
stored_public_branch = branch.get_public_branch()
5081
5698
if public_branch is None:
5082
5699
public_branch = stored_public_branch
5083
5700
elif stored_public_branch is None:
5701
# FIXME: Should be done only if we succeed ? -- vila 2012-01-03
5084
5702
branch.set_public_branch(public_branch)
5085
5703
if not include_bundle and public_branch is None:
5086
raise errors.BzrCommandError('No public branch specified or'
5704
raise errors.BzrCommandError(gettext('No public branch specified or'
5088
5706
base_revision_id = None
5089
5707
if revision is not None:
5090
5708
if len(revision) > 2:
5091
raise errors.BzrCommandError('bzr merge-directive takes '
5092
'at most two one revision identifiers')
5709
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5710
'at most two one revision identifiers'))
5093
5711
revision_id = revision[-1].as_revision_id(branch)
5094
5712
if len(revision) == 2:
5095
5713
base_revision_id = revision[0].as_revision_id(branch)
5351
5975
self.add_cleanup(branch.lock_write().unlock)
5353
5977
if tag_name is None:
5354
raise errors.BzrCommandError("No tag specified to delete.")
5978
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5355
5979
branch.tags.delete_tag(tag_name)
5356
self.outf.write('Deleted tag %s.\n' % tag_name)
5980
note(gettext('Deleted tag %s.') % tag_name)
5359
5983
if len(revision) != 1:
5360
raise errors.BzrCommandError(
5984
raise errors.BzrCommandError(gettext(
5361
5985
"Tags can only be placed on a single revision, "
5363
5987
revision_id = revision[0].as_revision_id(branch)
5365
5989
revision_id = branch.last_revision()
5366
5990
if tag_name is None:
5367
5991
tag_name = branch.automatic_tag_name(revision_id)
5368
5992
if tag_name is None:
5369
raise errors.BzrCommandError(
5370
"Please specify a tag name.")
5371
if (not force) and branch.tags.has_tag(tag_name):
5993
raise errors.BzrCommandError(gettext(
5994
"Please specify a tag name."))
5996
existing_target = branch.tags.lookup_tag(tag_name)
5997
except errors.NoSuchTag:
5998
existing_target = None
5999
if not force and existing_target not in (None, revision_id):
5372
6000
raise errors.TagAlreadyExists(tag_name)
5373
branch.tags.set_tag(tag_name, revision_id)
5374
self.outf.write('Created tag %s.\n' % tag_name)
6001
if existing_target == revision_id:
6002
note(gettext('Tag %s already exists for that revision.') % tag_name)
6004
branch.tags.set_tag(tag_name, revision_id)
6005
if existing_target is None:
6006
note(gettext('Created tag %s.') % tag_name)
6008
note(gettext('Updated tag %s.') % tag_name)
5377
6011
class cmd_tags(Command):
5409
6038
self.add_cleanup(branch.lock_read().unlock)
5411
graph = branch.repository.get_graph()
5412
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5413
revid1, revid2 = rev1.rev_id, rev2.rev_id
5414
# only show revisions between revid1 and revid2 (inclusive)
5415
tags = [(tag, revid) for tag, revid in tags if
5416
graph.is_between(revid, revid1, revid2)]
5419
elif sort == 'time':
5421
for tag, revid in tags:
5423
revobj = branch.repository.get_revision(revid)
5424
except errors.NoSuchRevision:
5425
timestamp = sys.maxint # place them at the end
5427
timestamp = revobj.timestamp
5428
timestamps[revid] = timestamp
5429
tags.sort(key=lambda x: timestamps[x[1]])
6040
# Restrict to the specified range
6041
tags = self._tags_for_range(branch, revision)
6043
sort = tag_sort_methods.get()
5430
6045
if not show_ids:
5431
6046
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5432
6047
for index, (tag, revid) in enumerate(tags):
5443
6060
for tag, revspec in tags:
5444
6061
self.outf.write('%-20s %s\n' % (tag, revspec))
6063
def _tags_for_range(self, branch, revision):
6065
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6066
revid1, revid2 = rev1.rev_id, rev2.rev_id
6067
# _get_revision_range will always set revid2 if it's not specified.
6068
# If revid1 is None, it means we want to start from the branch
6069
# origin which is always a valid ancestor. If revid1 == revid2, the
6070
# ancestry check is useless.
6071
if revid1 and revid1 != revid2:
6072
# FIXME: We really want to use the same graph than
6073
# branch.iter_merge_sorted_revisions below, but this is not
6074
# easily available -- vila 2011-09-23
6075
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6076
# We don't want to output anything in this case...
6078
# only show revisions between revid1 and revid2 (inclusive)
6079
tagged_revids = branch.tags.get_reverse_tag_dict()
6081
for r in branch.iter_merge_sorted_revisions(
6082
start_revision_id=revid2, stop_revision_id=revid1,
6083
stop_rule='include'):
6084
revid_tags = tagged_revids.get(r[0], None)
6086
found.extend([(tag, r[0]) for tag in revid_tags])
5447
6090
class cmd_reconfigure(Command):
5448
6091
__doc__ = """Reconfigure the type of a bzr directory.
5462
6105
takes_args = ['location?']
5463
6106
takes_options = [
5464
6107
RegistryOption.from_kwargs(
5466
title='Target type',
5467
help='The type to reconfigure the directory to.',
6110
help='The relation between branch and tree.',
5468
6111
value_switches=True, enum_switch=False,
5469
6112
branch='Reconfigure to be an unbound branch with no working tree.',
5470
6113
tree='Reconfigure to be an unbound branch with a working tree.',
5471
6114
checkout='Reconfigure to be a bound branch with a working tree.',
5472
6115
lightweight_checkout='Reconfigure to be a lightweight'
5473
6116
' checkout (with no local history).',
6118
RegistryOption.from_kwargs(
6120
title='Repository type',
6121
help='Location fo the repository.',
6122
value_switches=True, enum_switch=False,
5474
6123
standalone='Reconfigure to be a standalone branch '
5475
6124
'(i.e. stop using shared repository).',
5476
6125
use_shared='Reconfigure to use a shared repository.',
6127
RegistryOption.from_kwargs(
6129
title='Trees in Repository',
6130
help='Whether new branches in the repository have trees.',
6131
value_switches=True, enum_switch=False,
5477
6132
with_trees='Reconfigure repository to create '
5478
6133
'working trees on branches by default.',
5479
6134
with_no_trees='Reconfigure repository to not create '
5506
6161
# At the moment you can use --stacked-on and a different
5507
6162
# reconfiguration shape at the same time; there seems no good reason
5509
if target_type is None:
6164
if (tree_type is None and
6165
repository_type is None and
6166
repository_trees is None):
5510
6167
if stacked_on or unstacked:
5513
raise errors.BzrCommandError('No target configuration '
5515
elif target_type == 'branch':
6170
raise errors.BzrCommandError(gettext('No target configuration '
6172
reconfiguration = None
6173
if tree_type == 'branch':
5516
6174
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5517
elif target_type == 'tree':
6175
elif tree_type == 'tree':
5518
6176
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5519
elif target_type == 'checkout':
6177
elif tree_type == 'checkout':
5520
6178
reconfiguration = reconfigure.Reconfigure.to_checkout(
5521
6179
directory, bind_to)
5522
elif target_type == 'lightweight-checkout':
6180
elif tree_type == 'lightweight-checkout':
5523
6181
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5524
6182
directory, bind_to)
5525
elif target_type == 'use-shared':
6184
reconfiguration.apply(force)
6185
reconfiguration = None
6186
if repository_type == 'use-shared':
5526
6187
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5527
elif target_type == 'standalone':
6188
elif repository_type == 'standalone':
5528
6189
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5529
elif target_type == 'with-trees':
6191
reconfiguration.apply(force)
6192
reconfiguration = None
6193
if repository_trees == 'with-trees':
5530
6194
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5531
6195
directory, True)
5532
elif target_type == 'with-no-trees':
6196
elif repository_trees == 'with-no-trees':
5533
6197
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5534
6198
directory, False)
5535
reconfiguration.apply(force)
6200
reconfiguration.apply(force)
6201
reconfiguration = None
5538
6204
class cmd_switch(Command):
5566
6232
Option('create-branch', short_name='b',
5567
6233
help='Create the target branch from this one before'
5568
6234
' switching to it.'),
6236
help='Store and restore uncommitted changes in the'
5571
6240
def run(self, to_location=None, force=False, create_branch=False,
5572
revision=None, directory=u'.'):
6241
revision=None, directory=u'.', store=False):
5573
6242
from bzrlib import switch
5574
6243
tree_location = directory
5575
6244
revision = _get_one_revision('switch', revision)
5576
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6245
possible_transports = []
6246
control_dir = controldir.ControlDir.open_containing(tree_location,
6247
possible_transports=possible_transports)[0]
5577
6248
if to_location is None:
5578
6249
if revision is None:
5579
raise errors.BzrCommandError('You must supply either a'
5580
' revision or a location')
6250
raise errors.BzrCommandError(gettext('You must supply either a'
6251
' revision or a location'))
5581
6252
to_location = tree_location
5583
branch = control_dir.open_branch()
6254
branch = control_dir.open_branch(
6255
possible_transports=possible_transports)
5584
6256
had_explicit_nick = branch.get_config().has_explicit_nickname()
5585
6257
except errors.NotBranchError:
5587
6259
had_explicit_nick = False
5588
6260
if create_branch:
5589
6261
if branch is None:
5590
raise errors.BzrCommandError('cannot create branch without'
5592
to_location = directory_service.directories.dereference(
5594
if '/' not in to_location and '\\' not in to_location:
5595
# This path is meant to be relative to the existing branch
5596
this_url = self._get_branch_location(control_dir)
5597
to_location = urlutils.join(this_url, '..', to_location)
6262
raise errors.BzrCommandError(
6263
gettext('cannot create branch without source branch'))
6264
to_location = lookup_new_sibling_branch(control_dir, to_location,
6265
possible_transports=possible_transports)
5598
6266
to_branch = branch.bzrdir.sprout(to_location,
5599
possible_transports=[branch.bzrdir.root_transport],
5600
source_branch=branch).open_branch()
6267
possible_transports=possible_transports,
6268
source_branch=branch).open_branch()
5603
to_branch = Branch.open(to_location)
6271
to_branch = Branch.open(to_location,
6272
possible_transports=possible_transports)
5604
6273
except errors.NotBranchError:
5605
this_url = self._get_branch_location(control_dir)
5606
to_branch = Branch.open(
5607
urlutils.join(this_url, '..', to_location))
6274
to_branch = open_sibling_branch(control_dir, to_location,
6275
possible_transports=possible_transports)
5608
6276
if revision is not None:
5609
6277
revision = revision.as_revision_id(to_branch)
5610
switch.switch(control_dir, to_branch, force, revision_id=revision)
6278
switch.switch(control_dir, to_branch, force, revision_id=revision,
6279
store_uncommitted=store)
5611
6280
if had_explicit_nick:
5612
6281
branch = control_dir.open_branch() #get the new branch!
5613
6282
branch.nick = to_branch.nick
5614
note('Switched to branch: %s',
6283
note(gettext('Switched to branch: %s'),
5615
6284
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5617
def _get_branch_location(self, control_dir):
5618
"""Return location of branch for this control dir."""
5620
this_branch = control_dir.open_branch()
5621
# This may be a heavy checkout, where we want the master branch
5622
master_location = this_branch.get_bound_location()
5623
if master_location is not None:
5624
return master_location
5625
# If not, use a local sibling
5626
return this_branch.base
5627
except errors.NotBranchError:
5628
format = control_dir.find_branch_format()
5629
if getattr(format, 'get_reference', None) is not None:
5630
return format.get_reference(control_dir)
5632
return control_dir.root_transport.base
5635
6288
class cmd_view(Command):
5726
6379
name = current_view
5729
raise errors.BzrCommandError(
5730
"Both --delete and a file list specified")
6382
raise errors.BzrCommandError(gettext(
6383
"Both --delete and a file list specified"))
5732
raise errors.BzrCommandError(
5733
"Both --delete and --switch specified")
6385
raise errors.BzrCommandError(gettext(
6386
"Both --delete and --switch specified"))
5735
6388
tree.views.set_view_info(None, {})
5736
self.outf.write("Deleted all views.\n")
6389
self.outf.write(gettext("Deleted all views.\n"))
5737
6390
elif name is None:
5738
raise errors.BzrCommandError("No current view to delete")
6391
raise errors.BzrCommandError(gettext("No current view to delete"))
5740
6393
tree.views.delete_view(name)
5741
self.outf.write("Deleted '%s' view.\n" % name)
6394
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5744
raise errors.BzrCommandError(
5745
"Both --switch and a file list specified")
6397
raise errors.BzrCommandError(gettext(
6398
"Both --switch and a file list specified"))
5747
raise errors.BzrCommandError(
5748
"Both --switch and --all specified")
6400
raise errors.BzrCommandError(gettext(
6401
"Both --switch and --all specified"))
5749
6402
elif switch == 'off':
5750
6403
if current_view is None:
5751
raise errors.BzrCommandError("No current view to disable")
6404
raise errors.BzrCommandError(gettext("No current view to disable"))
5752
6405
tree.views.set_view_info(None, view_dict)
5753
self.outf.write("Disabled '%s' view.\n" % (current_view))
6406
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5755
6408
tree.views.set_view_info(switch, view_dict)
5756
6409
view_str = views.view_display_str(tree.views.lookup_view())
5757
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6410
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5760
self.outf.write('Views defined:\n')
6413
self.outf.write(gettext('Views defined:\n'))
5761
6414
for view in sorted(view_dict):
5762
6415
if view == current_view:
5766
6419
view_str = views.view_display_str(view_dict[view])
5767
6420
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5769
self.outf.write('No views defined.\n')
6422
self.outf.write(gettext('No views defined.\n'))
5770
6423
elif file_list:
5771
6424
if name is None:
5772
6425
# No name given and no current view set
5774
6427
elif name == 'off':
5775
raise errors.BzrCommandError(
5776
"Cannot change the 'off' pseudo view")
6428
raise errors.BzrCommandError(gettext(
6429
"Cannot change the 'off' pseudo view"))
5777
6430
tree.views.set_view(name, sorted(file_list))
5778
6431
view_str = views.view_display_str(tree.views.lookup_view())
5779
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6432
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5781
6434
# list the files
5782
6435
if name is None:
5783
6436
# No name given and no current view set
5784
self.outf.write('No current view.\n')
6437
self.outf.write(gettext('No current view.\n'))
5786
6439
view_str = views.view_display_str(tree.views.lookup_view(name))
5787
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6440
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5790
6443
class cmd_hooks(Command):
5824
6477
takes_args = ["location?"]
6479
takes_options = ['directory',
6480
Option('force', help='Remove branch even if it is the active branch.')]
5826
6482
aliases = ["rmbranch"]
5828
def run(self, location=None):
5829
if location is None:
5831
branch = Branch.open_containing(location)[0]
5832
branch.bzrdir.destroy_branch()
6484
def run(self, directory=None, location=None, force=False):
6485
br = open_nearby_branch(near=directory, location=location)
6486
if not force and br.bzrdir.has_workingtree():
6488
active_branch = br.bzrdir.open_branch(name="")
6489
except errors.NotBranchError:
6490
active_branch = None
6491
if (active_branch is not None and
6492
br.control_url == active_branch.control_url):
6493
raise errors.BzrCommandError(
6494
gettext("Branch is active. Use --force to remove it."))
6495
br.bzrdir.destroy_branch(br.name)
5835
6498
class cmd_shelve(Command):
5836
6499
__doc__ = """Temporarily set aside some changes from the current tree.
6022
6699
self.outf.write('%s %s\n' % (path, location))
6702
class cmd_export_pot(Command):
6703
__doc__ = """Export command helps and error messages in po format."""
6706
takes_options = [Option('plugin',
6707
help='Export help text from named command '\
6708
'(defaults to all built in commands).',
6710
Option('include-duplicates',
6711
help='Output multiple copies of the same msgid '
6712
'string if it appears more than once.'),
6715
def run(self, plugin=None, include_duplicates=False):
6716
from bzrlib.export_pot import export_pot
6717
export_pot(self.outf, plugin, include_duplicates)
6025
6720
def _register_lazy_builtins():
6026
6721
# register lazy builtins from other modules; called at startup and should
6027
6722
# be only called once.
6028
6723
for (name, aliases, module_name) in [
6029
6724
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6725
('cmd_config', [], 'bzrlib.config'),
6030
6726
('cmd_dpush', [], 'bzrlib.foreign'),
6031
6727
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6032
6728
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6033
6729
('cmd_conflicts', [], 'bzrlib.conflicts'),
6034
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6730
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6731
('cmd_verify_signatures', [], 'bzrlib.commit_signature_commands'),
6732
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6036
6734
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
