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 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
1358
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.
1361
1729
_see_also = ['pull', 'working-trees', 'status-flags']
1362
1730
takes_args = ['dir?']
1363
takes_options = ['revision']
1731
takes_options = ['revision',
1733
help="Show base revision text in conflicts."),
1364
1735
aliases = ['up']
1366
def run(self, dir='.', revision=None):
1737
def run(self, dir=None, revision=None, show_base=None):
1367
1738
if revision is not None and len(revision) != 1:
1368
raise errors.BzrCommandError(
1369
"bzr update --revision takes exactly one revision")
1370
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"))
1371
1750
branch = tree.branch
1372
1751
possible_transports = []
1373
1752
master = branch.get_master_branch(
1409
1788
change_reporter,
1410
1789
possible_transports=possible_transports,
1411
1790
revision=revision_id,
1792
show_base=show_base)
1413
1793
except errors.NoSuchRevision, e:
1414
raise errors.BzrCommandError(
1794
raise errors.BzrCommandError(gettext(
1415
1795
"branch has no revision %s\n"
1416
1796
"bzr update --revision only works"
1417
" for a revision in the branch history"
1797
" for a revision in the branch history")
1418
1798
% (e.revision))
1419
1799
revno = tree.branch.revision_id_to_dotted_revno(
1420
1800
_mod_revision.ensure_null(tree.last_revision()))
1421
note('Updated to revision %s of branch %s' %
1422
('.'.join(map(str, revno)), branch_location))
1801
note(gettext('Updated to revision {0} of branch {1}').format(
1802
'.'.join(map(str, revno)), branch_location))
1423
1803
parent_ids = tree.get_parent_ids()
1424
1804
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1425
note('Your local commits will now show as pending merges with '
1426
"'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'."))
1427
1807
if conflicts != 0:
1491
1871
title='Deletion Strategy', value_switches=True, enum_switch=False,
1492
1872
safe='Backup changed files (default).',
1493
1873
keep='Delete from bzr but leave the working copy.',
1874
no_backup='Don\'t backup changed files.',
1494
1875
force='Delete all the specified files, even if they can not be '
1495
'recovered and even if they are non-empty directories.')]
1876
'recovered and even if they are non-empty directories. '
1877
'(deprecated, use no-backup)')]
1496
1878
aliases = ['rm', 'del']
1497
1879
encoding_type = 'replace'
1499
1881
def run(self, file_list, verbose=False, new=False,
1500
1882
file_deletion_strategy='safe'):
1883
if file_deletion_strategy == 'force':
1884
note(gettext("(The --force option is deprecated, rather use --no-backup "
1886
file_deletion_strategy = 'no-backup'
1501
1888
tree, file_list = WorkingTree.open_containing_paths(file_list)
1503
1890
if file_list is not None:
1705
2102
to_transport.ensure_base()
1706
2103
except errors.NoSuchFile:
1707
2104
if not create_prefix:
1708
raise errors.BzrCommandError("Parent directory of %s"
2105
raise errors.BzrCommandError(gettext("Parent directory of %s"
1709
2106
" does not exist."
1710
2107
"\nYou may supply --create-prefix to create all"
1711
" leading parent directories."
2108
" leading parent directories.")
1713
2110
to_transport.create_prefix()
1716
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2113
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1717
2114
except errors.NotBranchError:
1718
2115
# really a NotBzrDir error...
1719
create_branch = bzrdir.BzrDir.create_branch_convenience
2116
create_branch = controldir.ControlDir.create_branch_convenience
2118
force_new_tree = False
2120
force_new_tree = None
1720
2121
branch = create_branch(to_transport.base, format=format,
1721
possible_transports=[to_transport])
2122
possible_transports=[to_transport],
2123
force_new_tree=force_new_tree)
1722
2124
a_bzrdir = branch.bzrdir
1724
2126
from bzrlib.transport.local import LocalTransport
1800
2204
def run(self, location, format=None, no_trees=False):
1801
2205
if format is None:
1802
format = bzrdir.format_registry.make_bzrdir('default')
2206
format = controldir.format_registry.make_bzrdir('default')
1804
2208
if location is None:
1807
2211
to_transport = transport.get_transport(location)
1808
to_transport.ensure_base()
1810
newdir = format.initialize_on_transport(to_transport)
1811
repo = newdir.create_repository(shared=True)
1812
repo.set_make_working_trees(not no_trees)
2213
(repo, newdir, require_stacking, repository_policy) = (
2214
format.initialize_on_transport_ex(to_transport,
2215
create_prefix=True, make_working_trees=not no_trees,
2216
shared_repo=True, force_new_repo=True,
2217
use_existing_dir=True,
2218
repo_format_name=format.repository_format.get_format_string()))
1813
2219
if not is_quiet():
1814
2220
from bzrlib.info import show_bzrdir_info
1815
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2221
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1818
2224
class cmd_diff(Command):
2261
2685
Option('show-diff',
2262
2686
short_name='p',
2263
2687
help='Show changes made in each revision as a patch.'),
2264
Option('include-merges',
2688
Option('include-merged',
2265
2689
help='Show merged revisions like --levels 0 does.'),
2690
Option('include-merges', hidden=True,
2691
help='Historical alias for --include-merged.'),
2692
Option('omit-merges',
2693
help='Do not report commits with more than one parent.'),
2266
2694
Option('exclude-common-ancestry',
2267
2695
help='Display only the revisions that are not part'
2268
' of both ancestries (require -rX..Y)'
2696
' of both ancestries (require -rX..Y).'
2698
Option('signatures',
2699
help='Show digital signature validity.'),
2702
help='Show revisions whose properties match this '
2705
ListOption('match-message',
2706
help='Show revisions whose message matches this '
2709
ListOption('match-committer',
2710
help='Show revisions whose committer matches this '
2713
ListOption('match-author',
2714
help='Show revisions whose authors match this '
2717
ListOption('match-bugs',
2718
help='Show revisions whose bugs match this '
2271
2722
encoding_type = 'replace'
2292
2751
_get_info_for_log_files,
2294
2753
direction = (forward and 'forward') or 'reverse'
2754
if symbol_versioning.deprecated_passed(include_merges):
2755
ui.ui_factory.show_user_warning(
2756
'deprecated_command_option',
2757
deprecated_name='--include-merges',
2758
recommended_name='--include-merged',
2759
deprecated_in_version='2.5',
2760
command=self.invoked_as)
2761
if include_merged is None:
2762
include_merged = include_merges
2764
raise errors.BzrCommandError(gettext(
2765
'{0} and {1} are mutually exclusive').format(
2766
'--include-merges', '--include-merged'))
2767
if include_merged is None:
2768
include_merged = False
2295
2769
if (exclude_common_ancestry
2296
2770
and (revision is None or len(revision) != 2)):
2297
raise errors.BzrCommandError(
2298
'--exclude-common-ancestry requires -r with two revisions')
2771
raise errors.BzrCommandError(gettext(
2772
'--exclude-common-ancestry requires -r with two revisions'))
2300
2774
if levels is None:
2303
raise errors.BzrCommandError(
2304
'--levels and --include-merges are mutually exclusive')
2777
raise errors.BzrCommandError(gettext(
2778
'{0} and {1} are mutually exclusive').format(
2779
'--levels', '--include-merged'))
2306
2781
if change is not None:
2307
2782
if len(change) > 1:
2308
2783
raise errors.RangeInChangeOption()
2309
2784
if revision is not None:
2310
raise errors.BzrCommandError(
2311
'--revision and --change are mutually exclusive')
2785
raise errors.BzrCommandError(gettext(
2786
'{0} and {1} are mutually exclusive').format(
2787
'--revision', '--change'))
2313
2789
revision = change
2690
3195
self.outf.write("%s\n" % pattern)
2692
3197
if not name_pattern_list:
2693
raise errors.BzrCommandError("ignore requires at least one "
2694
"NAME_PATTERN or --default-rules.")
3198
raise errors.BzrCommandError(gettext("ignore requires at least one "
3199
"NAME_PATTERN or --default-rules."))
2695
3200
name_pattern_list = [globbing.normalize_pattern(p)
2696
3201
for p in name_pattern_list]
2697
3202
bad_patterns = ''
3203
bad_patterns_count = 0
2698
3204
for p in name_pattern_list:
2699
3205
if not globbing.Globster.is_pattern_valid(p):
3206
bad_patterns_count += 1
2700
3207
bad_patterns += ('\n %s' % p)
2701
3208
if bad_patterns:
2702
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
3209
msg = (ngettext('Invalid ignore pattern found. %s',
3210
'Invalid ignore patterns found. %s',
3211
bad_patterns_count) % bad_patterns)
2703
3212
ui.ui_factory.show_error(msg)
2704
3213
raise errors.InvalidPattern('')
2705
3214
for name_pattern in name_pattern_list:
2706
3215
if (name_pattern[0] == '/' or
2707
3216
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2708
raise errors.BzrCommandError(
2709
"NAME_PATTERN should not be an absolute path")
3217
raise errors.BzrCommandError(gettext(
3218
"NAME_PATTERN should not be an absolute path"))
2710
3219
tree, relpath = WorkingTree.open_containing(directory)
2711
3220
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2712
3221
ignored = globbing.Globster(name_pattern_list)
2815
3325
Option('per-file-timestamps',
2816
3326
help='Set modification time of files to that of the last '
2817
3327
'revision in which it was changed.'),
3328
Option('uncommitted',
3329
help='Export the working tree contents rather than that of the '
2819
3332
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2820
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
3333
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2821
3335
from bzrlib.export import export
2823
3337
if branch_or_subdir is None:
2824
tree = WorkingTree.open_containing(directory)[0]
3338
branch_or_subdir = directory
3340
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3342
if tree is not None:
3343
self.add_cleanup(tree.lock_read().unlock)
3347
raise errors.BzrCommandError(
3348
gettext("--uncommitted requires a working tree"))
2828
b, subdir = Branch.open_containing(branch_or_subdir)
2831
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3351
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2833
export(rev_tree, dest, format, root, subdir, filtered=filters,
3353
export(export_tree, dest, format, root, subdir, filtered=filters,
2834
3354
per_file_timestamps=per_file_timestamps)
2835
3355
except errors.NoSuchExportFormat, e:
2836
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3356
raise errors.BzrCommandError(
3357
gettext('Unsupported export format: %s') % e.format)
2839
3360
class cmd_cat(Command):
2877
3398
old_file_id = rev_tree.path2id(relpath)
3400
# TODO: Split out this code to something that generically finds the
3401
# best id for a path across one or more trees; it's like
3402
# find_ids_across_trees but restricted to find just one. -- mbp
2879
3404
if name_from_revision:
2880
3405
# Try in revision if requested
2881
3406
if old_file_id is None:
2882
raise errors.BzrCommandError(
2883
"%r is not present in revision %s" % (
3407
raise errors.BzrCommandError(gettext(
3408
"{0!r} is not present in revision {1}").format(
2884
3409
filename, rev_tree.get_revision_id()))
2886
content = rev_tree.get_file_text(old_file_id)
3411
actual_file_id = old_file_id
2888
3413
cur_file_id = tree.path2id(relpath)
2890
if cur_file_id is not None:
2891
# Then try with the actual file id
2893
content = rev_tree.get_file_text(cur_file_id)
2895
except errors.NoSuchId:
2896
# The actual file id didn't exist at that time
2898
if not found and old_file_id is not None:
2899
# Finally try with the old file id
2900
content = rev_tree.get_file_text(old_file_id)
2903
# Can't be found anywhere
2904
raise errors.BzrCommandError(
2905
"%r is not present in revision %s" % (
3414
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3415
actual_file_id = cur_file_id
3416
elif old_file_id is not None:
3417
actual_file_id = old_file_id
3419
raise errors.BzrCommandError(gettext(
3420
"{0!r} is not present in revision {1}").format(
2906
3421
filename, rev_tree.get_revision_id()))
2908
from bzrlib.filters import (
2909
ContentFilterContext,
2910
filtered_output_bytes,
2912
filters = rev_tree._content_filter_stack(relpath)
2913
chunks = content.splitlines(True)
2914
content = filtered_output_bytes(chunks, filters,
2915
ContentFilterContext(relpath, rev_tree))
2917
self.outf.writelines(content)
3423
from bzrlib.filter_tree import ContentFilterTree
3424
filter_tree = ContentFilterTree(rev_tree,
3425
rev_tree._content_filter_stack)
3426
content = filter_tree.get_file_text(actual_file_id)
2920
self.outf.write(content)
3428
content = rev_tree.get_file_text(actual_file_id)
3430
self.outf.write(content)
2923
3433
class cmd_local_time_offset(Command):
2984
3494
to trigger updates to external systems like bug trackers. The --fixes
2985
3495
option can be used to record the association between a revision and
2986
3496
one or more bugs. See ``bzr help bugs`` for details.
2988
A selective commit may fail in some cases where the committed
2989
tree would be invalid. Consider::
2994
bzr commit foo -m "committing foo"
2995
bzr mv foo/bar foo/baz
2998
bzr commit foo/bar -m "committing bar but not baz"
3000
In the example above, the last commit will fail by design. This gives
3001
the user the opportunity to decide whether they want to commit the
3002
rename at the same time, separately first, or not at all. (As a general
3003
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3005
# TODO: Run hooks on tree to-be-committed, and after commit.
3007
# TODO: Strict commit that fails if there are deleted files.
3008
# (what does "deleted files" mean ??)
3010
# TODO: Give better message for -s, --summary, used by tla people
3012
# XXX: verbose currently does nothing
3014
3499
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3015
3500
takes_args = ['selected*']
3047
3532
Option('show-diff', short_name='p',
3048
3533
help='When no message is supplied, show the diff along'
3049
3534
' with the status summary in the message editor.'),
3536
help='When committing to a foreign version control '
3537
'system do not push data that can not be natively '
3051
3540
aliases = ['ci', 'checkin']
3053
3542
def _iter_bug_fix_urls(self, fixes, branch):
3543
default_bugtracker = None
3054
3544
# Configure the properties for bug fixing attributes.
3055
3545
for fixed_bug in fixes:
3056
3546
tokens = fixed_bug.split(':')
3057
if len(tokens) != 2:
3058
raise errors.BzrCommandError(
3547
if len(tokens) == 1:
3548
if default_bugtracker is None:
3549
branch_config = branch.get_config_stack()
3550
default_bugtracker = branch_config.get(
3552
if default_bugtracker is None:
3553
raise errors.BzrCommandError(gettext(
3554
"No tracker specified for bug %s. Use the form "
3555
"'tracker:id' or specify a default bug tracker "
3556
"using the `bugtracker` option.\nSee "
3557
"\"bzr help bugs\" for more information on this "
3558
"feature. Commit refused.") % fixed_bug)
3559
tag = default_bugtracker
3561
elif len(tokens) != 2:
3562
raise errors.BzrCommandError(gettext(
3059
3563
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3060
3564
"See \"bzr help bugs\" for more information on this "
3061
"feature.\nCommit refused." % fixed_bug)
3062
tag, bug_id = tokens
3565
"feature.\nCommit refused.") % fixed_bug)
3567
tag, bug_id = tokens
3064
3569
yield bugtracker.get_bug_url(tag, branch, bug_id)
3065
3570
except errors.UnknownBugTrackerAbbreviation:
3066
raise errors.BzrCommandError(
3067
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3571
raise errors.BzrCommandError(gettext(
3572
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3068
3573
except errors.MalformedBugIdentifier, e:
3069
raise errors.BzrCommandError(
3070
"%s\nCommit refused." % (str(e),))
3574
raise errors.BzrCommandError(gettext(
3575
"%s\nCommit refused.") % (str(e),))
3072
3577
def run(self, message=None, file=None, verbose=False, selected_list=None,
3073
3578
unchanged=False, strict=False, local=False, fixes=None,
3074
author=None, show_diff=False, exclude=None, commit_time=None):
3579
author=None, show_diff=False, exclude=None, commit_time=None,
3075
3581
from bzrlib.errors import (
3076
3582
PointlessCommit,
3077
3583
ConflictsInTree,
3158
3659
# make_commit_message_template_encoded returns user encoding.
3159
3660
# We probably want to be using edit_commit_message instead to
3161
start_message = generate_commit_message_template(commit_obj)
3162
my_message = edit_commit_message_encoded(text,
3163
start_message=start_message)
3164
if my_message is None:
3165
raise errors.BzrCommandError("please specify a commit"
3166
" message with either --message or --file")
3167
if my_message == "":
3168
raise errors.BzrCommandError("empty commit message specified")
3662
my_message = set_commit_message(commit_obj)
3663
if my_message is None:
3664
start_message = generate_commit_message_template(commit_obj)
3665
my_message = edit_commit_message_encoded(text,
3666
start_message=start_message)
3667
if my_message is None:
3668
raise errors.BzrCommandError(gettext("please specify a commit"
3669
" message with either --message or --file"))
3670
if my_message == "":
3671
raise errors.BzrCommandError(gettext("Empty commit message specified."
3672
" Please specify a commit message with either"
3673
" --message or --file or leave a blank message"
3674
" with --message \"\"."))
3169
3675
return my_message
3171
3677
# The API permits a commit with a filter of [] to mean 'select nothing'
3179
3685
reporter=None, verbose=verbose, revprops=properties,
3180
3686
authors=author, timestamp=commit_stamp,
3181
3687
timezone=offset,
3182
exclude=tree.safe_relpath_files(exclude))
3688
exclude=tree.safe_relpath_files(exclude),
3183
3690
except PointlessCommit:
3184
raise errors.BzrCommandError("No changes to commit."
3185
" Use --unchanged to commit anyhow.")
3691
raise errors.BzrCommandError(gettext("No changes to commit."
3692
" Please 'bzr add' the files you want to commit, or use"
3693
" --unchanged to force an empty commit."))
3186
3694
except ConflictsInTree:
3187
raise errors.BzrCommandError('Conflicts detected in working '
3695
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3188
3696
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3190
3698
except StrictCommitFailed:
3191
raise errors.BzrCommandError("Commit refused because there are"
3192
" unknown files in the working tree.")
3699
raise errors.BzrCommandError(gettext("Commit refused because there are"
3700
" unknown files in the working tree."))
3193
3701
except errors.BoundBranchOutOfDate, e:
3194
e.extra_help = ("\n"
3702
e.extra_help = (gettext("\n"
3195
3703
'To commit to master branch, run update and then commit.\n'
3196
3704
'You can also pass --local to commit to continue working '
3271
3779
class cmd_upgrade(Command):
3272
__doc__ = """Upgrade branch storage to current format.
3274
The check command or bzr developers may sometimes advise you to run
3275
this command. When the default format has changed you may also be warned
3276
during other operations to upgrade.
3780
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3782
When the default format has changed after a major new release of
3783
Bazaar, you may be informed during certain operations that you
3784
should upgrade. Upgrading to a newer format may improve performance
3785
or make new features available. It may however limit interoperability
3786
with older repositories or with older versions of Bazaar.
3788
If you wish to upgrade to a particular format rather than the
3789
current default, that can be specified using the --format option.
3790
As a consequence, you can use the upgrade command this way to
3791
"downgrade" to an earlier format, though some conversions are
3792
a one way process (e.g. changing from the 1.x default to the
3793
2.x default) so downgrading is not always possible.
3795
A backup.bzr.~#~ directory is created at the start of the conversion
3796
process (where # is a number). By default, this is left there on
3797
completion. If the conversion fails, delete the new .bzr directory
3798
and rename this one back in its place. Use the --clean option to ask
3799
for the backup.bzr directory to be removed on successful conversion.
3800
Alternatively, you can delete it by hand if everything looks good
3803
If the location given is a shared repository, dependent branches
3804
are also converted provided the repository converts successfully.
3805
If the conversion of a branch fails, remaining branches are still
3808
For more information on upgrades, see the Bazaar Upgrade Guide,
3809
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3279
_see_also = ['check']
3812
_see_also = ['check', 'reconcile', 'formats']
3280
3813
takes_args = ['url?']
3281
3814
takes_options = [
3282
RegistryOption('format',
3283
help='Upgrade to a specific format. See "bzr help'
3284
' formats" for details.',
3285
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3286
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3287
value_switches=True, title='Branch format'),
3815
RegistryOption('format',
3816
help='Upgrade to a specific format. See "bzr help'
3817
' formats" for details.',
3818
lazy_registry=('bzrlib.controldir', 'format_registry'),
3819
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3820
value_switches=True, title='Branch format'),
3822
help='Remove the backup.bzr directory if successful.'),
3824
help="Show what would be done, but don't actually do anything."),
3290
def run(self, url='.', format=None):
3827
def run(self, url='.', format=None, clean=False, dry_run=False):
3291
3828
from bzrlib.upgrade import upgrade
3292
upgrade(url, format)
3829
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3831
if len(exceptions) == 1:
3832
# Compatibility with historical behavior
3295
3838
class cmd_whoami(Command):
3685
4268
The source of the merge can be specified either in the form of a branch,
3686
4269
or in the form of a path to a file containing a merge directive generated
3687
4270
with bzr send. If neither is specified, the default is the upstream branch
3688
or the branch most recently merged using --remember.
3690
When merging a branch, by default the tip will be merged. To pick a different
3691
revision, pass --revision. If you specify two values, the first will be used as
3692
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3693
available revisions, like this is commonly referred to as "cherrypicking".
3695
Revision numbers are always relative to the branch being merged.
3697
By default, bzr will try to merge in all new work from the other
3698
branch, automatically determining an appropriate base. If this
3699
fails, you may need to give an explicit base.
4271
or the branch most recently merged using --remember. The source of the
4272
merge may also be specified in the form of a path to a file in another
4273
branch: in this case, only the modifications to that file are merged into
4274
the current working tree.
4276
When merging from a branch, by default bzr will try to merge in all new
4277
work from the other branch, automatically determining an appropriate base
4278
revision. If this fails, you may need to give an explicit base.
4280
To pick a different ending revision, pass "--revision OTHER". bzr will
4281
try to merge in all new work up to and including revision OTHER.
4283
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4284
through OTHER, excluding BASE but including OTHER, will be merged. If this
4285
causes some revisions to be skipped, i.e. if the destination branch does
4286
not already contain revision BASE, such a merge is commonly referred to as
4287
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4288
cherrypicks. The changes look like a normal commit, and the history of the
4289
changes from the other branch is not stored in the commit.
4291
Revision numbers are always relative to the source branch.
3701
4293
Merge will do its best to combine the changes in two branches, but there
3702
4294
are some kinds of problems only a human can fix. When it encounters those,
3703
4295
it will mark a conflict. A conflict means that you need to fix something,
3704
before you should commit.
4296
before you can commit.
3706
4298
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3708
If there is no default branch set, the first merge will set it. After
3709
that, you can omit the branch to use the default. To change the
3710
default, use --remember. The value will only be saved if the remote
3711
location can be accessed.
4300
If there is no default branch set, the first merge will set it (use
4301
--no-remember to avoid setting it). After that, you can omit the branch
4302
to use the default. To change the default, use --remember. The value will
4303
only be saved if the remote location can be accessed.
3713
4305
The results of the merge are placed into the destination working
3714
4306
directory, where they can be reviewed (with bzr diff), tested, and then
3715
4307
committed to record the result of the merge.
3717
4309
merge refuses to run if there are any uncommitted changes, unless
3718
--force is given. The --force option can also be used to create a
4310
--force is given. If --force is given, then the changes from the source
4311
will be merged with the current working tree, including any uncommitted
4312
changes in the tree. The --force option can also be used to create a
3719
4313
merge revision which has more than two parents.
3721
4315
If one would like to merge changes from the working tree of the other
3845
4443
self.sanity_check_merger(merger)
3846
4444
if (merger.base_rev_id == merger.other_rev_id and
3847
4445
merger.other_rev_id is not None):
3848
note('Nothing to do.')
4446
# check if location is a nonexistent file (and not a branch) to
4447
# disambiguate the 'Nothing to do'
4448
if merger.interesting_files:
4449
if not merger.other_tree.has_filename(
4450
merger.interesting_files[0]):
4451
note(gettext("merger: ") + str(merger))
4452
raise errors.PathsDoNotExist([location])
4453
note(gettext('Nothing to do.'))
4455
if pull and not preview:
3851
4456
if merger.interesting_files is not None:
3852
raise errors.BzrCommandError('Cannot pull individual files')
4457
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3853
4458
if (merger.base_rev_id == tree.last_revision()):
3854
4459
result = tree.pull(merger.other_branch, False,
3855
4460
merger.other_rev_id)
3856
4461
result.report(self.outf)
3858
4463
if merger.this_basis is None:
3859
raise errors.BzrCommandError(
4464
raise errors.BzrCommandError(gettext(
3860
4465
"This branch has no commits."
3861
" (perhaps you would prefer 'bzr pull')")
4466
" (perhaps you would prefer 'bzr pull')"))
3863
4468
return self._do_preview(merger)
3864
4469
elif interactive:
3962
4567
if other_revision_id is None:
3963
4568
other_revision_id = _mod_revision.ensure_null(
3964
4569
other_branch.last_revision())
3965
# Remember where we merge from
3966
if ((remember or tree.branch.get_submit_branch() is None) and
3967
user_location is not None):
4570
# Remember where we merge from. We need to remember if:
4571
# - user specify a location (and we don't merge from the parent
4573
# - user ask to remember or there is no previous location set to merge
4574
# from and user didn't ask to *not* remember
4575
if (user_location is not None
4577
or (remember is None
4578
and tree.branch.get_submit_branch() is None)))):
3968
4579
tree.branch.set_submit_branch(other_branch.base)
3969
_merge_tags_if_possible(other_branch, tree.branch)
4580
# Merge tags (but don't set them in the master branch yet, the user
4581
# might revert this merge). Commit will propagate them.
4582
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3970
4583
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3971
4584
other_revision_id, base_revision_id, other_branch, base_branch)
3972
4585
if other_path != '':
4135
4749
class cmd_revert(Command):
4136
__doc__ = """Revert files to a previous revision.
4751
Set files in the working tree back to the contents of a previous revision.
4138
4753
Giving a list of files will revert only those files. Otherwise, all files
4139
4754
will be reverted. If the revision is not specified with '--revision', the
4140
last committed revision is used.
4755
working tree basis revision is used. A revert operation affects only the
4756
working tree, not any revision history like the branch and repository or
4757
the working tree basis revision.
4142
4759
To remove only some changes, without reverting to a prior version, use
4143
merge instead. For example, "merge . --revision -2..-3" will remove the
4144
changes introduced by -2, without affecting the changes introduced by -1.
4145
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4760
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4761
will remove the changes introduced by the second last commit (-2), without
4762
affecting the changes introduced by the last commit (-1). To remove
4763
certain changes on a hunk-by-hunk basis, see the shelve command.
4764
To update the branch to a specific revision or the latest revision and
4765
update the working tree accordingly while preserving local changes, see the
4147
By default, any files that have been manually changed will be backed up
4148
first. (Files changed only by merge are not backed up.) Backup files have
4149
'.~#~' appended to their name, where # is a number.
4768
Uncommitted changes to files that are reverted will be discarded.
4769
Howver, by default, any files that have been manually changed will be
4770
backed up first. (Files changed only by merge are not backed up.) Backup
4771
files have '.~#~' appended to their name, where # is a number.
4151
4773
When you provide files, you can use their current pathname or the pathname
4152
4774
from the target revision. So you can use revert to "undelete" a file by
4313
4937
theirs_only=False,
4314
4938
log_format=None, long=False, short=False, line=False,
4315
4939
show_ids=False, verbose=False, this=False, other=False,
4316
include_merges=False, revision=None, my_revision=None,
4940
include_merged=None, revision=None, my_revision=None,
4942
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4318
4943
from bzrlib.missing import find_unmerged, iter_log_revisions
4319
4944
def message(s):
4320
4945
if not is_quiet():
4321
4946
self.outf.write(s)
4948
if symbol_versioning.deprecated_passed(include_merges):
4949
ui.ui_factory.show_user_warning(
4950
'deprecated_command_option',
4951
deprecated_name='--include-merges',
4952
recommended_name='--include-merged',
4953
deprecated_in_version='2.5',
4954
command=self.invoked_as)
4955
if include_merged is None:
4956
include_merged = include_merges
4958
raise errors.BzrCommandError(gettext(
4959
'{0} and {1} are mutually exclusive').format(
4960
'--include-merges', '--include-merged'))
4961
if include_merged is None:
4962
include_merged = False
4324
4964
mine_only = this
4391
5037
if remote_extra and not mine_only:
4392
5038
if printed_local is True:
4393
5039
message("\n\n\n")
4394
message("You are missing %d revision(s):\n" %
5040
message(ngettext("You are missing %d revision:\n",
5041
"You are missing %d revisions:\n",
5042
len(remote_extra)) %
4395
5043
len(remote_extra))
5044
if remote_branch.supports_tags():
5045
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4396
5046
for revision in iter_log_revisions(remote_extra,
4397
5047
remote_branch.repository,
4399
5050
lf.log_revision(revision)
4400
5051
status_code = 1
4402
5053
if mine_only and not local_extra:
4403
5054
# We checked local, and found nothing extra
4404
message('This branch is up to date.\n')
5055
message(gettext('This branch has no new revisions.\n'))
4405
5056
elif theirs_only and not remote_extra:
4406
5057
# We checked remote, and found nothing extra
4407
message('Other branch is up to date.\n')
5058
message(gettext('Other branch has no new revisions.\n'))
4408
5059
elif not (mine_only or theirs_only or local_extra or
4410
5061
# We checked both branches, and neither one had extra
4412
message("Branches are up to date.\n")
5063
message(gettext("Branches are up to date.\n"))
4413
5064
self.cleanup_now()
4414
5065
if not status_code and parent is None and other_branch is not None:
4415
5066
self.add_cleanup(local_branch.lock_write().unlock)
4564
5201
self.add_cleanup(branch.lock_read().unlock)
4565
5202
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4566
5203
self.add_cleanup(tree.lock_read().unlock)
5204
if wt is not None and revision is None:
4568
5205
file_id = wt.path2id(relpath)
4570
5207
file_id = tree.path2id(relpath)
4571
5208
if file_id is None:
4572
5209
raise errors.NotVersionedError(filename)
4573
file_version = tree.inventory[file_id].revision
4574
5210
if wt is not None and revision is None:
4575
5211
# If there is a tree and we're not annotating historical
4576
5212
# versions, annotate the working tree's content.
4577
5213
annotate_file_tree(wt, file_id, self.outf, long, all,
4578
5214
show_ids=show_ids)
4580
annotate_file(branch, file_version, file_id, long, all, self.outf,
5216
annotate_file_tree(tree, file_id, self.outf, long, all,
5217
show_ids=show_ids, branch=branch)
4584
5220
class cmd_re_sign(Command):
4669
5305
location = b.get_old_bound_location()
4670
5306
except errors.UpgradeRequired:
4671
raise errors.BzrCommandError('No location supplied. '
4672
'This format does not remember old locations.')
5307
raise errors.BzrCommandError(gettext('No location supplied. '
5308
'This format does not remember old locations.'))
4674
5310
if location is None:
4675
5311
if b.get_bound_location() is not None:
4676
raise errors.BzrCommandError('Branch is already bound')
5312
raise errors.BzrCommandError(
5313
gettext('Branch is already bound'))
4678
raise errors.BzrCommandError('No location supplied '
4679
'and no previous location known')
5315
raise errors.BzrCommandError(
5316
gettext('No location supplied'
5317
' and no previous location known'))
4680
5318
b_other = Branch.open(location)
4682
5320
b.bind(b_other)
4683
5321
except errors.DivergedBranches:
4684
raise errors.BzrCommandError('These branches have diverged.'
4685
' Try merging, and then bind again.')
5322
raise errors.BzrCommandError(gettext('These branches have diverged.'
5323
' Try merging, and then bind again.'))
4686
5324
if b.get_config().has_explicit_nickname():
4687
5325
b.nick = b_other.nick
4792
5433
end_revision=last_revno)
4795
self.outf.write('Dry-run, pretending to remove'
4796
' the above revisions.\n')
5436
self.outf.write(gettext('Dry-run, pretending to remove'
5437
' the above revisions.\n'))
4798
self.outf.write('The above revision(s) will be removed.\n')
5439
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4801
if not ui.ui_factory.get_boolean('Are you sure'):
4802
self.outf.write('Canceled')
5442
if not ui.ui_factory.confirm_action(
5443
gettext(u'Uncommit these revisions'),
5444
'bzrlib.builtins.uncommit',
5446
self.outf.write(gettext('Canceled\n'))
4805
5449
mutter('Uncommitting from {%s} to {%s}',
4806
5450
last_rev_id, rev_id)
4807
5451
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4808
revno=revno, local=local)
4809
self.outf.write('You can restore the old tip by running:\n'
4810
' bzr pull . -r revid:%s\n' % last_rev_id)
5452
revno=revno, local=local, keep_tags=keep_tags)
5453
self.outf.write(gettext('You can restore the old tip by running:\n'
5454
' bzr pull . -r revid:%s\n') % last_rev_id)
4813
5457
class cmd_break_lock(Command):
4891
5542
'option leads to global uncontrolled write access to your '
5545
Option('client-timeout', type=float,
5546
help='Override the default idle client timeout (5min).'),
4896
def get_host_and_port(self, port):
4897
"""Return the host and port to run the smart server on.
4899
If 'port' is None, None will be returned for the host and port.
4901
If 'port' has a colon in it, the string before the colon will be
4902
interpreted as the host.
4904
:param port: A string of the port to run the server on.
4905
:return: A tuple of (host, port), where 'host' is a host name or IP,
4906
and port is an integer TCP/IP port.
4909
if port is not None:
4911
host, port = port.split(':')
4915
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5549
def run(self, listen=None, port=None, inet=False, directory=None,
5550
allow_writes=False, protocol=None, client_timeout=None):
4917
5551
from bzrlib import transport
4918
5552
if directory is None:
4919
5553
directory = os.getcwd()
4920
5554
if protocol is None:
4921
5555
protocol = transport.transport_server_registry.get()
4922
host, port = self.get_host_and_port(port)
4923
url = urlutils.local_path_to_url(directory)
5556
url = transport.location_to_url(directory)
4924
5557
if not allow_writes:
4925
5558
url = 'readonly+' + url
4926
t = transport.get_transport(url)
4927
protocol(t, host, port, inet)
5559
t = transport.get_transport_from_url(url)
5560
protocol(t, listen, port, inet, client_timeout)
4930
5563
class cmd_join(Command):
5060
5693
if submit_branch is None:
5061
5694
submit_branch = branch.get_parent()
5062
5695
if submit_branch is None:
5063
raise errors.BzrCommandError('No submit branch specified or known')
5696
raise errors.BzrCommandError(gettext('No submit branch specified or known'))
5065
5698
stored_public_branch = branch.get_public_branch()
5066
5699
if public_branch is None:
5067
5700
public_branch = stored_public_branch
5068
5701
elif stored_public_branch is None:
5702
# FIXME: Should be done only if we succeed ? -- vila 2012-01-03
5069
5703
branch.set_public_branch(public_branch)
5070
5704
if not include_bundle and public_branch is None:
5071
raise errors.BzrCommandError('No public branch specified or'
5705
raise errors.BzrCommandError(gettext('No public branch specified or'
5073
5707
base_revision_id = None
5074
5708
if revision is not None:
5075
5709
if len(revision) > 2:
5076
raise errors.BzrCommandError('bzr merge-directive takes '
5077
'at most two one revision identifiers')
5710
raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5711
'at most two one revision identifiers'))
5078
5712
revision_id = revision[-1].as_revision_id(branch)
5079
5713
if len(revision) == 2:
5080
5714
base_revision_id = revision[0].as_revision_id(branch)
5336
5976
self.add_cleanup(branch.lock_write().unlock)
5338
5978
if tag_name is None:
5339
raise errors.BzrCommandError("No tag specified to delete.")
5979
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5340
5980
branch.tags.delete_tag(tag_name)
5341
self.outf.write('Deleted tag %s.\n' % tag_name)
5981
note(gettext('Deleted tag %s.') % tag_name)
5344
5984
if len(revision) != 1:
5345
raise errors.BzrCommandError(
5985
raise errors.BzrCommandError(gettext(
5346
5986
"Tags can only be placed on a single revision, "
5348
5988
revision_id = revision[0].as_revision_id(branch)
5350
5990
revision_id = branch.last_revision()
5351
5991
if tag_name is None:
5352
5992
tag_name = branch.automatic_tag_name(revision_id)
5353
5993
if tag_name is None:
5354
raise errors.BzrCommandError(
5355
"Please specify a tag name.")
5356
if (not force) and branch.tags.has_tag(tag_name):
5994
raise errors.BzrCommandError(gettext(
5995
"Please specify a tag name."))
5997
existing_target = branch.tags.lookup_tag(tag_name)
5998
except errors.NoSuchTag:
5999
existing_target = None
6000
if not force and existing_target not in (None, revision_id):
5357
6001
raise errors.TagAlreadyExists(tag_name)
5358
branch.tags.set_tag(tag_name, revision_id)
5359
self.outf.write('Created tag %s.\n' % tag_name)
6002
if existing_target == revision_id:
6003
note(gettext('Tag %s already exists for that revision.') % tag_name)
6005
branch.tags.set_tag(tag_name, revision_id)
6006
if existing_target is None:
6007
note(gettext('Created tag %s.') % tag_name)
6009
note(gettext('Updated tag %s.') % tag_name)
5362
6012
class cmd_tags(Command):
5394
6039
self.add_cleanup(branch.lock_read().unlock)
5396
graph = branch.repository.get_graph()
5397
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5398
revid1, revid2 = rev1.rev_id, rev2.rev_id
5399
# only show revisions between revid1 and revid2 (inclusive)
5400
tags = [(tag, revid) for tag, revid in tags if
5401
graph.is_between(revid, revid1, revid2)]
5404
elif sort == 'time':
5406
for tag, revid in tags:
5408
revobj = branch.repository.get_revision(revid)
5409
except errors.NoSuchRevision:
5410
timestamp = sys.maxint # place them at the end
5412
timestamp = revobj.timestamp
5413
timestamps[revid] = timestamp
5414
tags.sort(key=lambda x: timestamps[x[1]])
6041
# Restrict to the specified range
6042
tags = self._tags_for_range(branch, revision)
6044
sort = tag_sort_methods.get()
5415
6046
if not show_ids:
5416
6047
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5417
6048
for index, (tag, revid) in enumerate(tags):
5428
6061
for tag, revspec in tags:
5429
6062
self.outf.write('%-20s %s\n' % (tag, revspec))
6064
def _tags_for_range(self, branch, revision):
6066
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6067
revid1, revid2 = rev1.rev_id, rev2.rev_id
6068
# _get_revision_range will always set revid2 if it's not specified.
6069
# If revid1 is None, it means we want to start from the branch
6070
# origin which is always a valid ancestor. If revid1 == revid2, the
6071
# ancestry check is useless.
6072
if revid1 and revid1 != revid2:
6073
# FIXME: We really want to use the same graph than
6074
# branch.iter_merge_sorted_revisions below, but this is not
6075
# easily available -- vila 2011-09-23
6076
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6077
# We don't want to output anything in this case...
6079
# only show revisions between revid1 and revid2 (inclusive)
6080
tagged_revids = branch.tags.get_reverse_tag_dict()
6082
for r in branch.iter_merge_sorted_revisions(
6083
start_revision_id=revid2, stop_revision_id=revid1,
6084
stop_rule='include'):
6085
revid_tags = tagged_revids.get(r[0], None)
6087
found.extend([(tag, r[0]) for tag in revid_tags])
5432
6091
class cmd_reconfigure(Command):
5433
6092
__doc__ = """Reconfigure the type of a bzr directory.
5447
6106
takes_args = ['location?']
5448
6107
takes_options = [
5449
6108
RegistryOption.from_kwargs(
5451
title='Target type',
5452
help='The type to reconfigure the directory to.',
6111
help='The relation between branch and tree.',
5453
6112
value_switches=True, enum_switch=False,
5454
6113
branch='Reconfigure to be an unbound branch with no working tree.',
5455
6114
tree='Reconfigure to be an unbound branch with a working tree.',
5456
6115
checkout='Reconfigure to be a bound branch with a working tree.',
5457
6116
lightweight_checkout='Reconfigure to be a lightweight'
5458
6117
' checkout (with no local history).',
6119
RegistryOption.from_kwargs(
6121
title='Repository type',
6122
help='Location fo the repository.',
6123
value_switches=True, enum_switch=False,
5459
6124
standalone='Reconfigure to be a standalone branch '
5460
6125
'(i.e. stop using shared repository).',
5461
6126
use_shared='Reconfigure to use a shared repository.',
6128
RegistryOption.from_kwargs(
6130
title='Trees in Repository',
6131
help='Whether new branches in the repository have trees.',
6132
value_switches=True, enum_switch=False,
5462
6133
with_trees='Reconfigure repository to create '
5463
6134
'working trees on branches by default.',
5464
6135
with_no_trees='Reconfigure repository to not create '
5491
6162
# At the moment you can use --stacked-on and a different
5492
6163
# reconfiguration shape at the same time; there seems no good reason
5494
if target_type is None:
6165
if (tree_type is None and
6166
repository_type is None and
6167
repository_trees is None):
5495
6168
if stacked_on or unstacked:
5498
raise errors.BzrCommandError('No target configuration '
5500
elif target_type == 'branch':
6171
raise errors.BzrCommandError(gettext('No target configuration '
6173
reconfiguration = None
6174
if tree_type == 'branch':
5501
6175
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5502
elif target_type == 'tree':
6176
elif tree_type == 'tree':
5503
6177
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5504
elif target_type == 'checkout':
6178
elif tree_type == 'checkout':
5505
6179
reconfiguration = reconfigure.Reconfigure.to_checkout(
5506
6180
directory, bind_to)
5507
elif target_type == 'lightweight-checkout':
6181
elif tree_type == 'lightweight-checkout':
5508
6182
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5509
6183
directory, bind_to)
5510
elif target_type == 'use-shared':
6185
reconfiguration.apply(force)
6186
reconfiguration = None
6187
if repository_type == 'use-shared':
5511
6188
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5512
elif target_type == 'standalone':
6189
elif repository_type == 'standalone':
5513
6190
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5514
elif target_type == 'with-trees':
6192
reconfiguration.apply(force)
6193
reconfiguration = None
6194
if repository_trees == 'with-trees':
5515
6195
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5516
6196
directory, True)
5517
elif target_type == 'with-no-trees':
6197
elif repository_trees == 'with-no-trees':
5518
6198
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5519
6199
directory, False)
5520
reconfiguration.apply(force)
6201
reconfiguration.apply(force)
6202
reconfiguration = None
5523
6205
class cmd_switch(Command):
5558
6240
from bzrlib import switch
5559
6241
tree_location = directory
5560
6242
revision = _get_one_revision('switch', revision)
5561
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6243
possible_transports = []
6244
control_dir = controldir.ControlDir.open_containing(tree_location,
6245
possible_transports=possible_transports)[0]
5562
6246
if to_location is None:
5563
6247
if revision is None:
5564
raise errors.BzrCommandError('You must supply either a'
5565
' revision or a location')
6248
raise errors.BzrCommandError(gettext('You must supply either a'
6249
' revision or a location'))
5566
6250
to_location = tree_location
5568
branch = control_dir.open_branch()
6252
branch = control_dir.open_branch(
6253
possible_transports=possible_transports)
5569
6254
had_explicit_nick = branch.get_config().has_explicit_nickname()
5570
6255
except errors.NotBranchError:
5572
6257
had_explicit_nick = False
5573
6258
if create_branch:
5574
6259
if branch is None:
5575
raise errors.BzrCommandError('cannot create branch without'
5577
to_location = directory_service.directories.dereference(
5579
if '/' not in to_location and '\\' not in to_location:
5580
# This path is meant to be relative to the existing branch
5581
this_url = self._get_branch_location(control_dir)
5582
to_location = urlutils.join(this_url, '..', to_location)
6260
raise errors.BzrCommandError(
6261
gettext('cannot create branch without source branch'))
6262
to_location = lookup_new_sibling_branch(control_dir, to_location,
6263
possible_transports=possible_transports)
5583
6264
to_branch = branch.bzrdir.sprout(to_location,
5584
possible_transports=[branch.bzrdir.root_transport],
5585
source_branch=branch).open_branch()
6265
possible_transports=possible_transports,
6266
source_branch=branch).open_branch()
5588
to_branch = Branch.open(to_location)
6269
to_branch = Branch.open(to_location,
6270
possible_transports=possible_transports)
5589
6271
except errors.NotBranchError:
5590
this_url = self._get_branch_location(control_dir)
5591
to_branch = Branch.open(
5592
urlutils.join(this_url, '..', to_location))
6272
to_branch = open_sibling_branch(control_dir, to_location,
6273
possible_transports=possible_transports)
5593
6274
if revision is not None:
5594
6275
revision = revision.as_revision_id(to_branch)
5595
6276
switch.switch(control_dir, to_branch, force, revision_id=revision)
5596
6277
if had_explicit_nick:
5597
6278
branch = control_dir.open_branch() #get the new branch!
5598
6279
branch.nick = to_branch.nick
5599
note('Switched to branch: %s',
6280
note(gettext('Switched to branch: %s'),
5600
6281
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5602
def _get_branch_location(self, control_dir):
5603
"""Return location of branch for this control dir."""
5605
this_branch = control_dir.open_branch()
5606
# This may be a heavy checkout, where we want the master branch
5607
master_location = this_branch.get_bound_location()
5608
if master_location is not None:
5609
return master_location
5610
# If not, use a local sibling
5611
return this_branch.base
5612
except errors.NotBranchError:
5613
format = control_dir.find_branch_format()
5614
if getattr(format, 'get_reference', None) is not None:
5615
return format.get_reference(control_dir)
5617
return control_dir.root_transport.base
5620
6285
class cmd_view(Command):
5711
6376
name = current_view
5714
raise errors.BzrCommandError(
5715
"Both --delete and a file list specified")
6379
raise errors.BzrCommandError(gettext(
6380
"Both --delete and a file list specified"))
5717
raise errors.BzrCommandError(
5718
"Both --delete and --switch specified")
6382
raise errors.BzrCommandError(gettext(
6383
"Both --delete and --switch specified"))
5720
6385
tree.views.set_view_info(None, {})
5721
self.outf.write("Deleted all views.\n")
6386
self.outf.write(gettext("Deleted all views.\n"))
5722
6387
elif name is None:
5723
raise errors.BzrCommandError("No current view to delete")
6388
raise errors.BzrCommandError(gettext("No current view to delete"))
5725
6390
tree.views.delete_view(name)
5726
self.outf.write("Deleted '%s' view.\n" % name)
6391
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5729
raise errors.BzrCommandError(
5730
"Both --switch and a file list specified")
6394
raise errors.BzrCommandError(gettext(
6395
"Both --switch and a file list specified"))
5732
raise errors.BzrCommandError(
5733
"Both --switch and --all specified")
6397
raise errors.BzrCommandError(gettext(
6398
"Both --switch and --all specified"))
5734
6399
elif switch == 'off':
5735
6400
if current_view is None:
5736
raise errors.BzrCommandError("No current view to disable")
6401
raise errors.BzrCommandError(gettext("No current view to disable"))
5737
6402
tree.views.set_view_info(None, view_dict)
5738
self.outf.write("Disabled '%s' view.\n" % (current_view))
6403
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5740
6405
tree.views.set_view_info(switch, view_dict)
5741
6406
view_str = views.view_display_str(tree.views.lookup_view())
5742
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6407
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5745
self.outf.write('Views defined:\n')
6410
self.outf.write(gettext('Views defined:\n'))
5746
6411
for view in sorted(view_dict):
5747
6412
if view == current_view:
5751
6416
view_str = views.view_display_str(view_dict[view])
5752
6417
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5754
self.outf.write('No views defined.\n')
6419
self.outf.write(gettext('No views defined.\n'))
5755
6420
elif file_list:
5756
6421
if name is None:
5757
6422
# No name given and no current view set
5759
6424
elif name == 'off':
5760
raise errors.BzrCommandError(
5761
"Cannot change the 'off' pseudo view")
6425
raise errors.BzrCommandError(gettext(
6426
"Cannot change the 'off' pseudo view"))
5762
6427
tree.views.set_view(name, sorted(file_list))
5763
6428
view_str = views.view_display_str(tree.views.lookup_view())
5764
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6429
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5766
6431
# list the files
5767
6432
if name is None:
5768
6433
# No name given and no current view set
5769
self.outf.write('No current view.\n')
6434
self.outf.write(gettext('No current view.\n'))
5771
6436
view_str = views.view_display_str(tree.views.lookup_view(name))
5772
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6437
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5775
6440
class cmd_hooks(Command):
5809
6474
takes_args = ["location?"]
6476
takes_options = ['directory',
6477
Option('force', help='Remove branch even if it is the active branch.')]
5811
6479
aliases = ["rmbranch"]
5813
def run(self, location=None):
5814
if location is None:
5816
branch = Branch.open_containing(location)[0]
5817
branch.bzrdir.destroy_branch()
6481
def run(self, directory=None, location=None, force=False):
6482
br = open_nearby_branch(near=directory, location=location)
6483
if not force and br.bzrdir.has_workingtree():
6485
active_branch = br.bzrdir.open_branch(name="")
6486
except errors.NotBranchError:
6487
active_branch = None
6488
if (active_branch is not None and
6489
br.control_url == active_branch.control_url):
6490
raise errors.BzrCommandError(
6491
gettext("Branch is active. Use --force to remove it."))
6492
br.bzrdir.destroy_branch(br.name)
5820
6495
class cmd_shelve(Command):
5821
6496
__doc__ = """Temporarily set aside some changes from the current tree.
6007
6696
self.outf.write('%s %s\n' % (path, location))
6699
class cmd_export_pot(Command):
6700
__doc__ = """Export command helps and error messages in po format."""
6703
takes_options = [Option('plugin',
6704
help='Export help text from named command '\
6705
'(defaults to all built in commands).',
6707
Option('include-duplicates',
6708
help='Output multiple copies of the same msgid '
6709
'string if it appears more than once.'),
6712
def run(self, plugin=None, include_duplicates=False):
6713
from bzrlib.export_pot import export_pot
6714
export_pot(self.outf, plugin, include_duplicates)
6010
6717
def _register_lazy_builtins():
6011
6718
# register lazy builtins from other modules; called at startup and should
6012
6719
# be only called once.
6013
6720
for (name, aliases, module_name) in [
6014
6721
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6722
('cmd_config', [], 'bzrlib.config'),
6015
6723
('cmd_dpush', [], 'bzrlib.foreign'),
6016
6724
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6017
6725
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6018
6726
('cmd_conflicts', [], 'bzrlib.conflicts'),
6019
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6727
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6728
('cmd_verify_signatures', [], 'bzrlib.commit_signature_commands'),
6729
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6021
6731
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
