14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
"""builtin brz commands"""
17
"""builtin bzr commands"""
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
30
from . import lazy_import
31
lazy_import.lazy_import(globals(), """
36
branch as _mod_branch,
42
config as _mod_config,
48
41
merge as _mod_merge,
49
mergeable as _mod_mergeable,
54
46
revision as _mod_revision,
63
from breezy.branch import Branch
64
from breezy.conflicts import ConflictList
65
from breezy.transport import memory
66
from breezy.smtp_connection import SMTPConnection
67
from breezy.workingtree import WorkingTree
68
from breezy.i18n import gettext, ngettext
55
from bzrlib.branch import Branch
56
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
from bzrlib.smtp_connection import SMTPConnection
60
from bzrlib.workingtree import WorkingTree
71
from .commands import (
63
from bzrlib.commands import (
73
65
builtin_command_registry,
68
from bzrlib.option import (
81
73
_parse_revision_str,
83
from .revisionspec import (
87
from .trace import mutter, note, warning, is_quiet, get_verbosity_level
90
def _get_branch_location(control_dir, possible_transports=None):
91
"""Return location of branch for this control dir."""
93
target = control_dir.get_branch_reference()
94
except errors.NotBranchError:
95
return control_dir.root_transport.base
96
if target is not None:
98
this_branch = control_dir.open_branch(
99
possible_transports=possible_transports)
100
# This may be a heavy checkout, where we want the master branch
101
master_location = this_branch.get_bound_location()
102
if master_location is not None:
103
return master_location
104
# If not, use a local sibling
105
return this_branch.base
108
def _is_colocated(control_dir, possible_transports=None):
109
"""Check if the branch in control_dir is colocated.
111
:param control_dir: Control directory
112
:return: Tuple with boolean indicating whether the branch is colocated
113
and the full URL to the actual branch
115
# This path is meant to be relative to the existing branch
116
this_url = _get_branch_location(
117
control_dir, possible_transports=possible_transports)
118
# Perhaps the target control dir supports colocated branches?
120
root = controldir.ControlDir.open(
121
this_url, possible_transports=possible_transports)
122
except errors.NotBranchError:
123
return (False, this_url)
126
control_dir.open_workingtree()
127
except (errors.NoWorkingTree, errors.NotLocalUrl):
128
return (False, this_url)
131
root._format.colocated_branches and
132
control_dir.control_url == root.control_url,
136
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
137
"""Lookup the location for a new sibling branch.
139
:param control_dir: Control directory to find sibling branches from
140
:param location: Name of the new branch
141
:return: Full location to the new branch
143
location = directory_service.directories.dereference(location)
144
if '/' not in location and '\\' not in location:
145
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
148
return urlutils.join_segment_parameters(
149
this_url, {"branch": urlutils.escape(location)})
151
return urlutils.join(this_url, '..', urlutils.escape(location))
155
def open_sibling_branch(control_dir, location, possible_transports=None):
156
"""Open a branch, possibly a sibling of another.
158
:param control_dir: Control directory relative to which to lookup the
160
:param location: Location to look up
161
:return: branch to open
164
# Perhaps it's a colocated branch?
165
return control_dir.open_branch(
166
location, possible_transports=possible_transports)
167
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
168
this_url = _get_branch_location(control_dir)
171
this_url, '..', urlutils.escape(location)))
174
def open_nearby_branch(near=None, location=None, possible_transports=None):
175
"""Open a nearby branch.
177
:param near: Optional location of container from which to open branch
178
:param location: Location of the branch
179
:return: Branch instance
186
location, possible_transports=possible_transports)
187
except errors.NotBranchError:
189
cdir = controldir.ControlDir.open(
190
near, possible_transports=possible_transports)
191
return open_sibling_branch(
192
cdir, location, possible_transports=possible_transports)
195
def iter_sibling_branches(control_dir, possible_transports=None):
196
"""Iterate over the siblings of a branch.
198
:param control_dir: Control directory for which to look up the siblings
199
:return: Iterator over tuples with branch name and branch object
202
reference = control_dir.get_branch_reference()
203
except errors.NotBranchError:
205
if reference is not None:
207
ref_branch = Branch.open(
208
reference, possible_transports=possible_transports)
209
except errors.NotBranchError:
213
if ref_branch is None or ref_branch.name:
214
if ref_branch is not None:
215
control_dir = ref_branch.controldir
216
for name, branch in control_dir.get_branches().items():
219
repo = ref_branch.controldir.find_repository()
220
for branch in repo.find_branches(using=True):
221
name = urlutils.relative_url(
222
repo.user_url, branch.user_url).rstrip("/")
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
226
88
def tree_files_for_add(file_list):
442
364
def run(self, revision_id=None, revision=None, directory=u'.'):
443
365
if revision_id is not None and revision is not None:
444
raise errors.CommandError(gettext('You can only supply one of'
445
' revision_id or --revision'))
366
raise errors.BzrCommandError('You can only supply one of'
367
' revision_id or --revision')
446
368
if revision_id is None and revision is None:
447
raise errors.CommandError(
448
gettext('You must supply either --revision or a revision_id'))
450
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
452
revisions = getattr(b.repository, "revisions", None)
369
raise errors.BzrCommandError('You must supply either'
370
' --revision or a revision_id')
371
b = WorkingTree.open_containing(directory)[0].branch
373
revisions = b.repository.revisions
453
374
if revisions is None:
454
raise errors.CommandError(
455
gettext('Repository %r does not support '
456
'access to raw revision texts') % b.repository)
375
raise errors.BzrCommandError('Repository %r does not support '
376
'access to raw revision texts')
458
with b.repository.lock_read():
378
b.repository.lock_read()
459
380
# TODO: jam 20060112 should cat-revision always output utf-8?
460
381
if revision_id is not None:
461
revision_id = cache_utf8.encode(revision_id)
382
revision_id = osutils.safe_revision_id(revision_id, warn=False)
463
384
self.print_revision(revisions, revision_id)
464
385
except errors.NoSuchRevision:
466
"The repository {0} contains no revision {1}.").format(
467
b.repository.base, revision_id.decode('utf-8'))
468
raise errors.CommandError(msg)
386
msg = "The repository %s contains no revision %s." % (
387
b.repository.base, revision_id)
388
raise errors.BzrCommandError(msg)
469
389
elif revision is not None:
470
390
for rev in revision:
472
raise errors.CommandError(
473
gettext('You cannot specify a NULL revision.'))
392
raise errors.BzrCommandError(
393
'You cannot specify a NULL revision.')
474
394
rev_id = rev.as_revision_id(b)
475
395
self.print_revision(revisions, rev_id)
397
b.repository.unlock()
400
class cmd_dump_btree(Command):
401
__doc__ = """Dump the contents of a btree index file to stdout.
403
PATH is a btree index file, it can be any URL. This includes things like
404
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
406
By default, the tuples stored in the index file will be displayed. With
407
--raw, we will uncompress the pages, but otherwise display the raw bytes
411
# TODO: Do we want to dump the internal nodes as well?
412
# TODO: It would be nice to be able to dump the un-parsed information,
413
# rather than only going through iter_all_entries. However, this is
414
# good enough for a start
416
encoding_type = 'exact'
417
takes_args = ['path']
418
takes_options = [Option('raw', help='Write the uncompressed bytes out,'
419
' rather than the parsed tuples.'),
422
def run(self, path, raw=False):
423
dirname, basename = osutils.split(path)
424
t = transport.get_transport(dirname)
426
self._dump_raw_bytes(t, basename)
428
self._dump_entries(t, basename)
430
def _get_index_and_bytes(self, trans, basename):
431
"""Create a BTreeGraphIndex and raw bytes."""
432
bt = btree_index.BTreeGraphIndex(trans, basename, None)
433
bytes = trans.get_bytes(basename)
434
bt._file = cStringIO.StringIO(bytes)
435
bt._size = len(bytes)
438
def _dump_raw_bytes(self, trans, basename):
441
# We need to parse at least the root node.
442
# This is because the first page of every row starts with an
443
# uncompressed header.
444
bt, bytes = self._get_index_and_bytes(trans, basename)
445
for page_idx, page_start in enumerate(xrange(0, len(bytes),
446
btree_index._PAGE_SIZE)):
447
page_end = min(page_start + btree_index._PAGE_SIZE, len(bytes))
448
page_bytes = bytes[page_start:page_end]
450
self.outf.write('Root node:\n')
451
header_end, data = bt._parse_header_from_bytes(page_bytes)
452
self.outf.write(page_bytes[:header_end])
454
self.outf.write('\nPage %d\n' % (page_idx,))
455
decomp_bytes = zlib.decompress(page_bytes)
456
self.outf.write(decomp_bytes)
457
self.outf.write('\n')
459
def _dump_entries(self, trans, basename):
461
st = trans.stat(basename)
462
except errors.TransportNotPossible:
463
# We can't stat, so we'll fake it because we have to do the 'get()'
465
bt, _ = self._get_index_and_bytes(trans, basename)
467
bt = btree_index.BTreeGraphIndex(trans, basename, st.st_size)
468
for node in bt.iter_all_entries():
469
# Node is made up of:
470
# (index, key, value, [references])
474
refs_as_tuples = None
476
refs_as_tuples = static_tuple.as_tuples(refs)
477
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
478
self.outf.write('%s\n' % (as_tuple,))
478
481
class cmd_remove_tree(Command):
858
749
takes_options = [
861
Option('include-root',
862
help='Include the entry for the root of the tree, if any.'),
864
help='List entries of a particular kind: file, directory, '
753
help='List entries of a particular kind: file, directory, symlink.',
868
756
takes_args = ['file*']
871
def run(self, revision=None, show_ids=False, kind=None, include_root=False,
759
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
873
760
if kind and kind not in ['file', 'directory', 'symlink']:
874
raise errors.CommandError(
875
gettext('invalid kind %r specified') % (kind,))
761
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
877
763
revision = _get_one_revision('inventory', revision)
878
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
879
self.enter_context(work_tree.lock_read())
764
work_tree, file_list = tree_files(file_list)
765
self.add_cleanup(work_tree.lock_read().unlock)
880
766
if revision is not None:
881
767
tree = revision.as_tree(work_tree.branch)
883
769
extra_trees = [work_tree]
884
self.enter_context(tree.lock_read())
770
self.add_cleanup(tree.lock_read().unlock)
889
self.enter_context(tree.lock_read())
890
775
if file_list is not None:
891
paths = tree.find_related_paths_across_trees(
892
file_list, extra_trees, require_versioned=True)
776
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
require_versioned=True)
893
778
# find_ids_across_trees may include some paths that don't
894
779
# exist in 'tree'.
895
entries = tree.iter_entries_by_dir(specific_files=paths)
780
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
781
for file_id in file_ids if file_id in tree)
897
entries = tree.iter_entries_by_dir()
783
entries = tree.inventory.entries()
899
for path, entry in sorted(entries):
786
for path, entry in entries:
900
787
if kind and kind != entry.kind:
902
if path == "" and not include_root:
905
self.outf.write('%-50s %s\n' % (
906
path, entry.file_id.decode('utf-8')))
790
self.outf.write('%-50s %s\n' % (path, entry.file_id))
908
792
self.outf.write(path)
909
793
self.outf.write('\n')
912
class cmd_cp(Command):
913
__doc__ = """Copy a file.
916
brz cp OLDNAME NEWNAME
918
brz cp SOURCE... DESTINATION
920
If the last argument is a versioned directory, all the other names
921
are copied into it. Otherwise, there must be exactly two arguments
922
and the file is copied to a new name.
924
Files cannot be copied between branches. Only files can be copied
928
takes_args = ['names*']
931
encoding_type = 'replace'
933
def run(self, names_list):
934
if names_list is None:
936
if len(names_list) < 2:
937
raise errors.CommandError(gettext("missing file argument"))
938
tree, rel_names = WorkingTree.open_containing_paths(
939
names_list, canonicalize=False)
940
for file_name in rel_names[0:-1]:
942
raise errors.CommandError(
943
gettext("can not copy root of branch"))
944
self.enter_context(tree.lock_tree_write())
945
into_existing = osutils.isdir(names_list[-1])
946
if not into_existing:
948
(src, dst) = rel_names
950
raise errors.CommandError(
951
gettext('to copy multiple files the'
952
' destination must be a versioned'
957
(n, osutils.joinpath([rel_names[-1], osutils.basename(n)]))
958
for n in rel_names[:-1]]
960
for src, dst in pairs:
962
src_kind = tree.stored_kind(src)
963
except errors.NoSuchFile:
964
raise errors.CommandError(
965
gettext('Could not copy %s => %s: %s is not versioned.')
968
raise errors.CommandError(
969
gettext('Could not copy %s => %s . %s is not versioned\\.'
971
if src_kind == 'directory':
972
raise errors.CommandError(
973
gettext('Could not copy %s => %s . %s is a directory.'
975
dst_parent = osutils.split(dst)[0]
978
dst_parent_kind = tree.stored_kind(dst_parent)
979
except errors.NoSuchFile:
980
raise errors.CommandError(
981
gettext('Could not copy %s => %s: %s is not versioned.')
982
% (src, dst, dst_parent))
983
if dst_parent_kind != 'directory':
984
raise errors.CommandError(
985
gettext('Could not copy to %s: %s is not a directory.')
986
% (dst_parent, dst_parent))
988
tree.copy_one(src, dst)
991
796
class cmd_mv(Command):
992
797
__doc__ = """Move or rename a file.
995
brz mv OLDNAME NEWNAME
800
bzr mv OLDNAME NEWNAME
997
brz mv SOURCE... DESTINATION
802
bzr mv SOURCE... DESTINATION
999
804
If the last argument is a versioned directory, all the other names
1000
805
are moved into it. Otherwise, there must be exactly two arguments
1291
1062
considered diverged if the destination branch's most recent commit is one
1292
1063
that has not been merged (directly or indirectly) by the source branch.
1294
If branches have diverged, you can use 'brz push --overwrite' to replace
1065
If branches have diverged, you can use 'bzr push --overwrite' to replace
1295
1066
the other branch completely, discarding its unmerged changes.
1297
1068
If you want to ensure you have the different changes in the other branch,
1298
do a merge (see brz help merge) from the other branch, and commit that.
1069
do a merge (see bzr help merge) from the other branch, and commit that.
1299
1070
After that you will be able to do a push without '--overwrite'.
1301
If there is no default push location set, the first push will set it (use
1302
--no-remember to avoid setting it). After that, you can omit the
1303
location to use the default. To change the default, use --remember. The
1304
value will only be saved if the remote location can be accessed.
1306
The --verbose option will display the revisions pushed using the log_format
1307
configuration option. You can use a different format by overriding it with
1308
-Olog_format=<other_format>.
1072
If there is no default push location set, the first push will set it.
1073
After that, you can omit the location to use the default. To change the
1074
default, use --remember. The value will only be saved if the remote
1075
location can be accessed.
1311
1078
_see_also = ['pull', 'update', 'working-trees']
1312
1079
takes_options = ['remember', 'overwrite', 'verbose', 'revision',
1313
Option('create-prefix',
1314
help='Create the path leading up to the branch '
1315
'if it does not already exist.'),
1316
custom_help('directory',
1317
help='Branch to push from, '
1318
'rather than the one containing the working directory.'),
1319
Option('use-existing-dir',
1320
help='By default push will fail if the target'
1321
' directory exists, but does not already'
1322
' have a control directory. This flag will'
1323
' allow push to proceed.'),
1325
help='Create a stacked branch that references the public location '
1326
'of the parent branch.'),
1327
Option('stacked-on',
1328
help='Create a stacked branch that refers to another branch '
1329
'for the commit history. Only the work not present in the '
1330
'referenced branch is included in the branch created.',
1333
help='Refuse to push if there are uncommitted changes in'
1334
' the working tree, --no-strict disables the check.'),
1336
help="Don't populate the working tree, even for protocols"
1337
" that support it."),
1338
Option('overwrite-tags',
1339
help="Overwrite tags only."),
1340
Option('lossy', help="Allow lossy push, i.e. dropping metadata "
1341
"that can't be represented in the target.")
1080
Option('create-prefix',
1081
help='Create the path leading up to the branch '
1082
'if it does not already exist.'),
1083
custom_help('directory',
1084
help='Branch to push from, '
1085
'rather than the one containing the working directory.'),
1086
Option('use-existing-dir',
1087
help='By default push will fail if the target'
1088
' directory exists, but does not already'
1089
' have a control directory. This flag will'
1090
' allow push to proceed.'),
1092
help='Create a stacked branch that references the public location '
1093
'of the parent branch.'),
1094
Option('stacked-on',
1095
help='Create a stacked branch that refers to another branch '
1096
'for the commit history. Only the work not present in the '
1097
'referenced branch is included in the branch created.',
1100
help='Refuse to push if there are uncommitted changes in'
1101
' the working tree, --no-strict disables the check.'),
1343
1103
takes_args = ['location?']
1344
1104
encoding_type = 'replace'
1346
def run(self, location=None, remember=None, overwrite=False,
1347
create_prefix=False, verbose=False, revision=None,
1348
use_existing_dir=False, directory=None, stacked_on=None,
1349
stacked=False, strict=None, no_tree=False,
1350
overwrite_tags=False, lossy=False):
1351
from .location import location_to_url
1352
from .push import _show_push_branch
1355
overwrite = ["history", "tags"]
1356
elif overwrite_tags:
1357
overwrite = ["tags"]
1106
def run(self, location=None, remember=False, overwrite=False,
1107
create_prefix=False, verbose=False, revision=None,
1108
use_existing_dir=False, directory=None, stacked_on=None,
1109
stacked=False, strict=None):
1110
from bzrlib.push import _show_push_branch
1361
1112
if directory is None:
1362
1113
directory = '.'
1363
1114
# Get the source branch
1364
1115
(tree, br_from,
1365
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1116
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1366
1117
# Get the tip's revision_id
1367
1118
revision = _get_one_revision('push', revision)
1368
1119
if revision is not None:
1434
1175
parameter, as in "branch foo/bar -r 5".
1438
1178
_see_also = ['checkout']
1439
1179
takes_args = ['from_location', 'to_location?']
1440
takes_options = ['revision',
1442
'hardlink', help='Hard-link working tree files where possible.'),
1443
Option('files-from', type=str,
1444
help="Get file contents from this tree."),
1446
help="Create a branch without a working-tree."),
1448
help="Switch the checkout in the current directory "
1449
"to the new branch."),
1451
help='Create a stacked branch referring to the source branch. '
1452
'The new branch will depend on the availability of the source '
1453
'branch for all operations.'),
1454
Option('standalone',
1455
help='Do not use a shared repository, even if available.'),
1456
Option('use-existing-dir',
1457
help='By default branch will fail if the target'
1458
' directory exists, but does not already'
1459
' have a control directory. This flag will'
1460
' allow branch to proceed.'),
1462
help="Bind new branch to from location."),
1463
Option('no-recurse-nested',
1464
help='Do not recursively check out nested trees.'),
1465
Option('colocated-branch', short_name='b',
1466
type=str, help='Name of colocated branch to sprout.'),
1180
takes_options = ['revision', Option('hardlink',
1181
help='Hard-link working tree files where possible.'),
1183
help="Create a branch without a working-tree."),
1185
help="Switch the checkout in the current directory "
1186
"to the new branch."),
1188
help='Create a stacked branch referring to the source branch. '
1189
'The new branch will depend on the availability of the source '
1190
'branch for all operations.'),
1191
Option('standalone',
1192
help='Do not use a shared repository, even if available.'),
1193
Option('use-existing-dir',
1194
help='By default branch will fail if the target'
1195
' directory exists, but does not already'
1196
' have a control directory. This flag will'
1197
' allow branch to proceed.'),
1199
help="Bind new branch to from location."),
1201
aliases = ['get', 'clone']
1469
1203
def run(self, from_location, to_location=None, revision=None,
1470
1204
hardlink=False, stacked=False, standalone=False, no_tree=False,
1471
use_existing_dir=False, switch=False, bind=False,
1472
files_from=None, no_recurse_nested=False, colocated_branch=None):
1473
from breezy import switch as _mod_switch
1474
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1475
from_location, name=colocated_branch)
1476
if no_recurse_nested:
1480
if not (hardlink or files_from):
1481
# accelerator_tree is usually slower because you have to read N
1482
# files (no readahead, lots of seeks, etc), but allow the user to
1483
# explicitly request it
1484
accelerator_tree = None
1485
if files_from is not None and files_from != from_location:
1486
accelerator_tree = WorkingTree.open(files_from)
1205
use_existing_dir=False, switch=False, bind=False):
1206
from bzrlib import switch as _mod_switch
1207
from bzrlib.tag import _merge_tags_if_possible
1208
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1487
1210
revision = _get_one_revision('branch', revision)
1488
self.enter_context(br_from.lock_read())
1211
self.add_cleanup(br_from.lock_read().unlock)
1489
1212
if revision is not None:
1490
1213
revision_id = revision.as_revision_id(br_from)
1495
1218
revision_id = br_from.last_revision()
1496
1219
if to_location is None:
1497
1220
to_location = urlutils.derive_to_location(from_location)
1498
to_transport = transport.get_transport(to_location, purpose='write')
1221
to_transport = transport.get_transport(to_location)
1500
1223
to_transport.mkdir('.')
1501
1224
except errors.FileExists:
1503
to_dir = controldir.ControlDir.open_from_transport(
1505
except errors.NotBranchError:
1506
if not use_existing_dir:
1507
raise errors.CommandError(gettext('Target directory "%s" '
1508
'already exists.') % to_location)
1225
if not use_existing_dir:
1226
raise errors.BzrCommandError('Target directory "%s" '
1227
'already exists.' % to_location)
1513
to_dir.open_branch()
1230
bzrdir.BzrDir.open_from_transport(to_transport)
1514
1231
except errors.NotBranchError:
1517
1234
raise errors.AlreadyBranchError(to_location)
1518
1235
except errors.NoSuchFile:
1519
raise errors.CommandError(gettext('Parent of "%s" does not exist.')
1236
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1525
# preserve whatever source format we have.
1526
to_dir = br_from.controldir.sprout(
1527
to_transport.base, revision_id,
1528
possible_transports=[to_transport],
1529
accelerator_tree=accelerator_tree, hardlink=hardlink,
1530
stacked=stacked, force_new_repo=standalone,
1531
create_tree_if_local=not no_tree, source_branch=br_from,
1533
branch = to_dir.open_branch(
1534
possible_transports=[
1535
br_from.controldir.root_transport, to_transport])
1536
except errors.NoSuchRevision:
1537
to_transport.delete_tree('.')
1538
msg = gettext("The branch {0} has no revision {1}.").format(
1539
from_location, revision)
1540
raise errors.CommandError(msg)
1543
to_repo = to_dir.open_repository()
1544
except errors.NoRepositoryPresent:
1545
to_repo = to_dir.create_repository()
1546
to_repo.fetch(br_from.repository, revision_id=revision_id)
1547
branch = br_from.sprout(
1548
to_dir, revision_id=revision_id)
1549
br_from.tags.merge_to(branch.tags)
1239
# preserve whatever source format we have.
1240
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1241
possible_transports=[to_transport],
1242
accelerator_tree=accelerator_tree,
1243
hardlink=hardlink, stacked=stacked,
1244
force_new_repo=standalone,
1245
create_tree_if_local=not no_tree,
1246
source_branch=br_from)
1247
branch = dir.open_branch()
1248
except errors.NoSuchRevision:
1249
to_transport.delete_tree('.')
1250
msg = "The branch %s has no revision %s." % (from_location,
1252
raise errors.BzrCommandError(msg)
1253
_merge_tags_if_possible(br_from, branch)
1551
1254
# If the source branch is stacked, the new branch may
1552
1255
# be stacked whether we asked for that explicitly or not.
1553
1256
# We therefore need a try/except here and not just 'if stacked:'
1555
note(gettext('Created new stacked branch referring to %s.') %
1556
branch.get_stacked_on_url())
1557
except (errors.NotStacked, _mod_branch.UnstackableBranchFormat,
1558
errors.UnstackableRepositoryFormat) as e:
1559
revno = branch.revno()
1560
if revno is not None:
1561
note(ngettext('Branched %d revision.',
1562
'Branched %d revisions.',
1563
branch.revno()) % revno)
1565
note(gettext('Created new branch.'))
1258
note('Created new stacked branch referring to %s.' %
1259
branch.get_stacked_on_url())
1260
except (errors.NotStacked, errors.UnstackableBranchFormat,
1261
errors.UnstackableRepositoryFormat), e:
1262
note('Branched %d revision(s).' % branch.revno())
1567
1264
# Bind to the parent
1568
1265
parent_branch = Branch.open(from_location)
1569
1266
branch.bind(parent_branch)
1570
note(gettext('New branch bound to %s') % from_location)
1267
note('New branch bound to %s' % from_location)
1572
1269
# Switch to the new branch
1573
1270
wt, _ = WorkingTree.open_containing('.')
1574
_mod_switch.switch(wt.controldir, branch)
1575
note(gettext('Switched to branch: %s'),
1576
urlutils.unescape_for_display(branch.base, 'utf-8'))
1579
class cmd_branches(Command):
1580
__doc__ = """List the branches available at the current location.
1582
This command will print the names of all the branches at the current
1586
takes_args = ['location?']
1588
Option('recursive', short_name='R',
1589
help='Recursively scan for branches rather than '
1590
'just looking in the specified location.')]
1592
def run(self, location=".", recursive=False):
1594
t = transport.get_transport(location, purpose='read')
1595
if not t.listable():
1596
raise errors.CommandError(
1597
"Can't scan this type of location.")
1598
for b in controldir.ControlDir.find_branches(t):
1599
self.outf.write("%s\n" % urlutils.unescape_for_display(
1600
urlutils.relative_url(t.base, b.base),
1601
self.outf.encoding).rstrip("/"))
1603
dir = controldir.ControlDir.open_containing(location)[0]
1605
active_branch = dir.open_branch(name="")
1606
except errors.NotBranchError:
1607
active_branch = None
1609
for name, branch in iter_sibling_branches(dir):
1612
active = (active_branch is not None and
1613
active_branch.user_url == branch.user_url)
1614
names[name] = active
1615
# Only mention the current branch explicitly if it's not
1616
# one of the colocated branches
1617
if not any(names.values()) and active_branch is not None:
1618
self.outf.write("* %s\n" % gettext("(default)"))
1619
for name in sorted(names):
1620
active = names[name]
1625
self.outf.write("%s %s\n" % (prefix, name))
1271
_mod_switch.switch(wt.bzrdir, branch)
1272
note('Switched to branch: %s',
1273
urlutils.unescape_for_display(branch.base, 'utf-8'))
1628
1276
class cmd_checkout(Command):
1629
1277
__doc__ = """Create a new checkout of an existing branch.
1631
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree
1632
for the branch found in '.'. This is useful if you have removed the working
1633
tree or if it was never created - i.e. if you pushed the branch to its
1634
current location using SFTP.
1279
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1280
the branch found in '.'. This is useful if you have removed the working tree
1281
or if it was never created - i.e. if you pushed the branch to its current
1282
location using SFTP.
1636
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION
1637
will be used. In other words, "checkout ../foo/bar" will attempt to create
1638
./bar. If the BRANCH_LOCATION has no / or path separator embedded, the
1639
TO_LOCATION is derived from the BRANCH_LOCATION by stripping a leading
1640
scheme or drive identifier, if any. For example, "checkout lp:foo-bar" will
1641
attempt to create ./foo-bar.
1284
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
1285
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
1286
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
1287
is derived from the BRANCH_LOCATION by stripping a leading scheme or drive
1288
identifier, if any. For example, "checkout lp:foo-bar" will attempt to
1643
1291
To retrieve the branch as of a particular revision, supply the --revision
1644
parameter, as in "checkout foo/bar -r 5". Note that this will be
1645
immediately out of date [so you cannot commit] but it may be useful (i.e.
1646
to examine old code.)
1292
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
1293
out of date [so you cannot commit] but it may be useful (i.e. to examine old
1649
_see_also = ['checkouts', 'branch', 'working-trees', 'remove-tree']
1297
_see_also = ['checkouts', 'branch']
1650
1298
takes_args = ['branch_location?', 'to_location?']
1651
1299
takes_options = ['revision',
1652
1300
Option('lightweight',
1742
1354
@display_command
1743
1355
def run(self, dir=u'.'):
1744
1356
tree = WorkingTree.open_containing(dir)[0]
1745
self.enter_context(tree.lock_read())
1357
self.add_cleanup(tree.lock_read().unlock)
1358
new_inv = tree.inventory
1746
1359
old_tree = tree.basis_tree()
1747
self.enter_context(old_tree.lock_read())
1360
self.add_cleanup(old_tree.lock_read().unlock)
1361
old_inv = old_tree.inventory
1749
1363
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1750
for change in iterator:
1751
if change.path[0] == change.path[1]:
1753
if None in change.path:
1755
renames.append(change.path)
1364
for f, paths, c, v, p, n, k, e in iterator:
1365
if paths[0] == paths[1]:
1369
renames.append(paths)
1757
1371
for old_name, new_name in renames:
1758
1372
self.outf.write("%s => %s\n" % (old_name, new_name))
1761
1375
class cmd_update(Command):
1762
__doc__ = """Update a working tree to a new revision.
1764
This will perform a merge of the destination revision (the tip of the
1765
branch, or the specified revision) into the working tree, and then make
1766
that revision the basis revision for the working tree.
1768
You can use this to visit an older revision, or to update a working tree
1769
that is out of date from its branch.
1771
If there are any uncommitted changes in the tree, they will be carried
1772
across and remain as uncommitted changes after the update. To discard
1773
these changes, use 'brz revert'. The uncommitted changes may conflict
1774
with the changes brought in by the change in basis revision.
1776
If the tree's branch is bound to a master branch, brz will also update
1376
__doc__ = """Update a tree to have the latest code committed to its branch.
1378
This will perform a merge into the working tree, and may generate
1379
conflicts. If you have any local changes, you will still
1380
need to commit them after the update for the update to be complete.
1382
If you want to discard your local changes, you can just do a
1383
'bzr revert' instead of 'bzr commit' after the update.
1385
If the tree's branch is bound to a master branch, it will also update
1777
1386
the branch from the master.
1779
You cannot update just a single file or directory, because each Breezy
1780
working tree has just a single basis revision. If you want to restore a
1781
file that has been removed locally, use 'brz revert' instead of 'brz
1782
update'. If you want to restore a file to its state in a previous
1783
revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write
1784
out the old content of that file to a new location.
1786
The 'dir' argument, if given, must be the location of the root of a
1787
working tree to update. By default, the working tree that contains the
1788
current working directory is used.
1791
1389
_see_also = ['pull', 'working-trees', 'status-flags']
1792
1390
takes_args = ['dir?']
1793
takes_options = ['revision',
1795
help="Show base revision text in conflicts."),
1391
takes_options = ['revision']
1797
1392
aliases = ['up']
1799
def run(self, dir=None, revision=None, show_base=None):
1394
def run(self, dir='.', revision=None):
1800
1395
if revision is not None and len(revision) != 1:
1801
raise errors.CommandError(gettext(
1802
"brz update --revision takes exactly one revision"))
1804
tree = WorkingTree.open_containing('.')[0]
1806
tree, relpath = WorkingTree.open_containing(dir)
1809
raise errors.CommandError(gettext(
1810
"brz update can only update a whole tree, "
1811
"not a file or subdirectory"))
1396
raise errors.BzrCommandError(
1397
"bzr update --revision takes exactly one revision")
1398
tree = WorkingTree.open_containing(dir)[0]
1812
1399
branch = tree.branch
1813
1400
possible_transports = []
1814
1401
master = branch.get_master_branch(
1815
1402
possible_transports=possible_transports)
1816
1403
if master is not None:
1817
1404
branch_location = master.base
1818
self.enter_context(tree.lock_write())
1820
1407
branch_location = tree.branch.base
1821
self.enter_context(tree.lock_tree_write())
1408
tree.lock_tree_write()
1409
self.add_cleanup(tree.unlock)
1822
1410
# get rid of the final '/' and be ready for display
1823
1411
branch_location = urlutils.unescape_for_display(
1824
1412
branch_location.rstrip('/'),
1910
1497
noise_level = get_verbosity_level()
1912
1499
noise_level = 0
1913
from .info import show_bzrdir_info
1914
show_bzrdir_info(controldir.ControlDir.open_containing(location)[0],
1500
from bzrlib.info import show_bzrdir_info
1501
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1915
1502
verbose=noise_level, outfile=self.outf)
1918
1505
class cmd_remove(Command):
1919
1506
__doc__ = """Remove files or directories.
1921
This makes Breezy stop tracking changes to the specified files. Breezy will
1922
delete them if they can easily be recovered using revert otherwise they
1923
will be backed up (adding an extension of the form .~#~). If no options or
1924
parameters are given Breezy will scan for files that are being tracked by
1925
Breezy but missing in your tree and stop tracking them for you.
1508
This makes bzr stop tracking changes to the specified files. bzr will delete
1509
them if they can easily be recovered using revert. If no options or
1510
parameters are given bzr will scan for files that are being tracked by bzr
1511
but missing in your tree and stop tracking them for you.
1927
1513
takes_args = ['file*']
1928
1514
takes_options = ['verbose',
1930
'new', help='Only remove files that have never been committed.'),
1931
RegistryOption.from_kwargs('file-deletion-strategy',
1932
'The file deletion mode to be used.',
1933
title='Deletion Strategy', value_switches=True, enum_switch=False,
1934
safe='Backup changed files (default).',
1935
keep='Delete from brz but leave the working copy.',
1936
no_backup='Don\'t backup changed files.'),
1515
Option('new', help='Only remove files that have never been committed.'),
1516
RegistryOption.from_kwargs('file-deletion-strategy',
1517
'The file deletion mode to be used.',
1518
title='Deletion Strategy', value_switches=True, enum_switch=False,
1519
safe='Only delete files if they can be'
1520
' safely recovered (default).',
1521
keep='Delete from bzr but leave the working copy.',
1522
force='Delete all the specified files, even if they can not be '
1523
'recovered and even if they are non-empty directories.')]
1938
1524
aliases = ['rm', 'del']
1939
1525
encoding_type = 'replace'
1941
1527
def run(self, file_list, verbose=False, new=False,
1942
file_deletion_strategy='safe'):
1944
tree, file_list = WorkingTree.open_containing_paths(file_list)
1528
file_deletion_strategy='safe'):
1529
tree, file_list = tree_files(file_list)
1946
1531
if file_list is not None:
1947
1532
file_list = [f for f in file_list]
1949
self.enter_context(tree.lock_write())
1534
self.add_cleanup(tree.lock_write().unlock)
1950
1535
# Heuristics should probably all move into tree.remove_smart or
1953
1538
added = tree.changes_from(tree.basis_tree(),
1954
specific_files=file_list).added
1955
file_list = sorted([f.path[1] for f in added], reverse=True)
1539
specific_files=file_list).added
1540
file_list = sorted([f[0] for f in added], reverse=True)
1956
1541
if len(file_list) == 0:
1957
raise errors.CommandError(gettext('No matching files.'))
1542
raise errors.BzrCommandError('No matching files.')
1958
1543
elif file_list is None:
1959
1544
# missing files show up in iter_changes(basis) as
1960
1545
# versioned-with-no-kind.
1962
1547
for change in tree.iter_changes(tree.basis_tree()):
1963
1548
# Find paths in the working tree that have no kind:
1964
if change.path[1] is not None and change.kind[1] is None:
1965
missing.append(change.path[1])
1549
if change[1][1] is not None and change[6][1] is None:
1550
missing.append(change[1][1])
1966
1551
file_list = sorted(missing, reverse=True)
1967
1552
file_deletion_strategy = 'keep'
1968
1553
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1969
keep_files=file_deletion_strategy == 'keep',
1970
force=(file_deletion_strategy == 'no-backup'))
1554
keep_files=file_deletion_strategy=='keep',
1555
force=file_deletion_strategy=='force')
1558
class cmd_file_id(Command):
1559
__doc__ = """Print file_id of a particular file or directory.
1561
The file_id is assigned when the file is first added and remains the
1562
same through all revisions where the file exists, even when it is
1567
_see_also = ['inventory', 'ls']
1568
takes_args = ['filename']
1571
def run(self, filename):
1572
tree, relpath = WorkingTree.open_containing(filename)
1573
i = tree.path2id(relpath)
1575
raise errors.NotVersionedError(filename)
1577
self.outf.write(i + '\n')
1580
class cmd_file_path(Command):
1581
__doc__ = """Print path of file_ids to a file or directory.
1583
This prints one line for each directory down to the target,
1584
starting at the branch root.
1588
takes_args = ['filename']
1591
def run(self, filename):
1592
tree, relpath = WorkingTree.open_containing(filename)
1593
fid = tree.path2id(relpath)
1595
raise errors.NotVersionedError(filename)
1596
segments = osutils.splitpath(relpath)
1597
for pos in range(1, len(segments) + 1):
1598
path = osutils.joinpath(segments[:pos])
1599
self.outf.write("%s\n" % tree.path2id(path))
1973
1602
class cmd_reconcile(Command):
1974
__doc__ = """Reconcile brz metadata in a branch.
1603
__doc__ = """Reconcile bzr metadata in a branch.
1976
1605
This can correct data mismatches that may have been caused by
1977
previous ghost operations or brz upgrades. You should only
1978
need to run this command if 'brz check' or a brz developer
1606
previous ghost operations or bzr upgrades. You should only
1607
need to run this command if 'bzr check' or a bzr developer
1979
1608
advises you to run it.
1981
1610
If a second branch is provided, cross-branch reconciliation is
1982
1611
also attempted, which will check that data like the tree root
1983
id which was not present in very early brz versions is represented
1612
id which was not present in very early bzr versions is represented
1984
1613
correctly in both branches.
1986
1615
At the same time it is run it may recompress data resulting in
2116
1727
to_transport.ensure_base()
2117
1728
except errors.NoSuchFile:
2118
1729
if not create_prefix:
2119
raise errors.CommandError(gettext("Parent directory of %s"
2121
"\nYou may supply --create-prefix to create all"
2122
" leading parent directories.")
1730
raise errors.BzrCommandError("Parent directory of %s"
1732
"\nYou may supply --create-prefix to create all"
1733
" leading parent directories."
2124
1735
to_transport.create_prefix()
2127
a_controldir = controldir.ControlDir.open_from_transport(
1738
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2129
1739
except errors.NotBranchError:
2130
1740
# really a NotBzrDir error...
2131
create_branch = controldir.ControlDir.create_branch_convenience
2133
force_new_tree = False
2135
force_new_tree = None
1741
create_branch = bzrdir.BzrDir.create_branch_convenience
2136
1742
branch = create_branch(to_transport.base, format=format,
2137
possible_transports=[to_transport],
2138
force_new_tree=force_new_tree)
2139
a_controldir = branch.controldir
1743
possible_transports=[to_transport])
1744
a_bzrdir = branch.bzrdir
2141
from .transport.local import LocalTransport
2142
if a_controldir.has_branch():
1746
from bzrlib.transport.local import LocalTransport
1747
if a_bzrdir.has_branch():
2143
1748
if (isinstance(to_transport, LocalTransport)
2144
and not a_controldir.has_workingtree()):
2145
raise errors.BranchExistsWithoutWorkingTree(location)
1749
and not a_bzrdir.has_workingtree()):
1750
raise errors.BranchExistsWithoutWorkingTree(location)
2146
1751
raise errors.AlreadyBranchError(location)
2147
branch = a_controldir.create_branch()
2148
if not no_tree and not a_controldir.has_workingtree():
2149
a_controldir.create_workingtree()
1752
branch = a_bzrdir.create_branch()
1753
a_bzrdir.create_workingtree()
2150
1754
if append_revisions_only:
2152
1756
branch.set_append_revisions_only(True)
2153
1757
except errors.UpgradeRequired:
2154
raise errors.CommandError(gettext('This branch format cannot be set'
2155
' to append-revisions-only. Try --default.'))
1758
raise errors.BzrCommandError('This branch format cannot be set'
1759
' to append-revisions-only. Try --default.')
2156
1760
if not is_quiet():
2157
from .info import describe_layout, describe_format
1761
from bzrlib.info import describe_layout, describe_format
2159
tree = a_controldir.open_workingtree(recommend_upgrade=False)
1763
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
2160
1764
except (errors.NoWorkingTree, errors.NotLocalUrl):
2162
1766
repository = branch.repository
2163
1767
layout = describe_layout(repository, branch, tree).lower()
2164
format = describe_format(a_controldir, repository, branch, tree)
2165
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1768
format = describe_format(a_bzrdir, repository, branch, tree)
1769
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
2167
1770
if repository.is_shared():
2168
# XXX: maybe this can be refactored into transport.path_or_url()
2169
url = repository.controldir.root_transport.external_url()
1771
#XXX: maybe this can be refactored into transport.path_or_url()
1772
url = repository.bzrdir.root_transport.external_url()
2171
1774
url = urlutils.local_path_from_url(url)
2172
except urlutils.InvalidURL:
1775
except errors.InvalidURL:
2174
self.outf.write(gettext("Using shared repository: %s\n") % url)
2177
class cmd_init_shared_repository(Command):
1777
self.outf.write("Using shared repository: %s\n" % url)
1780
class cmd_init_repository(Command):
2178
1781
__doc__ = """Create a shared repository for branches to share storage space.
2180
1783
New branches created under the repository directory will store their
2181
1784
revisions in the repository, not in the branch directory. For branches
2182
with shared history, this reduces the amount of storage needed and
1785
with shared history, this reduces the amount of storage needed and
2183
1786
speeds up the creation of new branches.
2185
1788
If the --no-trees option is given then the branches in the repository
2186
will not have working trees by default. They will still exist as
2187
directories on disk, but they will not have separate copies of the
1789
will not have working trees by default. They will still exist as
1790
directories on disk, but they will not have separate copies of the
2188
1791
files at a certain revision. This can be useful for repositories that
2189
1792
store branches which are interacted with through checkouts or remote
2190
1793
branches, such as on a server.
2339
1917
help='Set prefixes added to old and new filenames, as '
2340
1918
'two values separated by a colon. (eg "old/:new/").'),
2342
help='Branch/tree to compare from.',
1920
help='Branch/tree to compare from.',
2346
help='Branch/tree to compare to.',
1924
help='Branch/tree to compare to.',
2351
1929
Option('using',
2352
help='Use this command to compare files.',
1930
help='Use this command to compare files.',
2355
1933
RegistryOption('format',
2357
help='Diff format to use.',
2358
lazy_registry=('breezy.diff', 'format_registry'),
2359
title='Diff format'),
2361
help='How many lines of context to show.',
2364
RegistryOption.from_kwargs(
2366
help='Color mode to use.',
2367
title='Color Mode', value_switches=False, enum_switch=True,
2368
never='Never colorize output.',
2369
auto='Only colorize output if terminal supports it and STDOUT is a'
2371
always='Always colorize output (default).'),
2374
help=('Warn if trailing whitespace or spurious changes have been'
1934
help='Diff format to use.',
1935
lazy_registry=('bzrlib.diff', 'format_registry'),
1936
value_switches=False, title='Diff format'),
2378
1938
aliases = ['di', 'dif']
2379
1939
encoding_type = 'exact'
2381
1941
@display_command
2382
1942
def run(self, revision=None, file_list=None, diff_options=None,
2383
prefix=None, old=None, new=None, using=None, format=None,
2384
context=None, color='never'):
2385
from .diff import (get_trees_and_branches_to_diff_locked,
1943
prefix=None, old=None, new=None, using=None, format=None):
1944
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1947
if (prefix is None) or (prefix == '0'):
2389
1948
# diff -p0 format
2392
elif prefix == u'1' or prefix is None:
2393
1952
old_label = 'old/'
2394
1953
new_label = 'new/'
2395
elif u':' in prefix:
2396
old_label, new_label = prefix.split(u":")
1955
old_label, new_label = prefix.split(":")
2398
raise errors.CommandError(gettext(
1957
raise errors.BzrCommandError(
2399
1958
'--prefix expects two values separated by a colon'
2400
' (eg "old/:new/")'))
1959
' (eg "old/:new/")')
2402
1961
if revision and len(revision) > 2:
2403
raise errors.CommandError(gettext('brz diff --revision takes exactly'
2404
' one or two revision specifiers'))
1962
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1963
' one or two revision specifiers')
2406
1965
if using is not None and format is not None:
2407
raise errors.CommandError(gettext(
2408
'{0} and {1} are mutually exclusive').format(
2409
'--using', '--format'))
1966
raise errors.BzrCommandError('--using and --format are mutually '
2411
1969
(old_tree, new_tree,
2412
1970
old_branch, new_branch,
2413
1971
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2414
file_list, revision, old, new, self._exit_stack, apply_view=True)
1972
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2415
1973
# GNU diff on Windows uses ANSI encoding for filenames
2416
1974
path_encoding = osutils.get_diff_header_encoding()
2419
from .terminal import has_ansi_colors
2420
if has_ansi_colors():
2424
if 'always' == color:
2425
from .colordiff import DiffWriter
2426
outf = DiffWriter(outf)
2427
return show_diff_trees(old_tree, new_tree, outf,
1975
return show_diff_trees(old_tree, new_tree, sys.stdout,
2428
1976
specific_files=specific_files,
2429
1977
external_diff_options=diff_options,
2430
1978
old_label=old_label, new_label=new_label,
2431
1979
extra_trees=extra_trees,
2432
1980
path_encoding=path_encoding,
2433
using=using, context=context,
2434
1982
format_cls=format)
2698
2243
takes_args = ['file*']
2699
2244
_see_also = ['log-formats', 'revisionspec']
2700
2245
takes_options = [
2702
help='Show from oldest to newest.'),
2704
custom_help('verbose',
2705
help='Show files changed in each revision.'),
2709
type=breezy.option._parse_revision_str,
2711
help='Show just the specified revision.'
2712
' See also "help revisionspec".'),
2714
RegistryOption('authors',
2715
'What names to list as authors - first, all or committer.',
2718
'breezy.log', 'author_list_registry'),
2722
help='Number of levels to display - 0 for all, 1 for flat.',
2724
type=_parse_levels),
2726
help='Show revisions whose message matches this '
2727
'regular expression.',
2732
help='Limit the output to the first N revisions.',
2737
help='Show changes made in each revision as a patch.'),
2738
Option('include-merged',
2739
help='Show merged revisions like --levels 0 does.'),
2740
Option('include-merges', hidden=True,
2741
help='Historical alias for --include-merged.'),
2742
Option('omit-merges',
2743
help='Do not report commits with more than one parent.'),
2744
Option('exclude-common-ancestry',
2745
help='Display only the revisions that are not part'
2746
' of both ancestries (require -rX..Y).'
2748
Option('signatures',
2749
help='Show digital signature validity.'),
2247
help='Show from oldest to newest.'),
2249
custom_help('verbose',
2250
help='Show files changed in each revision.'),
2254
type=bzrlib.option._parse_revision_str,
2256
help='Show just the specified revision.'
2257
' See also "help revisionspec".'),
2259
RegistryOption('authors',
2260
'What names to list as authors - first, all or committer.',
2262
lazy_registry=('bzrlib.log', 'author_list_registry'),
2266
help='Number of levels to display - 0 for all, 1 for flat.',
2268
type=_parse_levels),
2751
2270
short_name='m',
2752
help='Show revisions whose properties match this '
2755
ListOption('match-message',
2756
2271
help='Show revisions whose message matches this '
2759
ListOption('match-committer',
2760
help='Show revisions whose committer matches this '
2763
ListOption('match-author',
2764
help='Show revisions whose authors match this '
2767
ListOption('match-bugs',
2768
help='Show revisions whose bugs match this '
2272
'regular expression.',
2276
help='Limit the output to the first N revisions.',
2281
help='Show changes made in each revision as a patch.'),
2282
Option('include-merges',
2283
help='Show merged revisions like --levels 0 does.'),
2284
Option('exclude-common-ancestry',
2285
help='Display only the revisions that are not part'
2286
' of both ancestries (require -rX..Y)'
2772
2289
encoding_type = 'replace'
2774
2291
@display_command
3018
2503
_see_also = ['status', 'cat']
3019
2504
takes_args = ['path?']
3020
2505
takes_options = [
3023
Option('recursive', short_name='R',
3024
help='Recurse into subdirectories.'),
3026
help='Print paths relative to the root of the branch.'),
3027
Option('unknown', short_name='u',
3028
help='Print unknown files.'),
3029
Option('versioned', help='Print versioned files.',
3031
Option('ignored', short_name='i',
3032
help='Print ignored files.'),
3033
Option('kind', short_name='k',
3034
help=('List entries of a particular kind: file, '
3035
'directory, symlink, tree-reference.'),
2508
Option('recursive', short_name='R',
2509
help='Recurse into subdirectories.'),
2511
help='Print paths relative to the root of the branch.'),
2512
Option('unknown', short_name='u',
2513
help='Print unknown files.'),
2514
Option('versioned', help='Print versioned files.',
2516
Option('ignored', short_name='i',
2517
help='Print ignored files.'),
2518
Option('kind', short_name='k',
2519
help='List entries of a particular kind: file, directory, symlink.',
3042
2525
@display_command
3043
2526
def run(self, revision=None, verbose=False,
3044
2527
recursive=False, from_root=False,
3045
2528
unknown=False, versioned=False, ignored=False,
3046
2529
null=False, kind=None, show_ids=False, path=None, directory=None):
3048
if kind and kind not in ('file', 'directory', 'symlink', 'tree-reference'):
3049
raise errors.CommandError(gettext('invalid kind specified'))
2531
if kind and kind not in ('file', 'directory', 'symlink'):
2532
raise errors.BzrCommandError('invalid kind specified')
3051
2534
if verbose and null:
3052
raise errors.CommandError(
3053
gettext('Cannot set both --verbose and --null'))
2535
raise errors.BzrCommandError('Cannot set both --verbose and --null')
3054
2536
all = not (unknown or versioned or ignored)
3056
selection = {'I': ignored, '?': unknown, 'V': versioned}
2538
selection = {'I':ignored, '?':unknown, 'V':versioned}
3058
2540
if path is None:
3062
raise errors.CommandError(gettext('cannot specify both --from-root'
2544
raise errors.BzrCommandError('cannot specify both --from-root'
3065
2547
tree, branch, relpath = \
3066
2548
_open_directory_or_containing_tree_or_branch(fs_path, directory)
3160
2642
After adding, editing or deleting that file either indirectly by
3161
2643
using this command or directly by using an editor, be sure to commit
3164
Breezy also supports a global ignore file ~/.config/breezy/ignore. On
3165
Windows the global ignore file can be found in the application data
3167
C:\\Documents and Settings\\<user>\\Application Data\\Breezy\\3.0\\ignore.
2646
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2647
the global ignore file can be found in the application data directory as
2648
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
3168
2649
Global ignores are not touched by this command. The global ignore file
3169
2650
can be edited directly using an editor.
3171
2652
Patterns prefixed with '!' are exceptions to ignore patterns and take
3172
2653
precedence over regular ignores. Such exceptions are used to specify
3173
2654
files that should be versioned which would otherwise be ignored.
3175
2656
Patterns prefixed with '!!' act as regular ignore patterns, but have
3176
2657
precedence over the '!' exception patterns.
3180
* Ignore patterns containing shell wildcards must be quoted from
3183
* Ignore patterns starting with "#" act as comments in the ignore file.
3184
To ignore patterns that begin with that character, use the "RE:" prefix.
2659
Note: ignore patterns containing shell wildcards must be quoted from
3187
2663
Ignore the top level Makefile::
3189
brz ignore ./Makefile
2665
bzr ignore ./Makefile
3191
2667
Ignore .class files in all directories...::
3193
brz ignore "*.class"
2669
bzr ignore "*.class"
3195
2671
...but do not ignore "special.class"::
3197
brz ignore "!special.class"
3199
Ignore files whose name begins with the "#" character::
3203
Ignore .o files under the lib directory::
3205
brz ignore "lib/**/*.o"
3207
Ignore .o files under the lib directory::
3209
brz ignore "RE:lib/.*\\.o"
2673
bzr ignore "!special.class"
2675
Ignore .o files under the lib directory::
2677
bzr ignore "lib/**/*.o"
2679
Ignore .o files under the lib directory::
2681
bzr ignore "RE:lib/.*\.o"
3211
2683
Ignore everything but the "debian" toplevel directory::
3213
brz ignore "RE:(?!debian/).*"
2685
bzr ignore "RE:(?!debian/).*"
3215
2687
Ignore everything except the "local" toplevel directory,
3216
but always ignore autosave files ending in ~, even under local/::
3219
brz ignore "!./local"
2688
but always ignore "*~" autosave files, even under local/::
2691
bzr ignore "!./local"
3223
2695
_see_also = ['status', 'ignored', 'patterns']
3224
2696
takes_args = ['name_pattern*']
3225
2697
takes_options = ['directory',
3226
Option('default-rules',
3227
help='Display the default ignore rules that brz uses.')
2698
Option('default-rules',
2699
help='Display the default ignore rules that bzr uses.')
3230
2702
def run(self, name_pattern_list=None, default_rules=None,
3231
2703
directory=u'.'):
3232
from breezy import ignores
2704
from bzrlib import ignores
3233
2705
if default_rules is not None:
3234
2706
# dump the default rules and exit
3235
2707
for pattern in ignores.USER_DEFAULTS:
3236
2708
self.outf.write("%s\n" % pattern)
3238
2710
if not name_pattern_list:
3239
raise errors.CommandError(gettext("ignore requires at least one "
3240
"NAME_PATTERN or --default-rules."))
2711
raise errors.BzrCommandError("ignore requires at least one "
2712
"NAME_PATTERN or --default-rules.")
3241
2713
name_pattern_list = [globbing.normalize_pattern(p)
3242
2714
for p in name_pattern_list]
3244
bad_patterns_count = 0
3245
for p in name_pattern_list:
3246
if not globbing.Globster.is_pattern_valid(p):
3247
bad_patterns_count += 1
3248
bad_patterns += ('\n %s' % p)
3250
msg = (ngettext('Invalid ignore pattern found. %s',
3251
'Invalid ignore patterns found. %s',
3252
bad_patterns_count) % bad_patterns)
3253
ui.ui_factory.show_error(msg)
3254
raise lazy_regex.InvalidPattern('')
3255
2715
for name_pattern in name_pattern_list:
3256
2716
if (name_pattern[0] == '/' or
3257
(len(name_pattern) > 1 and name_pattern[1] == ':')):
3258
raise errors.CommandError(gettext(
3259
"NAME_PATTERN should not be an absolute path"))
2717
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2718
raise errors.BzrCommandError(
2719
"NAME_PATTERN should not be an absolute path")
3260
2720
tree, relpath = WorkingTree.open_containing(directory)
3261
2721
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
3262
2722
ignored = globbing.Globster(name_pattern_list)
3264
self.enter_context(tree.lock_read())
3265
for filename, fc, fkind, entry in tree.list_files():
3266
id = getattr(entry, 'file_id', None)
2724
self.add_cleanup(tree.lock_read().unlock)
2725
for entry in tree.list_files():
3267
2727
if id is not None:
3268
2729
if ignored.match(filename):
3269
2730
matches.append(filename)
3270
2731
if len(matches) > 0:
3271
self.outf.write(gettext("Warning: the following files are version "
3272
"controlled and match your ignore pattern:\n%s"
3273
"\nThese files will continue to be version controlled"
3274
" unless you 'brz remove' them.\n") % ("\n".join(matches),))
2732
self.outf.write("Warning: the following files are version controlled and"
2733
" match your ignore pattern:\n%s"
2734
"\nThese files will continue to be version controlled"
2735
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3277
2738
class cmd_ignored(Command):
3352
2812
================= =========================
3355
encoding_type = 'exact'
3356
2814
takes_args = ['dest', 'branch_or_subdir?']
3357
2815
takes_options = ['directory',
3359
help="Type of file to export to.",
3362
Option('filters', help='Apply content filters to export the '
3363
'convenient form.'),
3366
help="Name of the root directory inside the exported file."),
3367
Option('per-file-timestamps',
3368
help='Set modification time of files to that of the last '
3369
'revision in which it was changed.'),
3370
Option('uncommitted',
3371
help='Export the working tree contents rather than that of the '
2817
help="Type of file to export to.",
2820
Option('filters', help='Apply content filters to export the '
2821
'convenient form.'),
2824
help="Name of the root directory inside the exported file."),
2825
Option('per-file-timestamps',
2826
help='Set modification time of files to that of the last '
2827
'revision in which it was changed.'),
3375
2829
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
3376
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3378
from .export import export, guess_format, get_root_name
2830
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2831
from bzrlib.export import export
3380
2833
if branch_or_subdir is None:
3381
branch_or_subdir = directory
3383
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3385
if tree is not None:
3386
self.enter_context(tree.lock_read())
3390
raise errors.CommandError(
3391
gettext("--uncommitted requires a working tree"))
3394
export_tree = _get_one_revision_tree(
3395
'export', revision, branch=b,
3399
format = guess_format(dest)
3402
root = get_root_name(dest)
3404
if not per_file_timestamps:
3405
force_mtime = time.time()
3410
from breezy.filter_tree import ContentFilterTree
3411
export_tree = ContentFilterTree(
3412
export_tree, export_tree._content_filter_stack)
2834
tree = WorkingTree.open_containing(directory)[0]
2838
b, subdir = Branch.open_containing(branch_or_subdir)
2841
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3415
export(export_tree, dest, format, root, subdir,
2843
export(rev_tree, dest, format, root, subdir, filtered=filters,
3416
2844
per_file_timestamps=per_file_timestamps)
3417
except errors.NoSuchExportFormat as e:
3418
raise errors.CommandError(
3419
gettext('Unsupported export format: %s') % e.format)
2845
except errors.NoSuchExportFormat, e:
2846
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3422
2849
class cmd_cat(Command):
3443
2869
def run(self, filename, revision=None, name_from_revision=False,
3444
2870
filters=False, directory=None):
3445
2871
if revision is not None and len(revision) != 1:
3446
raise errors.CommandError(gettext("brz cat --revision takes exactly"
3447
" one revision specifier"))
2872
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2873
" one revision specifier")
3448
2874
tree, branch, relpath = \
3449
2875
_open_directory_or_containing_tree_or_branch(filename, directory)
3450
self.enter_context(branch.lock_read())
2876
self.add_cleanup(branch.lock_read().unlock)
3451
2877
return self._run(tree, branch, relpath, filename, revision,
3452
2878
name_from_revision, filters)
3454
2880
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
3457
2882
if tree is None:
3458
2883
tree = b.basis_tree()
3459
2884
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
3460
self.enter_context(rev_tree.lock_read())
2885
self.add_cleanup(rev_tree.lock_read().unlock)
2887
old_file_id = rev_tree.path2id(relpath)
3462
2889
if name_from_revision:
3463
2890
# Try in revision if requested
3464
if not rev_tree.is_versioned(relpath):
3465
raise errors.CommandError(gettext(
3466
"{0!r} is not present in revision {1}").format(
2891
if old_file_id is None:
2892
raise errors.BzrCommandError(
2893
"%r is not present in revision %s" % (
3467
2894
filename, rev_tree.get_revision_id()))
3468
rev_tree_path = relpath
2896
content = rev_tree.get_file_text(old_file_id)
3471
rev_tree_path = _mod_tree.find_previous_path(
3472
tree, rev_tree, relpath)
3473
except errors.NoSuchFile:
3474
rev_tree_path = None
3476
if rev_tree_path is None:
3477
# Path didn't exist in working tree
3478
if not rev_tree.is_versioned(relpath):
3479
raise errors.CommandError(gettext(
3480
"{0!r} is not present in revision {1}").format(
3481
filename, rev_tree.get_revision_id()))
3483
# Fall back to the same path in the basis tree, if present.
3484
rev_tree_path = relpath
2898
cur_file_id = tree.path2id(relpath)
2900
if cur_file_id is not None:
2901
# Then try with the actual file id
2903
content = rev_tree.get_file_text(cur_file_id)
2905
except errors.NoSuchId:
2906
# The actual file id didn't exist at that time
2908
if not found and old_file_id is not None:
2909
# Finally try with the old file id
2910
content = rev_tree.get_file_text(old_file_id)
2913
# Can't be found anywhere
2914
raise errors.BzrCommandError(
2915
"%r is not present in revision %s" % (
2916
filename, rev_tree.get_revision_id()))
3487
from .filter_tree import ContentFilterTree
3488
filter_tree = ContentFilterTree(
3489
rev_tree, rev_tree._content_filter_stack)
3490
fileobj = filter_tree.get_file(rev_tree_path)
2918
from bzrlib.filters import (
2919
ContentFilterContext,
2920
filtered_output_bytes,
2922
filters = rev_tree._content_filter_stack(relpath)
2923
chunks = content.splitlines(True)
2924
content = filtered_output_bytes(chunks, filters,
2925
ContentFilterContext(relpath, rev_tree))
2927
self.outf.writelines(content)
3492
fileobj = rev_tree.get_file(rev_tree_path)
3493
shutil.copyfileobj(fileobj, self.outf)
2930
self.outf.write(content)
3497
2933
class cmd_local_time_offset(Command):
3498
2934
__doc__ = """Show the offset in seconds from GMT to local time."""
3501
2936
@display_command
3503
2938
self.outf.write("%s\n" % osutils.local_time_offset())
3506
2942
class cmd_commit(Command):
3507
2943
__doc__ = """Commit changes into a new revision.
3539
2975
"John Doe <jdoe@example.com>". If there is more than one author of
3540
2976
the change you can specify the option multiple times, once for each
3545
2981
A common mistake is to forget to add a new file or directory before
3546
2982
running the commit command. The --strict option checks for unknown
3547
2983
files and aborts the commit if any are found. More advanced pre-commit
3548
checks can be implemented by defining hooks. See ``brz help hooks``
2984
checks can be implemented by defining hooks. See ``bzr help hooks``
3551
2987
:Things to note:
3553
If you accidentally commit the wrong changes or make a spelling
2989
If you accidentially commit the wrong changes or make a spelling
3554
2990
mistake in the commit message say, you can use the uncommit command
3555
to undo it. See ``brz help uncommit`` for details.
2991
to undo it. See ``bzr help uncommit`` for details.
3557
2993
Hooks can also be configured to run after a commit. This allows you
3558
2994
to trigger updates to external systems like bug trackers. The --fixes
3559
2995
option can be used to record the association between a revision and
3560
one or more bugs. See ``brz help bugs`` for details.
2996
one or more bugs. See ``bzr help bugs`` for details.
2998
A selective commit may fail in some cases where the committed
2999
tree would be invalid. Consider::
3004
bzr commit foo -m "committing foo"
3005
bzr mv foo/bar foo/baz
3008
bzr commit foo/bar -m "committing bar but not baz"
3010
In the example above, the last commit will fail by design. This gives
3011
the user the opportunity to decide whether they want to commit the
3012
rename at the same time, separately first, or not at all. (As a general
3013
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3015
# TODO: Run hooks on tree to-be-committed, and after commit.
3017
# TODO: Strict commit that fails if there are deleted files.
3018
# (what does "deleted files" mean ??)
3020
# TODO: Give better message for -s, --summary, used by tla people
3022
# XXX: verbose currently does nothing
3563
3024
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3564
3025
takes_args = ['selected*']
3565
3026
takes_options = [
3567
'exclude', type=str, short_name='x',
3568
help="Do not consider changes made to a given path."),
3569
Option('message', type=str,
3571
help="Description of the new revision."),
3574
help='Commit even if nothing has changed.'),
3575
Option('file', type=str,
3578
help='Take commit message from this file.'),
3580
help="Refuse to commit if there are unknown "
3581
"files in the working tree."),
3582
Option('commit-time', type=str,
3583
help="Manually set a commit time using commit date "
3584
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3587
help="Link to a related bug. (see \"brz help bugs\")."),
3590
help="Mark a bug as being fixed by this revision "
3591
"(see \"brz help bugs\")."),
3594
help="Set the author's name, if it's different "
3595
"from the committer."),
3597
help="Perform a local commit in a bound "
3598
"branch. Local commits are not pushed to "
3599
"the master branch until a normal commit "
3602
Option('show-diff', short_name='p',
3603
help='When no message is supplied, show the diff along'
3604
' with the status summary in the message editor.'),
3606
help='When committing to a foreign version control '
3607
'system do not push data that can not be natively '
3027
ListOption('exclude', type=str, short_name='x',
3028
help="Do not consider changes made to a given path."),
3029
Option('message', type=unicode,
3031
help="Description of the new revision."),
3034
help='Commit even if nothing has changed.'),
3035
Option('file', type=str,
3038
help='Take commit message from this file.'),
3040
help="Refuse to commit if there are unknown "
3041
"files in the working tree."),
3042
Option('commit-time', type=str,
3043
help="Manually set a commit time using commit date "
3044
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3045
ListOption('fixes', type=str,
3046
help="Mark a bug as being fixed by this revision "
3047
"(see \"bzr help bugs\")."),
3048
ListOption('author', type=unicode,
3049
help="Set the author's name, if it's different "
3050
"from the committer."),
3052
help="Perform a local commit in a bound "
3053
"branch. Local commits are not pushed to "
3054
"the master branch until a normal commit "
3057
Option('show-diff', short_name='p',
3058
help='When no message is supplied, show the diff along'
3059
' with the status summary in the message editor.'),
3609
3061
aliases = ['ci', 'checkin']
3611
def _iter_bug_urls(self, bugs, branch, status):
3612
default_bugtracker = None
3063
def _iter_bug_fix_urls(self, fixes, branch):
3613
3064
# Configure the properties for bug fixing attributes.
3615
tokens = bug.split(':')
3616
if len(tokens) == 1:
3617
if default_bugtracker is None:
3618
branch_config = branch.get_config_stack()
3619
default_bugtracker = branch_config.get(
3621
if default_bugtracker is None:
3622
raise errors.CommandError(gettext(
3623
"No tracker specified for bug %s. Use the form "
3624
"'tracker:id' or specify a default bug tracker "
3625
"using the `bugtracker` option.\nSee "
3626
"\"brz help bugs\" for more information on this "
3627
"feature. Commit refused.") % bug)
3628
tag = default_bugtracker
3630
elif len(tokens) != 2:
3631
raise errors.CommandError(gettext(
3065
for fixed_bug in fixes:
3066
tokens = fixed_bug.split(':')
3067
if len(tokens) != 2:
3068
raise errors.BzrCommandError(
3632
3069
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3633
"See \"brz help bugs\" for more information on this "
3634
"feature.\nCommit refused.") % bug)
3636
tag, bug_id = tokens
3070
"See \"bzr help bugs\" for more information on this "
3071
"feature.\nCommit refused." % fixed_bug)
3072
tag, bug_id = tokens
3638
yield bugtracker.get_bug_url(tag, branch, bug_id), status
3639
except bugtracker.UnknownBugTrackerAbbreviation:
3640
raise errors.CommandError(gettext(
3641
'Unrecognized bug %s. Commit refused.') % bug)
3642
except bugtracker.MalformedBugIdentifier as e:
3643
raise errors.CommandError(gettext(
3644
u"%s\nCommit refused.") % (e,))
3074
yield bugtracker.get_bug_url(tag, branch, bug_id)
3075
except errors.UnknownBugTrackerAbbreviation:
3076
raise errors.BzrCommandError(
3077
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3078
except errors.MalformedBugIdentifier, e:
3079
raise errors.BzrCommandError(
3080
"%s\nCommit refused." % (str(e),))
3646
3082
def run(self, message=None, file=None, verbose=False, selected_list=None,
3647
unchanged=False, strict=False, local=False, fixes=None, bugs=None,
3648
author=None, show_diff=False, exclude=None, commit_time=None,
3651
from .commit import (
3083
unchanged=False, strict=False, local=False, fixes=None,
3084
author=None, show_diff=False, exclude=None, commit_time=None):
3085
from bzrlib.errors import (
3652
3086
PointlessCommit,
3654
from .errors import (
3655
3087
ConflictsInTree,
3656
3088
StrictCommitFailed
3658
from .msgeditor import (
3090
from bzrlib.msgeditor import (
3659
3091
edit_commit_message_encoded,
3660
3092
generate_commit_message_template,
3661
make_commit_message_template_encoded,
3093
make_commit_message_template_encoded
3665
3096
commit_stamp = offset = None
3666
3097
if commit_time is not None:
3668
3099
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3669
except ValueError as e:
3670
raise errors.CommandError(gettext(
3671
"Could not parse --commit-time: " + str(e)))
3100
except ValueError, e:
3101
raise errors.BzrCommandError(
3102
"Could not parse --commit-time: " + str(e))
3104
# TODO: Need a blackbox test for invoking the external editor; may be
3105
# slightly problematic to run this cross-platform.
3107
# TODO: do more checks that the commit will succeed before
3108
# spending the user's valuable time typing a commit message.
3673
3110
properties = {}
3675
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3112
tree, selected_list = tree_files(selected_list)
3676
3113
if selected_list == ['']:
3677
3114
# workaround - commit of root of tree should be exactly the same
3678
3115
# as just default commit in that tree, and succeed even though
3856
3281
class cmd_upgrade(Command):
3857
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3859
When the default format has changed after a major new release of
3860
Bazaar/Breezy, you may be informed during certain operations that you
3861
should upgrade. Upgrading to a newer format may improve performance
3862
or make new features available. It may however limit interoperability
3863
with older repositories or with older versions of Bazaar or Breezy.
3865
If you wish to upgrade to a particular format rather than the
3866
current default, that can be specified using the --format option.
3867
As a consequence, you can use the upgrade command this way to
3868
"downgrade" to an earlier format, though some conversions are
3869
a one way process (e.g. changing from the 1.x default to the
3870
2.x default) so downgrading is not always possible.
3872
A backup.bzr.~#~ directory is created at the start of the conversion
3873
process (where # is a number). By default, this is left there on
3874
completion. If the conversion fails, delete the new .bzr directory
3875
and rename this one back in its place. Use the --clean option to ask
3876
for the backup.bzr directory to be removed on successful conversion.
3877
Alternatively, you can delete it by hand if everything looks good
3880
If the location given is a shared repository, dependent branches
3881
are also converted provided the repository converts successfully.
3882
If the conversion of a branch fails, remaining branches are still
3885
For more information on upgrades, see the Breezy Upgrade Guide,
3886
https://www.breezy-vcs.org/doc/en/upgrade-guide/.
3282
__doc__ = """Upgrade branch storage to current format.
3284
The check command or bzr developers may sometimes advise you to run
3285
this command. When the default format has changed you may also be warned
3286
during other operations to upgrade.
3889
_see_also = ['check', 'reconcile', 'formats']
3289
_see_also = ['check']
3890
3290
takes_args = ['url?']
3891
3291
takes_options = [
3892
RegistryOption('format',
3893
help='Upgrade to a specific format. See "brz help'
3894
' formats" for details.',
3895
lazy_registry=('breezy.controldir', 'format_registry'),
3896
converter=lambda name: controldir.format_registry.make_controldir(
3898
value_switches=True, title='Branch format'),
3900
help='Remove the backup.bzr directory if successful.'),
3902
help="Show what would be done, but don't actually do anything."),
3292
RegistryOption('format',
3293
help='Upgrade to a specific format. See "bzr help'
3294
' formats" for details.',
3295
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3296
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3297
value_switches=True, title='Branch format'),
3905
def run(self, url='.', format=None, clean=False, dry_run=False):
3906
from .upgrade import upgrade
3907
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3909
if len(exceptions) == 1:
3910
# Compatibility with historical behavior
3300
def run(self, url='.', format=None):
3301
from bzrlib.upgrade import upgrade
3302
upgrade(url, format)
3916
3305
class cmd_whoami(Command):
3917
__doc__ = """Show or set brz user id.
3306
__doc__ = """Show or set bzr user id.
3920
3309
Show the email of the current user::
3924
3313
Set the current user::
3926
brz whoami "Frank Chu <fchu@example.com>"
3315
bzr whoami "Frank Chu <fchu@example.com>"
3928
takes_options = ['directory',
3930
help='Display email address only.'),
3932
help='Set identity for the current branch instead of '
3317
takes_options = [ 'directory',
3319
help='Display email address only.'),
3321
help='Set identity for the current branch instead of '
3935
3324
takes_args = ['name?']
3936
3325
encoding_type = 'replace'
4206
3578
def run(self, testspecs_list=None, verbose=False, one=False,
4207
3579
transport=None, benchmark=None,
3580
lsprof_timed=None, cache_dir=None,
4209
3581
first=False, list_only=False,
4210
3582
randomize=None, exclude=None, strict=False,
4211
load_list=None, debugflag=None, starting_with=None, subunit1=False,
4212
subunit2=False, parallel=None, lsprof_tests=False, sync=False):
4214
# During selftest, disallow proxying, as it can cause severe
4215
# performance penalties and is only needed for thread
4216
# safety. The selftest command is assumed to not use threads
4217
# too heavily. The call should be as early as possible, as
4218
# error reporting for past duplicate imports won't have useful
4220
if sys.version_info[0] < 3:
4221
# TODO(pad.lv/1696545): Allow proxying on Python 3, since
4222
# disallowing it currently leads to failures in many places.
4223
lazy_import.disallow_proxying()
4227
except ImportError as e:
4228
raise errors.CommandError("tests not available. Install the "
4229
"breezy tests to run the breezy testsuite.")
3583
load_list=None, debugflag=None, starting_with=None, subunit=False,
3584
parallel=None, lsprof_tests=False):
3585
from bzrlib.tests import selftest
3586
import bzrlib.benchmarks as benchmarks
3587
from bzrlib.benchmarks import tree_creator
3589
# Make deprecation warnings visible, unless -Werror is set
3590
symbol_versioning.activate_deprecation_warnings(override=False)
3592
if cache_dir is not None:
3593
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
4231
3594
if testspecs_list is not None:
4232
3595
pattern = '|'.join(testspecs_list)
4237
from .tests import SubUnitBzrRunnerv1
3600
from bzrlib.tests import SubUnitBzrRunner
4238
3601
except ImportError:
4239
raise errors.CommandError(gettext(
4240
"subunit not available. subunit needs to be installed "
4241
"to use --subunit."))
4242
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv1
3602
raise errors.BzrCommandError("subunit not available. subunit "
3603
"needs to be installed to use --subunit.")
3604
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
4243
3605
# On Windows, disable automatic conversion of '\n' to '\r\n' in
4244
# stdout, which would corrupt the subunit stream.
3606
# stdout, which would corrupt the subunit stream.
4245
3607
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4246
3608
# following code can be deleted when it's sufficiently deployed
4247
3609
# -- vila/mgz 20100514
4248
3610
if (sys.platform == "win32"
4249
and getattr(sys.stdout, 'fileno', None) is not None):
3611
and getattr(sys.stdout, 'fileno', None) is not None):
4251
3613
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
4254
from .tests import SubUnitBzrRunnerv2
4256
raise errors.CommandError(gettext(
4257
"subunit not available. subunit "
4258
"needs to be installed to use --subunit2."))
4259
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv2
4262
3615
self.additional_selftest_args.setdefault(
4263
3616
'suite_decorators', []).append(parallel)
4265
raise errors.CommandError(gettext(
4266
"--benchmark is no longer supported from brz 2.2; "
4267
"use bzr-usertest instead"))
4268
test_suite_factory = None
4270
exclude_pattern = None
3618
test_suite_factory = benchmarks.test_suite
3619
# Unless user explicitly asks for quiet, be verbose in benchmarks
3620
verbose = not is_quiet()
3621
# TODO: should possibly lock the history file...
3622
benchfile = open(".perf_history", "at", buffering=1)
3623
self.add_cleanup(benchfile.close)
4272
exclude_pattern = '(' + '|'.join(exclude) + ')'
4274
self._disable_fsync()
3625
test_suite_factory = None
4275
3627
selftest_kwargs = {"verbose": verbose,
4277
"stop_on_failure": one,
4278
"transport": transport,
4279
"test_suite_factory": test_suite_factory,
4280
"lsprof_timed": lsprof_timed,
4281
"lsprof_tests": lsprof_tests,
4282
"matching_tests_first": first,
4283
"list_only": list_only,
4284
"random_seed": randomize,
4285
"exclude_pattern": exclude_pattern,
4287
"load_list": load_list,
4288
"debug_flags": debugflag,
4289
"starting_with": starting_with
3629
"stop_on_failure": one,
3630
"transport": transport,
3631
"test_suite_factory": test_suite_factory,
3632
"lsprof_timed": lsprof_timed,
3633
"lsprof_tests": lsprof_tests,
3634
"bench_history": benchfile,
3635
"matching_tests_first": first,
3636
"list_only": list_only,
3637
"random_seed": randomize,
3638
"exclude_pattern": exclude,
3640
"load_list": load_list,
3641
"debug_flags": debugflag,
3642
"starting_with": starting_with
4291
3644
selftest_kwargs.update(self.additional_selftest_args)
4293
# Make deprecation warnings visible, unless -Werror is set
4294
cleanup = symbol_versioning.activate_deprecation_warnings(
4297
result = tests.selftest(**selftest_kwargs)
3645
result = selftest(**selftest_kwargs)
4300
3646
return int(not result)
4302
def _disable_fsync(self):
4303
"""Change the 'os' functionality to not synchronize."""
4304
self._orig_fsync = getattr(os, 'fsync', None)
4305
if self._orig_fsync is not None:
4306
os.fsync = lambda filedes: None
4307
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4308
if self._orig_fdatasync is not None:
4309
os.fdatasync = lambda filedes: None
4312
3649
class cmd_version(Command):
4313
__doc__ = """Show version of brz."""
3650
__doc__ = """Show version of bzr."""
4315
3652
encoding_type = 'replace'
4316
3653
takes_options = [
4367
3703
The source of the merge can be specified either in the form of a branch,
4368
3704
or in the form of a path to a file containing a merge directive generated
4369
with brz send. If neither is specified, the default is the upstream branch
4370
or the branch most recently merged using --remember. The source of the
4371
merge may also be specified in the form of a path to a file in another
4372
branch: in this case, only the modifications to that file are merged into
4373
the current working tree.
4375
When merging from a branch, by default brz will try to merge in all new
4376
work from the other branch, automatically determining an appropriate base
4377
revision. If this fails, you may need to give an explicit base.
4379
To pick a different ending revision, pass "--revision OTHER". brz will
4380
try to merge in all new work up to and including revision OTHER.
4382
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4383
through OTHER, excluding BASE but including OTHER, will be merged. If this
4384
causes some revisions to be skipped, i.e. if the destination branch does
4385
not already contain revision BASE, such a merge is commonly referred to as
4386
a "cherrypick". Unlike a normal merge, Breezy does not currently track
4387
cherrypicks. The changes look like a normal commit, and the history of the
4388
changes from the other branch is not stored in the commit.
4390
Revision numbers are always relative to the source branch.
3705
with bzr send. If neither is specified, the default is the upstream branch
3706
or the branch most recently merged using --remember.
3708
When merging a branch, by default the tip will be merged. To pick a different
3709
revision, pass --revision. If you specify two values, the first will be used as
3710
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3711
available revisions, like this is commonly referred to as "cherrypicking".
3713
Revision numbers are always relative to the branch being merged.
3715
By default, bzr will try to merge in all new work from the other
3716
branch, automatically determining an appropriate base. If this
3717
fails, you may need to give an explicit base.
4392
3719
Merge will do its best to combine the changes in two branches, but there
4393
3720
are some kinds of problems only a human can fix. When it encounters those,
4394
3721
it will mark a conflict. A conflict means that you need to fix something,
4395
before you can commit.
4397
Use brz resolve when you have fixed a problem. See also brz conflicts.
4399
If there is no default branch set, the first merge will set it (use
4400
--no-remember to avoid setting it). After that, you can omit the branch
4401
to use the default. To change the default, use --remember. The value will
4402
only be saved if the remote location can be accessed.
3722
before you should commit.
3724
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3726
If there is no default branch set, the first merge will set it. After
3727
that, you can omit the branch to use the default. To change the
3728
default, use --remember. The value will only be saved if the remote
3729
location can be accessed.
4404
3731
The results of the merge are placed into the destination working
4405
directory, where they can be reviewed (with brz diff), tested, and then
3732
directory, where they can be reviewed (with bzr diff), tested, and then
4406
3733
committed to record the result of the merge.
4408
3735
merge refuses to run if there are any uncommitted changes, unless
4409
--force is given. If --force is given, then the changes from the source
4410
will be merged with the current working tree, including any uncommitted
4411
changes in the tree. The --force option can also be used to create a
3736
--force is given. The --force option can also be used to create a
4412
3737
merge revision which has more than two parents.
4414
3739
If one would like to merge changes from the working tree of the other
4502
3827
change_reporter = delta._ChangeReporter(
4503
3828
unversioned_filter=tree.is_ignored, view_info=view_info)
4504
3829
pb = ui.ui_factory.nested_progress_bar()
4505
self.enter_context(pb)
4506
self.enter_context(tree.lock_write())
3830
self.add_cleanup(pb.finished)
3831
self.add_cleanup(tree.lock_write().unlock)
4507
3832
if location is not None:
4509
mergeable = _mod_mergeable.read_mergeable_from_url(
4510
location, possible_transports=possible_transports)
3834
mergeable = bundle.read_mergeable_from_url(location,
3835
possible_transports=possible_transports)
4511
3836
except errors.NotABundle:
4512
3837
mergeable = None
4514
3839
if uncommitted:
4515
raise errors.CommandError(gettext('Cannot use --uncommitted'
4516
' with bundles or merge directives.'))
3840
raise errors.BzrCommandError('Cannot use --uncommitted'
3841
' with bundles or merge directives.')
4518
3843
if revision is not None:
4519
raise errors.CommandError(gettext(
4520
'Cannot use -r with merge directives or bundles'))
3844
raise errors.BzrCommandError(
3845
'Cannot use -r with merge directives or bundles')
4521
3846
merger, verified = _mod_merge.Merger.from_mergeable(tree,
4524
3849
if merger is None and uncommitted:
4525
3850
if revision is not None and len(revision) > 0:
4526
raise errors.CommandError(gettext('Cannot use --uncommitted and'
4527
' --revision at the same time.'))
3851
raise errors.BzrCommandError('Cannot use --uncommitted and'
3852
' --revision at the same time.')
4528
3853
merger = self.get_merger_from_uncommitted(tree, location, None)
4529
3854
allow_pending = False
4531
3856
if merger is None:
4532
3857
merger, allow_pending = self._get_merger_from_branch(tree,
4533
location, revision, remember, possible_transports, None)
3858
location, revision, remember, possible_transports, None)
4535
3860
merger.merge_type = merge_type
4536
3861
merger.reprocess = reprocess
4537
3862
merger.show_base = show_base
4538
3863
self.sanity_check_merger(merger)
4539
3864
if (merger.base_rev_id == merger.other_rev_id and
4540
merger.other_rev_id is not None):
4541
# check if location is a nonexistent file (and not a branch) to
4542
# disambiguate the 'Nothing to do'
4543
if merger.interesting_files:
4544
if not merger.other_tree.has_filename(
4545
merger.interesting_files[0]):
4546
note(gettext("merger: ") + str(merger))
4547
raise errors.PathsDoNotExist([location])
4548
note(gettext('Nothing to do.'))
3865
merger.other_rev_id is not None):
3866
note('Nothing to do.')
4550
if pull and not preview:
4551
3869
if merger.interesting_files is not None:
4552
raise errors.CommandError(
4553
gettext('Cannot pull individual files'))
3870
raise errors.BzrCommandError('Cannot pull individual files')
4554
3871
if (merger.base_rev_id == tree.last_revision()):
4555
3872
result = tree.pull(merger.other_branch, False,
4556
3873
merger.other_rev_id)
4557
3874
result.report(self.outf)
4559
3876
if merger.this_basis is None:
4560
raise errors.CommandError(gettext(
3877
raise errors.BzrCommandError(
4561
3878
"This branch has no commits."
4562
" (perhaps you would prefer 'brz pull')"))
3879
" (perhaps you would prefer 'bzr pull')")
4564
3881
return self._do_preview(merger)
4565
3882
elif interactive:
4771
4071
Re-do the merge of all conflicted files, and show the base text in
4772
4072
conflict regions, in addition to the usual THIS and OTHER texts::
4774
brz remerge --show-base
4074
bzr remerge --show-base
4776
4076
Re-do the merge of "foobar", using the weave merge algorithm, with
4777
4077
additional processing to reduce the size of conflict regions::
4779
brz remerge --merge-type weave --reprocess foobar
4079
bzr remerge --merge-type weave --reprocess foobar
4781
4081
takes_args = ['file*']
4782
4082
takes_options = [
4786
help="Show base revision text in conflicts."),
4086
help="Show base revision text in conflicts."),
4789
4089
def run(self, file_list=None, merge_type=None, show_base=False,
4790
4090
reprocess=False):
4791
from .conflicts import restore
4091
from bzrlib.conflicts import restore
4792
4092
if merge_type is None:
4793
4093
merge_type = _mod_merge.Merge3Merger
4794
tree, file_list = WorkingTree.open_containing_paths(file_list)
4795
self.enter_context(tree.lock_write())
4094
tree, file_list = tree_files(file_list)
4095
self.add_cleanup(tree.lock_write().unlock)
4796
4096
parents = tree.get_parent_ids()
4797
4097
if len(parents) != 2:
4798
raise errors.CommandError(
4799
gettext("Sorry, remerge only works after normal"
4800
" merges. Not cherrypicking or multi-merges."))
4801
interesting_files = None
4098
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4099
" merges. Not cherrypicking or"
4101
repository = tree.branch.repository
4102
interesting_ids = None
4802
4103
new_conflicts = []
4803
4104
conflicts = tree.conflicts()
4804
4105
if file_list is not None:
4805
interesting_files = set()
4106
interesting_ids = set()
4806
4107
for filename in file_list:
4807
if not tree.is_versioned(filename):
4108
file_id = tree.path2id(filename)
4808
4110
raise errors.NotVersionedError(filename)
4809
interesting_files.add(filename)
4810
if tree.kind(filename) != "directory":
4111
interesting_ids.add(file_id)
4112
if tree.kind(file_id) != "directory":
4813
for path, ie in tree.iter_entries_by_dir(
4814
specific_files=[filename]):
4815
interesting_files.add(path)
4115
for name, ie in tree.inventory.iter_entries(file_id):
4116
interesting_ids.add(ie.file_id)
4816
4117
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4818
4119
# Remerge only supports resolving contents conflicts
4819
4120
allowed_conflicts = ('text conflict', 'contents conflict')
4820
4121
restore_files = [c.path for c in conflicts
4821
4122
if c.typestring in allowed_conflicts]
4822
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_files)
4123
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4823
4124
tree.set_conflicts(ConflictList(new_conflicts))
4824
4125
if file_list is not None:
4825
4126
restore_files = file_list
5283
4573
@display_command
5284
4574
def run(self, filename, all=False, long=False, revision=None,
5285
4575
show_ids=False, directory=None):
5286
from .annotate import (
4576
from bzrlib.annotate import annotate_file, annotate_file_tree
5289
4577
wt, branch, relpath = \
5290
4578
_open_directory_or_containing_tree_or_branch(filename, directory)
5291
4579
if wt is not None:
5292
self.enter_context(wt.lock_read())
4580
self.add_cleanup(wt.lock_read().unlock)
5294
self.enter_context(branch.lock_read())
4582
self.add_cleanup(branch.lock_read().unlock)
5295
4583
tree = _get_one_revision_tree('annotate', revision, branch=branch)
5296
self.enter_context(tree.lock_read())
4584
self.add_cleanup(tree.lock_read().unlock)
4586
file_id = wt.path2id(relpath)
4588
file_id = tree.path2id(relpath)
4590
raise errors.NotVersionedError(filename)
4591
file_version = tree.inventory[file_id].revision
5297
4592
if wt is not None and revision is None:
5298
if not wt.is_versioned(relpath):
5299
raise errors.NotVersionedError(relpath)
5300
4593
# If there is a tree and we're not annotating historical
5301
4594
# versions, annotate the working tree's content.
5302
annotate_file_tree(wt, relpath, self.outf, long, all,
4595
annotate_file_tree(wt, file_id, self.outf, long, all,
5305
if not tree.is_versioned(relpath):
5306
raise errors.NotVersionedError(relpath)
5307
annotate_file_tree(tree, relpath, self.outf, long, all,
5308
show_ids=show_ids, branch=branch)
4598
annotate_file(branch, file_version, file_id, long, all, self.outf,
5311
4602
class cmd_re_sign(Command):
5312
4603
__doc__ = """Create a digital signature for an existing revision."""
5313
4604
# TODO be able to replace existing ones.
5315
hidden = True # is this right ?
4606
hidden = True # is this right ?
5316
4607
takes_args = ['revision_id*']
5317
4608
takes_options = ['directory', 'revision']
5319
4610
def run(self, revision_id_list=None, revision=None, directory=u'.'):
5320
4611
if revision_id_list is not None and revision is not None:
5321
raise errors.CommandError(
5322
gettext('You can only supply one of revision_id or --revision'))
4612
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5323
4613
if revision_id_list is None and revision is None:
5324
raise errors.CommandError(
5325
gettext('You must supply either --revision or a revision_id'))
4614
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
5326
4615
b = WorkingTree.open_containing(directory)[0].branch
5327
self.enter_context(b.lock_write())
4616
self.add_cleanup(b.lock_write().unlock)
5328
4617
return self._run(b, revision_id_list, revision)
5330
4619
def _run(self, b, revision_id_list, revision):
5331
from .repository import WriteGroup
5332
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4620
import bzrlib.gpg as gpg
4621
gpg_strategy = gpg.GPGStrategy(b.get_config())
5333
4622
if revision_id_list is not None:
5334
with WriteGroup(b.repository):
4623
b.repository.start_write_group()
5335
4625
for revision_id in revision_id_list:
5336
revision_id = cache_utf8.encode(revision_id)
5337
4626
b.repository.sign_revision(revision_id, gpg_strategy)
4628
b.repository.abort_write_group()
4631
b.repository.commit_write_group()
5338
4632
elif revision is not None:
5339
4633
if len(revision) == 1:
5340
4634
revno, rev_id = revision[0].in_history(b)
5341
with WriteGroup(b.repository):
4635
b.repository.start_write_group()
5342
4637
b.repository.sign_revision(rev_id, gpg_strategy)
4639
b.repository.abort_write_group()
4642
b.repository.commit_write_group()
5343
4643
elif len(revision) == 2:
5344
4644
# are they both on rh- if so we can walk between them
5345
4645
# might be nice to have a range helper for arbitrary
5513
4810
end_revision=last_revno)
5516
self.outf.write(gettext('Dry-run, pretending to remove'
5517
' the above revisions.\n'))
4813
self.outf.write('Dry-run, pretending to remove'
4814
' the above revisions.\n')
5520
gettext('The above revision(s) will be removed.\n'))
4816
self.outf.write('The above revision(s) will be removed.\n')
5523
if not ui.ui_factory.confirm_action(
5524
gettext(u'Uncommit these revisions'),
5525
'breezy.builtins.uncommit',
5527
self.outf.write(gettext('Canceled\n'))
4819
if not ui.ui_factory.get_boolean('Are you sure'):
4820
self.outf.write('Canceled')
5530
4823
mutter('Uncommitting from {%s} to {%s}',
5531
4824
last_rev_id, rev_id)
5532
4825
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5533
revno=revno, local=local, keep_tags=keep_tags)
5536
gettext('You can restore the old tip by running:\n'
5537
' brz pull -d %s %s -r revid:%s\n')
5538
% (location, location, last_rev_id.decode('utf-8')))
5541
gettext('You can restore the old tip by running:\n'
5542
' brz pull . -r revid:%s\n')
5543
% last_rev_id.decode('utf-8'))
4826
revno=revno, local=local)
4827
self.outf.write('You can restore the old tip by running:\n'
4828
' bzr pull . -r revid:%s\n' % last_rev_id)
5546
4831
class cmd_break_lock(Command):
5547
__doc__ = """Break a dead lock.
5549
This command breaks a lock on a repository, branch, working directory or
4832
__doc__ = """Break a dead lock on a repository, branch or working directory.
5552
4834
CAUTION: Locks should only be broken when you are sure that the process
5553
4835
holding the lock has been stopped.
5555
You can get information on what locks are open via the 'brz info
4837
You can get information on what locks are open via the 'bzr info
5556
4838
[location]' command.
5560
brz break-lock brz+ssh://example.com/brz/foo
5561
brz break-lock --conf ~/.config/breezy
4842
bzr break-lock bzr+ssh://example.com/bzr/foo
5564
4844
takes_args = ['location?']
5567
help='LOCATION is the directory where the config lock is.'),
5569
help='Do not ask for confirmation before breaking the lock.'),
5572
def run(self, location=None, config=False, force=False):
4846
def run(self, location=None, show=False):
5573
4847
if location is None:
5574
4848
location = u'.'
5576
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5578
{'breezy.lockdir.break': True})
5580
conf = _mod_config.LockableConfig(file_name=location)
5583
control, relpath = controldir.ControlDir.open_containing(location)
5585
control.break_lock()
5586
except NotImplementedError:
4849
control, relpath = bzrdir.BzrDir.open_containing(location)
4851
control.break_lock()
4852
except NotImplementedError:
5590
4856
class cmd_wait_until_signalled(Command):
5591
__doc__ = """Test helper for test_start_and_stop_brz_subprocess_send_signal.
4857
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5593
4859
This just prints a line to signal when it is ready, then blocks on stdin.
5611
4877
help='Serve on stdin/out for use from inetd or sshd.'),
5612
4878
RegistryOption('protocol',
5613
help="Protocol to serve.",
5614
lazy_registry=('breezy.transport',
5615
'transport_server_registry'),
5616
value_switches=True),
5618
help='Listen for connections on nominated address.',
4879
help="Protocol to serve.",
4880
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4881
value_switches=True),
5621
help='Listen for connections on nominated port. Passing 0 as '
5622
'the port number will result in a dynamically allocated '
5623
'port. The default port depends on the protocol.',
4883
help='Listen for connections on nominated port of the form '
4884
'[hostname:]portnumber. Passing 0 as the port number will '
4885
'result in a dynamically allocated port. The default port '
4886
'depends on the protocol.',
5625
4888
custom_help('directory',
5626
help='Serve contents of this directory.'),
4889
help='Serve contents of this directory.'),
5627
4890
Option('allow-writes',
5628
4891
help='By default the server is a readonly server. Supplying '
5629
4892
'--allow-writes enables write access to the contents of '
5630
'the served directory and below. Note that ``brz serve`` '
4893
'the served directory and below. Note that ``bzr serve`` '
5631
4894
'does not perform authentication, so unless some form of '
5632
4895
'external authentication is arranged supplying this '
5633
4896
'option leads to global uncontrolled write access to your '
5636
Option('client-timeout', type=float,
5637
help='Override the default idle client timeout (5min).'),
5640
def run(self, listen=None, port=None, inet=False, directory=None,
5641
allow_writes=False, protocol=None, client_timeout=None):
5642
from . import location, transport
4901
def get_host_and_port(self, port):
4902
"""Return the host and port to run the smart server on.
4904
If 'port' is None, None will be returned for the host and port.
4906
If 'port' has a colon in it, the string before the colon will be
4907
interpreted as the host.
4909
:param port: A string of the port to run the server on.
4910
:return: A tuple of (host, port), where 'host' is a host name or IP,
4911
and port is an integer TCP/IP port.
4914
if port is not None:
4916
host, port = port.split(':')
4920
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4922
from bzrlib import transport
5643
4923
if directory is None:
5644
directory = osutils.getcwd()
4924
directory = os.getcwd()
5645
4925
if protocol is None:
5646
4926
protocol = transport.transport_server_registry.get()
5647
url = location.location_to_url(directory)
4927
host, port = self.get_host_and_port(port)
4928
url = urlutils.local_path_to_url(directory)
5648
4929
if not allow_writes:
5649
4930
url = 'readonly+' + url
5650
t = transport.get_transport_from_url(url)
5651
protocol(t, listen, port, inet, client_timeout)
4931
t = transport.get_transport(url)
4932
protocol(t, host, port, inet)
5654
4935
class cmd_join(Command):
6190
5452
takes_args = ['location?']
6191
5453
takes_options = [
6192
5454
RegistryOption.from_kwargs(
6195
help='The relation between branch and tree.',
5456
title='Target type',
5457
help='The type to reconfigure the directory to.',
6196
5458
value_switches=True, enum_switch=False,
6197
5459
branch='Reconfigure to be an unbound branch with no working tree.',
6198
5460
tree='Reconfigure to be an unbound branch with a working tree.',
6199
5461
checkout='Reconfigure to be a bound branch with a working tree.',
6200
5462
lightweight_checkout='Reconfigure to be a lightweight'
6201
' checkout (with no local history).',
6203
RegistryOption.from_kwargs(
6205
title='Repository type',
6206
help='Location fo the repository.',
6207
value_switches=True, enum_switch=False,
5463
' checkout (with no local history).',
6208
5464
standalone='Reconfigure to be a standalone branch '
6209
'(i.e. stop using shared repository).',
5465
'(i.e. stop using shared repository).',
6210
5466
use_shared='Reconfigure to use a shared repository.',
6212
RegistryOption.from_kwargs(
6214
title='Trees in Repository',
6215
help='Whether new branches in the repository have trees.',
6216
value_switches=True, enum_switch=False,
6217
5467
with_trees='Reconfigure repository to create '
6218
'working trees on branches by default.',
5468
'working trees on branches by default.',
6219
5469
with_no_trees='Reconfigure repository to not create '
6220
'working trees on branches by default.'
5470
'working trees on branches by default.'
6222
5472
Option('bind-to', help='Branch to bind checkout to.', type=str),
6223
5473
Option('force',
6224
help='Perform reconfiguration even if local changes'
5474
help='Perform reconfiguration even if local changes'
6226
5476
Option('stacked-on',
6227
help='Reconfigure a branch to be stacked on another branch.',
5477
help='Reconfigure a branch to be stacked on another branch.',
6230
5480
Option('unstacked',
6231
help='Reconfigure a branch to be unstacked. This '
6232
'may require copying substantial data into it.',
5481
help='Reconfigure a branch to be unstacked. This '
5482
'may require copying substantial data into it.',
6236
def run(self, location=None, bind_to=None, force=False,
6237
tree_type=None, repository_type=None, repository_trees=None,
6238
stacked_on=None, unstacked=None):
6239
directory = controldir.ControlDir.open(location)
5486
def run(self, location=None, target_type=None, bind_to=None, force=False,
5489
directory = bzrdir.BzrDir.open(location)
6240
5490
if stacked_on and unstacked:
6241
raise errors.CommandError(
6242
gettext("Can't use both --stacked-on and --unstacked"))
5491
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
6243
5492
elif stacked_on is not None:
6244
5493
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
6245
5494
elif unstacked:
6313
5551
takes_args = ['to_location?']
6314
5552
takes_options = ['directory',
6315
5553
Option('force',
6316
help='Switch even if local commits will be lost.'),
5554
help='Switch even if local commits will be lost.'),
6318
5556
Option('create-branch', short_name='b',
6319
help='Create the target branch from this one before'
6320
' switching to it.'),
6322
help='Store and restore uncommitted changes in the'
5557
help='Create the target branch from this one before'
5558
' switching to it.'),
6326
5561
def run(self, to_location=None, force=False, create_branch=False,
6327
revision=None, directory=u'.', store=False):
6328
from . import switch
5562
revision=None, directory=u'.'):
5563
from bzrlib import switch
6329
5564
tree_location = directory
6330
5565
revision = _get_one_revision('switch', revision)
6331
control_dir = controldir.ControlDir.open_containing(tree_location)[0]
6332
possible_transports = [control_dir.root_transport]
5566
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6333
5567
if to_location is None:
6334
5568
if revision is None:
6335
raise errors.CommandError(gettext('You must supply either a'
6336
' revision or a location'))
5569
raise errors.BzrCommandError('You must supply either a'
5570
' revision or a location')
6337
5571
to_location = tree_location
6339
branch = control_dir.open_branch(
6340
possible_transports=possible_transports)
5573
branch = control_dir.open_branch()
6341
5574
had_explicit_nick = branch.get_config().has_explicit_nickname()
6342
5575
except errors.NotBranchError:
6344
5577
had_explicit_nick = False
6346
possible_transports.append(branch.user_transport)
6347
5578
if create_branch:
6348
5579
if branch is None:
6349
raise errors.CommandError(
6350
gettext('cannot create branch without source branch'))
6351
to_location = lookup_new_sibling_branch(
6352
control_dir, to_location,
6353
possible_transports=possible_transports)
6354
if revision is not None:
6355
revision = revision.as_revision_id(branch)
6356
to_branch = branch.controldir.sprout(
6358
possible_transports=possible_transports,
6359
revision_id=revision,
6360
source_branch=branch).open_branch()
5580
raise errors.BzrCommandError('cannot create branch without'
5582
to_location = directory_service.directories.dereference(
5584
if '/' not in to_location and '\\' not in to_location:
5585
# This path is meant to be relative to the existing branch
5586
this_url = self._get_branch_location(control_dir)
5587
to_location = urlutils.join(this_url, '..', to_location)
5588
to_branch = branch.bzrdir.sprout(to_location,
5589
possible_transports=[branch.bzrdir.root_transport],
5590
source_branch=branch).open_branch()
5593
to_branch = Branch.open(to_location)
5594
except errors.NotBranchError:
5595
this_url = self._get_branch_location(control_dir)
6363
5596
to_branch = Branch.open(
6364
to_location, possible_transports=possible_transports)
6365
except errors.NotBranchError:
6366
to_branch = open_sibling_branch(
6367
control_dir, to_location,
6368
possible_transports=possible_transports)
6369
if revision is not None:
6370
revision = revision.as_revision_id(to_branch)
6371
possible_transports.append(to_branch.user_transport)
6373
switch.switch(control_dir, to_branch, force, revision_id=revision,
6374
store_uncommitted=store,
6375
possible_transports=possible_transports)
6376
except controldir.BranchReferenceLoop:
6377
raise errors.CommandError(
6378
gettext('switching would create a branch reference loop. '
6379
'Use the "bzr up" command to switch to a '
6380
'different revision.'))
5597
urlutils.join(this_url, '..', to_location))
5598
if revision is not None:
5599
revision = revision.as_revision_id(to_branch)
5600
switch.switch(control_dir, to_branch, force, revision_id=revision)
6381
5601
if had_explicit_nick:
6382
branch = control_dir.open_branch() # get the new branch!
5602
branch = control_dir.open_branch() #get the new branch!
6383
5603
branch.nick = to_branch.nick
6385
if to_branch.controldir.control_url != control_dir.control_url:
6386
note(gettext('Switched to branch %s at %s'),
6387
to_branch.name, urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5604
note('Switched to branch: %s',
5605
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5607
def _get_branch_location(self, control_dir):
5608
"""Return location of branch for this control dir."""
5610
this_branch = control_dir.open_branch()
5611
# This may be a heavy checkout, where we want the master branch
5612
master_location = this_branch.get_bound_location()
5613
if master_location is not None:
5614
return master_location
5615
# If not, use a local sibling
5616
return this_branch.base
5617
except errors.NotBranchError:
5618
format = control_dir.find_branch_format()
5619
if getattr(format, 'get_reference', None) is not None:
5620
return format.get_reference(control_dir)
6389
note(gettext('Switched to branch %s'), to_branch.name)
6391
note(gettext('Switched to branch at %s'),
6392
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5622
return control_dir.root_transport.base
6395
5625
class cmd_view(Command):
6779
5977
takes_args = ['path?', 'location?']
6782
Option('force-unversioned',
6783
help='Set reference even if path is not versioned.'),
6786
def run(self, path=None, directory='.', location=None, force_unversioned=False):
6787
tree, branch, relpath = (
6788
controldir.ControlDir.open_containing_tree_or_branch(directory))
5979
def run(self, path=None, location=None):
5981
if path is not None:
5983
tree, branch, relpath =(
5984
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
5985
if path is not None:
6789
5987
if tree is None:
6790
5988
tree = branch.basis_tree()
6791
5989
if path is None:
6792
with tree.lock_read():
6794
(path, tree.get_reference_info(path, branch))
6795
for path in tree.iter_references()]
6796
self._display_reference_info(tree, branch, info)
5990
info = branch._get_all_reference_info().iteritems()
5991
self._display_reference_info(tree, branch, info)
6798
if not tree.is_versioned(path) and not force_unversioned:
5993
file_id = tree.path2id(path)
6799
5995
raise errors.NotVersionedError(path)
6800
5996
if location is None:
6801
info = [(path, tree.get_reference_info(path, branch))]
5997
info = [(file_id, branch.get_reference_info(file_id))]
6802
5998
self._display_reference_info(tree, branch, info)
6804
tree.set_reference_info(path, location)
6000
branch.set_reference_info(file_id, path, location)
6806
6002
def _display_reference_info(self, tree, branch, info):
6808
for path, location in info:
6004
for file_id, (path, location) in info:
6006
path = tree.id2path(file_id)
6007
except errors.NoSuchId:
6809
6009
ref_list.append((path, location))
6810
6010
for path, location in sorted(ref_list):
6811
6011
self.outf.write('%s %s\n' % (path, location))
6814
class cmd_export_pot(Command):
6815
__doc__ = """Export command helps and error messages in po format."""
6818
takes_options = [Option('plugin',
6819
help='Export help text from named command '
6820
'(defaults to all built in commands).',
6822
Option('include-duplicates',
6823
help='Output multiple copies of the same msgid '
6824
'string if it appears more than once.'),
6827
def run(self, plugin=None, include_duplicates=False):
6828
from .export_pot import export_pot
6829
export_pot(self.outf, plugin, include_duplicates)
6832
class cmd_import(Command):
6833
__doc__ = """Import sources from a directory, tarball or zip file
6835
This command will import a directory, tarball or zip file into a bzr
6836
tree, replacing any versioned files already present. If a directory is
6837
specified, it is used as the target. If the directory does not exist, or
6838
is not versioned, it is created.
6840
Tarballs may be gzip or bzip2 compressed. This is autodetected.
6842
If the tarball or zip has a single root directory, that directory is
6843
stripped when extracting the tarball. This is not done for directories.
6846
takes_args = ['source', 'tree?']
6848
def run(self, source, tree=None):
6849
from .upstream_import import do_import
6850
do_import(source, tree)
6853
class cmd_link_tree(Command):
6854
__doc__ = """Hardlink matching files to another tree.
6856
Only files with identical content and execute bit will be linked.
6859
takes_args = ['location']
6861
def run(self, location):
6862
from .transform import link_tree
6863
target_tree = WorkingTree.open_containing(".")[0]
6864
source_tree = WorkingTree.open(location)
6865
with target_tree.lock_write(), source_tree.lock_read():
6866
link_tree(target_tree, source_tree)
6869
class cmd_fetch_ghosts(Command):
6870
__doc__ = """Attempt to retrieve ghosts from another branch.
6872
If the other branch is not supplied, the last-pulled branch is used.
6876
aliases = ['fetch-missing']
6877
takes_args = ['branch?']
6878
takes_options = [Option('no-fix', help="Skip additional synchonization.")]
6880
def run(self, branch=None, no_fix=False):
6881
from .fetch_ghosts import GhostFetcher
6882
installed, failed = GhostFetcher.from_cmdline(branch).run()
6883
if len(installed) > 0:
6884
self.outf.write("Installed:\n")
6885
for rev in installed:
6886
self.outf.write(rev.decode('utf-8') + "\n")
6888
self.outf.write("Still missing:\n")
6890
self.outf.write(rev.decode('utf-8') + "\n")
6891
if not no_fix and len(installed) > 0:
6892
cmd_reconcile().run(".")
6895
class cmd_grep(Command):
6896
"""Print lines matching PATTERN for specified files and revisions.
6898
This command searches the specified files and revisions for a given
6899
pattern. The pattern is specified as a Python regular expressions[1].
6901
If the file name is not specified, the revisions starting with the
6902
current directory are searched recursively. If the revision number is
6903
not specified, the working copy is searched. To search the last committed
6904
revision, use the '-r -1' or '-r last:1' option.
6906
Unversioned files are not searched unless explicitly specified on the
6907
command line. Unversioned directores are not searched.
6909
When searching a pattern, the output is shown in the 'filepath:string'
6910
format. If a revision is explicitly searched, the output is shown as
6911
'filepath~N:string', where N is the revision number.
6913
--include and --exclude options can be used to search only (or exclude
6914
from search) files with base name matches the specified Unix style GLOB
6915
pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \\
6916
to quote wildcard or backslash character literally. Note that the glob
6917
pattern is not a regular expression.
6919
[1] http://docs.python.org/library/re.html#regular-expression-syntax
6922
encoding_type = 'replace'
6923
takes_args = ['pattern', 'path*']
6927
Option('color', type=str, argname='when',
6928
help='Show match in color. WHEN is never, always or auto.'),
6929
Option('diff', short_name='p',
6930
help='Grep for pattern in changeset for each revision.'),
6931
ListOption('exclude', type=str, argname='glob', short_name='X',
6932
help="Skip files whose base name matches GLOB."),
6933
ListOption('include', type=str, argname='glob', short_name='I',
6934
help="Search only files whose base name matches GLOB."),
6935
Option('files-with-matches', short_name='l',
6936
help='Print only the name of each input file in '
6937
'which PATTERN is found.'),
6938
Option('files-without-match', short_name='L',
6939
help='Print only the name of each input file in '
6940
'which PATTERN is not found.'),
6941
Option('fixed-string', short_name='F',
6942
help='Interpret PATTERN is a single fixed string (not regex).'),
6944
help='Search for pattern starting from the root of the branch. '
6945
'(implies --recursive)'),
6946
Option('ignore-case', short_name='i',
6947
help='Ignore case distinctions while matching.'),
6949
help='Number of levels to display - 0 for all, 1 for collapsed '
6952
type=_parse_levels),
6953
Option('line-number', short_name='n',
6954
help='Show 1-based line number.'),
6955
Option('no-recursive',
6956
help="Don't recurse into subdirectories. (default is --recursive)"),
6957
Option('null', short_name='Z',
6958
help='Write an ASCII NUL (\\0) separator '
6959
'between output lines rather than a newline.'),
6963
def run(self, verbose=False, ignore_case=False, no_recursive=False,
6964
from_root=False, null=False, levels=None, line_number=False,
6965
path_list=None, revision=None, pattern=None, include=None,
6966
exclude=None, fixed_string=False, files_with_matches=False,
6967
files_without_match=False, color=None, diff=False):
6968
from breezy import _termcolor
6971
if path_list is None:
6975
raise errors.CommandError(
6976
'cannot specify both --from-root and PATH.')
6978
if files_with_matches and files_without_match:
6979
raise errors.CommandError(
6980
'cannot specify both '
6981
'-l/--files-with-matches and -L/--files-without-matches.')
6983
global_config = _mod_config.GlobalConfig()
6986
color = global_config.get_user_option('grep_color')
6991
if color not in ['always', 'never', 'auto']:
6992
raise errors.CommandError('Valid values for --color are '
6993
'"always", "never" or "auto".')
6999
if revision is not None or levels == 0:
7000
# print revision numbers as we may be showing multiple revisions
7007
if not ignore_case and grep.is_fixed_string(pattern):
7008
# if the pattern isalnum, implicitly use to -F for faster grep
7010
elif ignore_case and fixed_string:
7011
# GZ 2010-06-02: Fall back to regexp rather than lowercasing
7012
# pattern and text which will cause pain later
7013
fixed_string = False
7014
pattern = re.escape(pattern)
7017
re_flags = re.MULTILINE
7019
re_flags |= re.IGNORECASE
7021
if not fixed_string:
7022
patternc = grep.compile_pattern(
7023
pattern.encode(grep._user_encoding), re_flags)
7025
if color == 'always':
7027
elif color == 'never':
7029
elif color == 'auto':
7030
show_color = _termcolor.allow_color()
7032
opts = grep.GrepOptions()
7034
opts.verbose = verbose
7035
opts.ignore_case = ignore_case
7036
opts.no_recursive = no_recursive
7037
opts.from_root = from_root
7039
opts.levels = levels
7040
opts.line_number = line_number
7041
opts.path_list = path_list
7042
opts.revision = revision
7043
opts.pattern = pattern
7044
opts.include = include
7045
opts.exclude = exclude
7046
opts.fixed_string = fixed_string
7047
opts.files_with_matches = files_with_matches
7048
opts.files_without_match = files_without_match
7052
opts.eol_marker = eol_marker
7053
opts.print_revno = print_revno
7054
opts.patternc = patternc
7055
opts.recursive = not no_recursive
7056
opts.fixed_string = fixed_string
7057
opts.outf = self.outf
7058
opts.show_color = show_color
7062
# files_with_matches, files_without_match
7063
# levels(?), line_number, from_root
7065
# These are silently ignored.
7066
grep.grep_diff(opts)
7067
elif revision is None:
7068
grep.workingtree_grep(opts)
7070
grep.versioned_grep(opts)
7073
class cmd_patch(Command):
7074
"""Apply a named patch to the current tree.
7078
takes_args = ['filename?']
7079
takes_options = [Option('strip', type=int, short_name='p',
7080
help=("Strip the smallest prefix containing num "
7081
"leading slashes from filenames.")),
7082
Option('silent', help='Suppress chatter.')]
7084
def run(self, filename=None, strip=None, silent=False):
7085
from .patch import patch_tree
7086
wt = WorkingTree.open_containing('.')[0]
7090
if filename is None:
7091
my_file = getattr(sys.stdin, 'buffer', sys.stdin)
7093
my_file = open(filename, 'rb')
7094
patches = [my_file.read()]
7095
return patch_tree(wt, patches, strip, quiet=is_quiet(), out=self.outf)
7098
class cmd_resolve_location(Command):
7099
__doc__ = """Expand a location to a full URL.
7102
Look up a Launchpad URL.
7104
brz resolve-location lp:brz
7106
takes_args = ['location']
7109
def run(self, location):
7110
from .location import location_to_url
7111
url = location_to_url(location)
7112
display_url = urlutils.unescape_for_display(url, self.outf.encoding)
7113
self.outf.write('%s\n' % display_url)
7116
6014
def _register_lazy_builtins():
7117
6015
# register lazy builtins from other modules; called at startup and should
7118
6016
# be only called once.
7119
6017
for (name, aliases, module_name) in [
7120
('cmd_bisect', [], 'breezy.bisect'),
7121
('cmd_bundle_info', [], 'breezy.bzr.bundle.commands'),
7122
('cmd_config', [], 'breezy.config'),
7123
('cmd_dump_btree', [], 'breezy.bzr.debug_commands'),
7124
('cmd_file_id', [], 'breezy.bzr.debug_commands'),
7125
('cmd_file_path', [], 'breezy.bzr.debug_commands'),
7126
('cmd_version_info', [], 'breezy.cmd_version_info'),
7127
('cmd_resolve', ['resolved'], 'breezy.conflicts'),
7128
('cmd_conflicts', [], 'breezy.conflicts'),
7129
('cmd_ping', [], 'breezy.bzr.smart.ping'),
7130
('cmd_sign_my_commits', [], 'breezy.commit_signature_commands'),
7131
('cmd_verify_signatures', [], 'breezy.commit_signature_commands'),
7132
('cmd_test_script', [], 'breezy.cmd_test_script'),
6018
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6019
('cmd_dpush', [], 'bzrlib.foreign'),
6020
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6021
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6022
('cmd_conflicts', [], 'bzrlib.conflicts'),
6023
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
7134
6025
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
