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"""
19
from __future__ import absolute_import
17
"""builtin bzr commands"""
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
28
from . import lazy_import
29
lazy_import.lazy_import(globals(), """
34
branch as _mod_branch,
40
config as _mod_config,
47
41
merge as _mod_merge,
48
mergeable as _mod_mergeable,
53
46
revision as _mod_revision,
62
from breezy.branch import Branch
63
from breezy.conflicts import ConflictList
64
from breezy.transport import memory
65
from breezy.smtp_connection import SMTPConnection
66
from breezy.workingtree import WorkingTree
67
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
70
from .commands import (
63
from bzrlib.commands import (
72
65
builtin_command_registry,
68
from bzrlib.option import (
80
73
_parse_revision_str,
82
from .revisionspec import (
92
from .trace import mutter, note, warning, is_quiet, get_verbosity_level
95
def _get_branch_location(control_dir, possible_transports=None):
96
"""Return location of branch for this control dir."""
98
target = control_dir.get_branch_reference()
99
except errors.NotBranchError:
100
return control_dir.root_transport.base
101
if target is not None:
103
this_branch = control_dir.open_branch(
104
possible_transports=possible_transports)
105
# This may be a heavy checkout, where we want the master branch
106
master_location = this_branch.get_bound_location()
107
if master_location is not None:
108
return master_location
109
# If not, use a local sibling
110
return this_branch.base
113
def _is_colocated(control_dir, possible_transports=None):
114
"""Check if the branch in control_dir is colocated.
116
:param control_dir: Control directory
117
:return: Tuple with boolean indicating whether the branch is colocated
118
and the full URL to the actual branch
120
# This path is meant to be relative to the existing branch
121
this_url = _get_branch_location(
122
control_dir, possible_transports=possible_transports)
123
# Perhaps the target control dir supports colocated branches?
125
root = controldir.ControlDir.open(
126
this_url, possible_transports=possible_transports)
127
except errors.NotBranchError:
128
return (False, this_url)
131
control_dir.open_workingtree()
132
except (errors.NoWorkingTree, errors.NotLocalUrl):
133
return (False, this_url)
136
root._format.colocated_branches and
137
control_dir.control_url == root.control_url,
141
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
142
"""Lookup the location for a new sibling branch.
144
:param control_dir: Control directory to find sibling branches from
145
:param location: Name of the new branch
146
:return: Full location to the new branch
148
location = directory_service.directories.dereference(location)
149
if '/' not in location and '\\' not in location:
150
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
153
return urlutils.join_segment_parameters(
154
this_url, {"branch": urlutils.escape(location)})
156
return urlutils.join(this_url, '..', urlutils.escape(location))
160
def open_sibling_branch(control_dir, location, possible_transports=None):
161
"""Open a branch, possibly a sibling of another.
163
:param control_dir: Control directory relative to which to lookup the
165
:param location: Location to look up
166
:return: branch to open
169
# Perhaps it's a colocated branch?
170
return control_dir.open_branch(
171
location, possible_transports=possible_transports)
172
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
173
this_url = _get_branch_location(control_dir)
176
this_url, '..', urlutils.escape(location)))
179
def open_nearby_branch(near=None, location=None, possible_transports=None):
180
"""Open a nearby branch.
182
:param near: Optional location of container from which to open branch
183
:param location: Location of the branch
184
:return: Branch instance
191
location, possible_transports=possible_transports)
192
except errors.NotBranchError:
194
cdir = controldir.ControlDir.open(
195
near, possible_transports=possible_transports)
196
return open_sibling_branch(
197
cdir, location, possible_transports=possible_transports)
200
def iter_sibling_branches(control_dir, possible_transports=None):
201
"""Iterate over the siblings of a branch.
203
:param control_dir: Control directory for which to look up the siblings
204
:return: Iterator over tuples with branch name and branch object
207
reference = control_dir.get_branch_reference()
208
except errors.NotBranchError:
210
if reference is not None:
212
ref_branch = Branch.open(
213
reference, possible_transports=possible_transports)
214
except errors.NotBranchError:
218
if ref_branch is None or ref_branch.name:
219
if ref_branch is not None:
220
control_dir = ref_branch.controldir
221
for name, branch in viewitems(control_dir.get_branches()):
224
repo = ref_branch.controldir.find_repository()
225
for branch in repo.find_branches(using=True):
226
name = urlutils.relative_url(
227
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]))
231
88
def tree_files_for_add(file_list):
433
342
takes_args = ['revision_id?']
434
takes_options = ['directory', 'revision']
343
takes_options = ['revision']
435
344
# cat-revision is more for frontends so should be exact
436
345
encoding = 'strict'
438
347
def print_revision(self, revisions, revid):
439
348
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
440
record = next(stream)
349
record = stream.next()
441
350
if record.storage_kind == 'absent':
442
351
raise errors.NoSuchRevision(revisions, revid)
443
352
revtext = record.get_bytes_as('fulltext')
444
353
self.outf.write(revtext.decode('utf-8'))
447
def run(self, revision_id=None, revision=None, directory=u'.'):
356
def run(self, revision_id=None, revision=None):
448
357
if revision_id is not None and revision is not None:
449
raise errors.BzrCommandError(gettext('You can only supply one of'
450
' revision_id or --revision'))
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
451
360
if revision_id is None and revision is None:
452
raise errors.BzrCommandError(
453
gettext('You must supply either --revision or a revision_id'))
455
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
457
revisions = getattr(b.repository, "revisions", None)
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
365
revisions = b.repository.revisions
458
366
if revisions is None:
459
raise errors.BzrCommandError(
460
gettext('Repository %r does not support '
461
'access to raw revision texts') % b.repository)
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
463
with b.repository.lock_read():
370
b.repository.lock_read()
464
372
# TODO: jam 20060112 should cat-revision always output utf-8?
465
373
if revision_id is not None:
466
revision_id = cache_utf8.encode(revision_id)
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
468
376
self.print_revision(revisions, revision_id)
469
377
except errors.NoSuchRevision:
471
"The repository {0} contains no revision {1}.").format(
472
b.repository.base, revision_id.decode('utf-8'))
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
473
380
raise errors.BzrCommandError(msg)
474
381
elif revision is not None:
475
382
for rev in revision:
477
384
raise errors.BzrCommandError(
478
gettext('You cannot specify a NULL revision.'))
385
'You cannot specify a NULL revision.')
479
386
rev_id = rev.as_revision_id(b)
480
387
self.print_revision(revisions, rev_id)
389
b.repository.unlock()
392
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
395
PATH is a btree index file, it can be any URL. This includes things like
396
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
398
By default, the tuples stored in the index file will be displayed. With
399
--raw, we will uncompress the pages, but otherwise display the raw bytes
403
# TODO: Do we want to dump the internal nodes as well?
404
# TODO: It would be nice to be able to dump the un-parsed information,
405
# rather than only going through iter_all_entries. However, this is
406
# good enough for a start
408
encoding_type = 'exact'
409
takes_args = ['path']
410
takes_options = [Option('raw', help='Write the uncompressed bytes out,'
411
' rather than the parsed tuples.'),
414
def run(self, path, raw=False):
415
dirname, basename = osutils.split(path)
416
t = transport.get_transport(dirname)
418
self._dump_raw_bytes(t, basename)
420
self._dump_entries(t, basename)
422
def _get_index_and_bytes(self, trans, basename):
423
"""Create a BTreeGraphIndex and raw bytes."""
424
bt = btree_index.BTreeGraphIndex(trans, basename, None)
425
bytes = trans.get_bytes(basename)
426
bt._file = cStringIO.StringIO(bytes)
427
bt._size = len(bytes)
430
def _dump_raw_bytes(self, trans, basename):
433
# We need to parse at least the root node.
434
# This is because the first page of every row starts with an
435
# uncompressed header.
436
bt, bytes = self._get_index_and_bytes(trans, basename)
437
for page_idx, page_start in enumerate(xrange(0, len(bytes),
438
btree_index._PAGE_SIZE)):
439
page_end = min(page_start + btree_index._PAGE_SIZE, len(bytes))
440
page_bytes = bytes[page_start:page_end]
442
self.outf.write('Root node:\n')
443
header_end, data = bt._parse_header_from_bytes(page_bytes)
444
self.outf.write(page_bytes[:header_end])
446
self.outf.write('\nPage %d\n' % (page_idx,))
447
decomp_bytes = zlib.decompress(page_bytes)
448
self.outf.write(decomp_bytes)
449
self.outf.write('\n')
451
def _dump_entries(self, trans, basename):
453
st = trans.stat(basename)
454
except errors.TransportNotPossible:
455
# We can't stat, so we'll fake it because we have to do the 'get()'
457
bt, _ = self._get_index_and_bytes(trans, basename)
459
bt = btree_index.BTreeGraphIndex(trans, basename, st.st_size)
460
for node in bt.iter_all_entries():
461
# Node is made up of:
462
# (index, key, value, [references])
466
refs_as_tuples = None
468
refs_as_tuples = static_tuple.as_tuples(refs)
469
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
self.outf.write('%s\n' % (as_tuple,))
483
473
class cmd_remove_tree(Command):
486
476
Since a lightweight checkout is little more than a working tree
487
477
this will refuse to run against one.
489
To re-create the working tree, use "brz checkout".
479
To re-create the working tree, use "bzr checkout".
491
481
_see_also = ['checkout', 'working-trees']
492
482
takes_args = ['location*']
493
483
takes_options = [
495
485
help='Remove the working tree even if it has '
496
'uncommitted or shelved changes.'),
486
'uncommitted changes.'),
499
489
def run(self, location_list, force=False):
500
490
if not location_list:
501
location_list = ['.']
503
493
for location in location_list:
504
d = controldir.ControlDir.open(location)
494
d = bzrdir.BzrDir.open(location)
507
497
working = d.open_workingtree()
508
498
except errors.NoWorkingTree:
509
raise errors.BzrCommandError(
510
gettext("No working tree to remove"))
499
raise errors.BzrCommandError("No working tree to remove")
511
500
except errors.NotLocalUrl:
512
raise errors.BzrCommandError(
513
gettext("You cannot remove the working tree"
514
" of a remote path"))
501
raise errors.BzrCommandError("You cannot remove the working tree"
516
504
if (working.has_changes()):
517
505
raise errors.UncommittedChanges(working)
518
if working.get_shelf_manager().last_shelf() is not None:
519
raise errors.ShelvedChanges(working)
521
507
if working.user_url != working.branch.user_url:
522
raise errors.BzrCommandError(
523
gettext("You cannot remove the working tree"
524
" from a lightweight checkout"))
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
526
511
d.destroy_workingtree()
529
class cmd_repair_workingtree(Command):
530
__doc__ = """Reset the working tree state file.
532
This is not meant to be used normally, but more as a way to recover from
533
filesystem corruption, etc. This rebuilds the working inventory back to a
534
'known good' state. Any new modifications (adding a file, renaming, etc)
535
will be lost, though modified files will still be detected as such.
537
Most users will want something more like "brz revert" or "brz update"
538
unless the state file has become corrupted.
540
By default this attempts to recover the current state by looking at the
541
headers of the state file. If the state file is too corrupted to even do
542
that, you can supply --revision to force the state of the tree.
546
'revision', 'directory',
548
help='Reset the tree even if it doesn\'t appear to be'
553
def run(self, revision=None, directory='.', force=False):
554
tree, _ = WorkingTree.open_containing(directory)
555
self.add_cleanup(tree.lock_tree_write().unlock)
559
except errors.BzrError:
560
pass # There seems to be a real error here, so we'll reset
563
raise errors.BzrCommandError(gettext(
564
'The tree does not appear to be corrupt. You probably'
565
' want "brz revert" instead. Use "--force" if you are'
566
' sure you want to reset the working tree.'))
570
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
572
tree.reset_state(revision_ids)
573
except errors.BzrError:
574
if revision_ids is None:
575
extra = gettext(', the header appears corrupt, try passing '
576
'-r -1 to set the state to the last commit')
579
raise errors.BzrCommandError(
580
gettext('failed to reset the tree state{0}').format(extra))
583
514
class cmd_revno(Command):
584
515
__doc__ = """Show current revision number.
861
help='List entries of a particular kind: file, directory, '
751
help='List entries of a particular kind: file, directory, symlink.',
865
754
takes_args = ['file*']
868
757
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
869
758
if kind and kind not in ['file', 'directory', 'symlink']:
870
raise errors.BzrCommandError(
871
gettext('invalid kind %r specified') % (kind,))
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
873
761
revision = _get_one_revision('inventory', revision)
874
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
875
self.add_cleanup(work_tree.lock_read().unlock)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
876
765
if revision is not None:
877
766
tree = revision.as_tree(work_tree.branch)
879
768
extra_trees = [work_tree]
880
self.add_cleanup(tree.lock_read().unlock)
770
self.add_cleanup(tree.unlock)
885
self.add_cleanup(tree.lock_read().unlock)
886
775
if file_list is not None:
887
paths = tree.find_related_paths_across_trees(
888
file_list, extra_trees, require_versioned=True)
776
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
require_versioned=True)
889
778
# find_ids_across_trees may include some paths that don't
890
779
# exist in 'tree'.
891
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)
893
entries = tree.iter_entries_by_dir()
783
entries = tree.inventory.entries()
895
for path, entry in sorted(entries):
786
for path, entry in entries:
896
787
if kind and kind != entry.kind:
901
self.outf.write('%-50s %s\n' % (
902
path, entry.file_id.decode('utf-8')))
790
self.outf.write('%-50s %s\n' % (path, entry.file_id))
904
792
self.outf.write(path)
905
793
self.outf.write('\n')
908
class cmd_cp(Command):
909
__doc__ = """Copy a file.
912
brz cp OLDNAME NEWNAME
914
brz cp SOURCE... DESTINATION
916
If the last argument is a versioned directory, all the other names
917
are copied into it. Otherwise, there must be exactly two arguments
918
and the file is copied to a new name.
920
Files cannot be copied between branches. Only files can be copied
924
takes_args = ['names*']
927
encoding_type = 'replace'
929
def run(self, names_list):
930
if names_list is None:
932
if len(names_list) < 2:
933
raise errors.BzrCommandError(gettext("missing file argument"))
934
tree, rel_names = WorkingTree.open_containing_paths(
935
names_list, canonicalize=False)
936
for file_name in rel_names[0:-1]:
938
raise errors.BzrCommandError(
939
gettext("can not copy root of branch"))
940
self.add_cleanup(tree.lock_tree_write().unlock)
941
into_existing = osutils.isdir(names_list[-1])
942
if not into_existing:
944
(src, dst) = rel_names
946
raise errors.BzrCommandError(
947
gettext('to copy multiple files the'
948
' destination must be a versioned'
953
(n, osutils.joinpath([rel_names[-1], osutils.basename(n)]))
954
for n in rel_names[:-1]]
956
for src, dst in pairs:
958
src_kind = tree.stored_kind(src)
959
except errors.NoSuchFile:
960
raise errors.BzrCommandError(
961
gettext('Could not copy %s => %s: %s is not versioned.')
964
raise errors.BzrCommandError(
965
gettext('Could not copy %s => %s . %s is not versioned\\.'
967
if src_kind == 'directory':
968
raise errors.BzrCommandError(
969
gettext('Could not copy %s => %s . %s is a directory.'
971
dst_parent = osutils.split(dst)[0]
974
dst_parent_kind = tree.stored_kind(dst_parent)
975
except errors.NoSuchFile:
976
raise errors.BzrCommandError(
977
gettext('Could not copy %s => %s: %s is not versioned.')
978
% (src, dst, dst_parent))
979
if dst_parent_kind != 'directory':
980
raise errors.BzrCommandError(
981
gettext('Could not copy to %s: %s is not a directory.')
982
% (dst_parent, dst_parent))
984
tree.copy_one(src, dst)
987
796
class cmd_mv(Command):
988
797
__doc__ = """Move or rename a file.
991
brz mv OLDNAME NEWNAME
800
bzr mv OLDNAME NEWNAME
993
brz mv SOURCE... DESTINATION
802
bzr mv SOURCE... DESTINATION
995
804
If the last argument is a versioned directory, all the other names
996
805
are moved into it. Otherwise, there must be exactly two arguments
1287
1070
considered diverged if the destination branch's most recent commit is one
1288
1071
that has not been merged (directly or indirectly) by the source branch.
1290
If branches have diverged, you can use 'brz push --overwrite' to replace
1073
If branches have diverged, you can use 'bzr push --overwrite' to replace
1291
1074
the other branch completely, discarding its unmerged changes.
1293
1076
If you want to ensure you have the different changes in the other branch,
1294
do a merge (see brz help merge) from the other branch, and commit that.
1077
do a merge (see bzr help merge) from the other branch, and commit that.
1295
1078
After that you will be able to do a push without '--overwrite'.
1297
If there is no default push location set, the first push will set it (use
1298
--no-remember to avoid setting it). After that, you can omit the
1299
location to use the default. To change the default, use --remember. The
1300
value will only be saved if the remote location can be accessed.
1302
The --verbose option will display the revisions pushed using the log_format
1303
configuration option. You can use a different format by overriding it with
1304
-Olog_format=<other_format>.
1080
If there is no default push location set, the first push will set it.
1081
After that, you can omit the location to use the default. To change the
1082
default, use --remember. The value will only be saved if the remote
1083
location can be accessed.
1307
1086
_see_also = ['pull', 'update', 'working-trees']
1308
1087
takes_options = ['remember', 'overwrite', 'verbose', 'revision',
1309
Option('create-prefix',
1310
help='Create the path leading up to the branch '
1311
'if it does not already exist.'),
1312
custom_help('directory',
1313
help='Branch to push from, '
1314
'rather than the one containing the working directory.'),
1315
Option('use-existing-dir',
1316
help='By default push will fail if the target'
1317
' directory exists, but does not already'
1318
' have a control directory. This flag will'
1319
' allow push to proceed.'),
1321
help='Create a stacked branch that references the public location '
1322
'of the parent branch.'),
1323
Option('stacked-on',
1324
help='Create a stacked branch that refers to another branch '
1325
'for the commit history. Only the work not present in the '
1326
'referenced branch is included in the branch created.',
1329
help='Refuse to push if there are uncommitted changes in'
1330
' the working tree, --no-strict disables the check.'),
1332
help="Don't populate the working tree, even for protocols"
1333
" that support it."),
1334
Option('overwrite-tags',
1335
help="Overwrite tags only."),
1336
Option('lossy', help="Allow lossy push, i.e. dropping metadata "
1337
"that can't be represented in the target.")
1088
Option('create-prefix',
1089
help='Create the path leading up to the branch '
1090
'if it does not already exist.'),
1092
help='Branch to push from, '
1093
'rather than the one containing the working directory.',
1097
Option('use-existing-dir',
1098
help='By default push will fail if the target'
1099
' directory exists, but does not already'
1100
' have a control directory. This flag will'
1101
' allow push to proceed.'),
1103
help='Create a stacked branch that references the public location '
1104
'of the parent branch.'),
1105
Option('stacked-on',
1106
help='Create a stacked branch that refers to another branch '
1107
'for the commit history. Only the work not present in the '
1108
'referenced branch is included in the branch created.',
1111
help='Refuse to push if there are uncommitted changes in'
1112
' the working tree, --no-strict disables the check.'),
1339
1114
takes_args = ['location?']
1340
1115
encoding_type = 'replace'
1342
def run(self, location=None, remember=None, overwrite=False,
1343
create_prefix=False, verbose=False, revision=None,
1344
use_existing_dir=False, directory=None, stacked_on=None,
1345
stacked=False, strict=None, no_tree=False,
1346
overwrite_tags=False, lossy=False):
1347
from .location import location_to_url
1348
from .push import _show_push_branch
1351
overwrite = ["history", "tags"]
1352
elif overwrite_tags:
1353
overwrite = ["tags"]
1117
def run(self, location=None, remember=False, overwrite=False,
1118
create_prefix=False, verbose=False, revision=None,
1119
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1121
from bzrlib.push import _show_push_branch
1357
1123
if directory is None:
1358
1124
directory = '.'
1359
1125
# Get the source branch
1360
1126
(tree, br_from,
1361
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1362
1128
# Get the tip's revision_id
1363
1129
revision = _get_one_revision('push', revision)
1364
1130
if revision is not None:
1433
1189
_see_also = ['checkout']
1434
1190
takes_args = ['from_location', 'to_location?']
1435
takes_options = ['revision',
1437
'hardlink', help='Hard-link working tree files where possible.'),
1438
Option('files-from', type=text_type,
1439
help="Get file contents from this tree."),
1441
help="Create a branch without a working-tree."),
1443
help="Switch the checkout in the current directory "
1444
"to the new branch."),
1446
help='Create a stacked branch referring to the source branch. '
1447
'The new branch will depend on the availability of the source '
1448
'branch for all operations.'),
1449
Option('standalone',
1450
help='Do not use a shared repository, even if available.'),
1451
Option('use-existing-dir',
1452
help='By default branch will fail if the target'
1453
' directory exists, but does not already'
1454
' have a control directory. This flag will'
1455
' allow branch to proceed.'),
1457
help="Bind new branch to from location."),
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1194
help="Create a branch without a working-tree."),
1196
help="Switch the checkout in the current directory "
1197
"to the new branch."),
1199
help='Create a stacked branch referring to the source branch. '
1200
'The new branch will depend on the availability of the source '
1201
'branch for all operations.'),
1202
Option('standalone',
1203
help='Do not use a shared repository, even if available.'),
1204
Option('use-existing-dir',
1205
help='By default branch will fail if the target'
1206
' directory exists, but does not already'
1207
' have a control directory. This flag will'
1208
' allow branch to proceed.'),
1210
help="Bind new branch to from location."),
1212
aliases = ['get', 'clone']
1460
1214
def run(self, from_location, to_location=None, revision=None,
1461
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1462
use_existing_dir=False, switch=False, bind=False,
1464
from breezy import switch as _mod_switch
1465
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1216
use_existing_dir=False, switch=False, bind=False):
1217
from bzrlib import switch as _mod_switch
1218
from bzrlib.tag import _merge_tags_if_possible
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1467
if not (hardlink or files_from):
1468
# accelerator_tree is usually slower because you have to read N
1469
# files (no readahead, lots of seeks, etc), but allow the user to
1470
# explicitly request it
1471
accelerator_tree = None
1472
if files_from is not None and files_from != from_location:
1473
accelerator_tree = WorkingTree.open(files_from)
1474
1221
revision = _get_one_revision('branch', revision)
1475
self.add_cleanup(br_from.lock_read().unlock)
1223
self.add_cleanup(br_from.unlock)
1476
1224
if revision is not None:
1477
1225
revision_id = revision.as_revision_id(br_from)
1482
1230
revision_id = br_from.last_revision()
1483
1231
if to_location is None:
1484
1232
to_location = urlutils.derive_to_location(from_location)
1485
to_transport = transport.get_transport(to_location, purpose='write')
1233
to_transport = transport.get_transport(to_location)
1487
1235
to_transport.mkdir('.')
1488
1236
except errors.FileExists:
1490
to_dir = controldir.ControlDir.open_from_transport(
1492
except errors.NotBranchError:
1493
if not use_existing_dir:
1494
raise errors.BzrCommandError(gettext('Target directory "%s" '
1495
'already exists.') % to_location)
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1500
to_dir.open_branch()
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1501
1243
except errors.NotBranchError:
1504
1246
raise errors.AlreadyBranchError(to_location)
1505
1247
except errors.NoSuchFile:
1506
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1512
# preserve whatever source format we have.
1513
to_dir = br_from.controldir.sprout(
1514
to_transport.base, revision_id,
1515
possible_transports=[to_transport],
1516
accelerator_tree=accelerator_tree, hardlink=hardlink,
1517
stacked=stacked, force_new_repo=standalone,
1518
create_tree_if_local=not no_tree, source_branch=br_from)
1519
branch = to_dir.open_branch(
1520
possible_transports=[
1521
br_from.controldir.root_transport, to_transport])
1522
except errors.NoSuchRevision:
1523
to_transport.delete_tree('.')
1524
msg = gettext("The branch {0} has no revision {1}.").format(
1525
from_location, revision)
1526
raise errors.BzrCommandError(msg)
1529
to_repo = to_dir.open_repository()
1530
except errors.NoRepositoryPresent:
1531
to_repo = to_dir.create_repository()
1532
to_repo.fetch(br_from.repository, revision_id=revision_id)
1533
branch = br_from.sprout(to_dir, revision_id=revision_id)
1534
br_from.tags.merge_to(branch.tags)
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1264
raise errors.BzrCommandError(msg)
1265
_merge_tags_if_possible(br_from, branch)
1536
1266
# If the source branch is stacked, the new branch may
1537
1267
# be stacked whether we asked for that explicitly or not.
1538
1268
# We therefore need a try/except here and not just 'if stacked:'
1540
note(gettext('Created new stacked branch referring to %s.') %
1541
branch.get_stacked_on_url())
1542
except (errors.NotStacked, _mod_branch.UnstackableBranchFormat,
1543
errors.UnstackableRepositoryFormat) as e:
1544
revno = branch.revno()
1545
if revno is not None:
1546
note(ngettext('Branched %d revision.',
1547
'Branched %d revisions.',
1548
branch.revno()) % revno)
1550
note(gettext('Created new branch.'))
1270
note('Created new stacked branch referring to %s.' %
1271
branch.get_stacked_on_url())
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1552
1276
# Bind to the parent
1553
1277
parent_branch = Branch.open(from_location)
1554
1278
branch.bind(parent_branch)
1555
note(gettext('New branch bound to %s') % from_location)
1279
note('New branch bound to %s' % from_location)
1557
1281
# Switch to the new branch
1558
1282
wt, _ = WorkingTree.open_containing('.')
1559
_mod_switch.switch(wt.controldir, branch)
1560
note(gettext('Switched to branch: %s'),
1561
urlutils.unescape_for_display(branch.base, 'utf-8'))
1564
class cmd_branches(Command):
1565
__doc__ = """List the branches available at the current location.
1567
This command will print the names of all the branches at the current
1571
takes_args = ['location?']
1573
Option('recursive', short_name='R',
1574
help='Recursively scan for branches rather than '
1575
'just looking in the specified location.')]
1577
def run(self, location=".", recursive=False):
1579
t = transport.get_transport(location, purpose='read')
1580
if not t.listable():
1581
raise errors.BzrCommandError(
1582
"Can't scan this type of location.")
1583
for b in controldir.ControlDir.find_branches(t):
1584
self.outf.write("%s\n" % urlutils.unescape_for_display(
1585
urlutils.relative_url(t.base, b.base),
1586
self.outf.encoding).rstrip("/"))
1588
dir = controldir.ControlDir.open_containing(location)[0]
1590
active_branch = dir.open_branch(name="")
1591
except errors.NotBranchError:
1592
active_branch = None
1594
for name, branch in iter_sibling_branches(dir):
1597
active = (active_branch is not None and
1598
active_branch.user_url == branch.user_url)
1599
names[name] = active
1600
# Only mention the current branch explicitly if it's not
1601
# one of the colocated branches
1602
if not any(viewvalues(names)) and active_branch is not None:
1603
self.outf.write("* %s\n" % gettext("(default)"))
1604
for name in sorted(names):
1605
active = names[name]
1610
self.outf.write("%s %s\n" % (
1611
prefix, (name if PY3 else name.encode(self.outf.encoding))))
1283
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1285
urlutils.unescape_for_display(branch.base, 'utf-8'))
1614
1288
class cmd_checkout(Command):
1615
1289
__doc__ = """Create a new checkout of an existing branch.
1617
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree
1618
for the branch found in '.'. This is useful if you have removed the working
1619
tree or if it was never created - i.e. if you pushed the branch to its
1620
current location using SFTP.
1291
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
the branch found in '.'. This is useful if you have removed the working tree
1293
or if it was never created - i.e. if you pushed the branch to its current
1294
location using SFTP.
1622
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION
1623
will be used. In other words, "checkout ../foo/bar" will attempt to create
1624
./bar. If the BRANCH_LOCATION has no / or path separator embedded, the
1625
TO_LOCATION is derived from the BRANCH_LOCATION by stripping a leading
1626
scheme or drive identifier, if any. For example, "checkout lp:foo-bar" will
1627
attempt to create ./foo-bar.
1296
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
1297
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
1298
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
1299
is derived from the BRANCH_LOCATION by stripping a leading scheme or drive
1300
identifier, if any. For example, "checkout lp:foo-bar" will attempt to
1629
1303
To retrieve the branch as of a particular revision, supply the --revision
1630
parameter, as in "checkout foo/bar -r 5". Note that this will be
1631
immediately out of date [so you cannot commit] but it may be useful (i.e.
1632
to examine old code.)
1304
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
1305
out of date [so you cannot commit] but it may be useful (i.e. to examine old
1635
_see_also = ['checkouts', 'branch', 'working-trees', 'remove-tree']
1309
_see_also = ['checkouts', 'branch']
1636
1310
takes_args = ['branch_location?', 'to_location?']
1637
1311
takes_options = ['revision',
1638
1312
Option('lightweight',
1696
1366
@display_command
1697
1367
def run(self, dir=u'.'):
1698
1368
tree = WorkingTree.open_containing(dir)[0]
1699
self.add_cleanup(tree.lock_read().unlock)
1370
self.add_cleanup(tree.unlock)
1371
new_inv = tree.inventory
1700
1372
old_tree = tree.basis_tree()
1701
self.add_cleanup(old_tree.lock_read().unlock)
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1375
old_inv = old_tree.inventory
1703
1377
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1704
for change in iterator:
1705
if change.path[0] == change.path[1]:
1707
if None in change.path:
1709
renames.append(change.path)
1378
for f, paths, c, v, p, n, k, e in iterator:
1379
if paths[0] == paths[1]:
1383
renames.append(paths)
1711
1385
for old_name, new_name in renames:
1712
1386
self.outf.write("%s => %s\n" % (old_name, new_name))
1715
1389
class cmd_update(Command):
1716
__doc__ = """Update a working tree to a new revision.
1718
This will perform a merge of the destination revision (the tip of the
1719
branch, or the specified revision) into the working tree, and then make
1720
that revision the basis revision for the working tree.
1722
You can use this to visit an older revision, or to update a working tree
1723
that is out of date from its branch.
1725
If there are any uncommitted changes in the tree, they will be carried
1726
across and remain as uncommitted changes after the update. To discard
1727
these changes, use 'brz revert'. The uncommitted changes may conflict
1728
with the changes brought in by the change in basis revision.
1730
If the tree's branch is bound to a master branch, brz will also update
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1392
This will perform a merge into the working tree, and may generate
1393
conflicts. If you have any local changes, you will still
1394
need to commit them after the update for the update to be complete.
1396
If you want to discard your local changes, you can just do a
1397
'bzr revert' instead of 'bzr commit' after the update.
1399
If the tree's branch is bound to a master branch, it will also update
1731
1400
the branch from the master.
1733
You cannot update just a single file or directory, because each Breezy
1734
working tree has just a single basis revision. If you want to restore a
1735
file that has been removed locally, use 'brz revert' instead of 'brz
1736
update'. If you want to restore a file to its state in a previous
1737
revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write
1738
out the old content of that file to a new location.
1740
The 'dir' argument, if given, must be the location of the root of a
1741
working tree to update. By default, the working tree that contains the
1742
current working directory is used.
1745
1403
_see_also = ['pull', 'working-trees', 'status-flags']
1746
1404
takes_args = ['dir?']
1747
takes_options = ['revision',
1749
help="Show base revision text in conflicts."),
1405
takes_options = ['revision']
1751
1406
aliases = ['up']
1753
def run(self, dir=None, revision=None, show_base=None):
1408
def run(self, dir='.', revision=None):
1754
1409
if revision is not None and len(revision) != 1:
1755
raise errors.BzrCommandError(gettext(
1756
"brz update --revision takes exactly one revision"))
1758
tree = WorkingTree.open_containing('.')[0]
1760
tree, relpath = WorkingTree.open_containing(dir)
1763
raise errors.BzrCommandError(gettext(
1764
"brz update can only update a whole tree, "
1765
"not a file or subdirectory"))
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1412
tree = WorkingTree.open_containing(dir)[0]
1766
1413
branch = tree.branch
1767
1414
possible_transports = []
1768
1415
master = branch.get_master_branch(
1769
1416
possible_transports=possible_transports)
1770
1417
if master is not None:
1771
1419
branch_location = master.base
1421
tree.lock_tree_write()
1774
1422
branch_location = tree.branch.base
1775
tree.lock_tree_write()
1776
1423
self.add_cleanup(tree.unlock)
1777
1424
# get rid of the final '/' and be ready for display
1778
1425
branch_location = urlutils.unescape_for_display(
1865
1511
noise_level = get_verbosity_level()
1867
1513
noise_level = 0
1868
from .info import show_bzrdir_info
1869
show_bzrdir_info(controldir.ControlDir.open_containing(location)[0],
1514
from bzrlib.info import show_bzrdir_info
1515
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1870
1516
verbose=noise_level, outfile=self.outf)
1873
1519
class cmd_remove(Command):
1874
1520
__doc__ = """Remove files or directories.
1876
This makes Breezy stop tracking changes to the specified files. Breezy will
1877
delete them if they can easily be recovered using revert otherwise they
1878
will be backed up (adding an extension of the form .~#~). If no options or
1879
parameters are given Breezy will scan for files that are being tracked by
1880
Breezy but missing in your tree and stop tracking them for you.
1522
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
them if they can easily be recovered using revert. If no options or
1524
parameters are given bzr will scan for files that are being tracked by bzr
1525
but missing in your tree and stop tracking them for you.
1882
1527
takes_args = ['file*']
1883
1528
takes_options = ['verbose',
1885
'new', help='Only remove files that have never been committed.'),
1886
RegistryOption.from_kwargs('file-deletion-strategy',
1887
'The file deletion mode to be used.',
1888
title='Deletion Strategy', value_switches=True, enum_switch=False,
1889
safe='Backup changed files (default).',
1890
keep='Delete from brz but leave the working copy.',
1891
no_backup='Don\'t backup changed files.'),
1529
Option('new', help='Only remove files that have never been committed.'),
1530
RegistryOption.from_kwargs('file-deletion-strategy',
1531
'The file deletion mode to be used.',
1532
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1535
keep='Delete from bzr but leave the working copy.',
1536
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1893
1538
aliases = ['rm', 'del']
1894
1539
encoding_type = 'replace'
1896
1541
def run(self, file_list, verbose=False, new=False,
1897
file_deletion_strategy='safe'):
1899
tree, file_list = WorkingTree.open_containing_paths(file_list)
1542
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1901
1545
if file_list is not None:
1902
1546
file_list = [f for f in file_list]
1904
self.add_cleanup(tree.lock_write().unlock)
1549
self.add_cleanup(tree.unlock)
1905
1550
# Heuristics should probably all move into tree.remove_smart or
1908
1553
added = tree.changes_from(tree.basis_tree(),
1909
specific_files=file_list).added
1910
file_list = sorted([f.path[1] for f in added], reverse=True)
1554
specific_files=file_list).added
1555
file_list = sorted([f[0] for f in added], reverse=True)
1911
1556
if len(file_list) == 0:
1912
raise errors.BzrCommandError(gettext('No matching files.'))
1557
raise errors.BzrCommandError('No matching files.')
1913
1558
elif file_list is None:
1914
1559
# missing files show up in iter_changes(basis) as
1915
1560
# versioned-with-no-kind.
1917
1562
for change in tree.iter_changes(tree.basis_tree()):
1918
1563
# Find paths in the working tree that have no kind:
1919
if change.path[1] is not None and change.kind[1] is None:
1920
missing.append(change.path[1])
1564
if change[1][1] is not None and change[6][1] is None:
1565
missing.append(change[1][1])
1921
1566
file_list = sorted(missing, reverse=True)
1922
1567
file_deletion_strategy = 'keep'
1923
1568
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1924
keep_files=file_deletion_strategy == 'keep',
1925
force=(file_deletion_strategy == 'no-backup'))
1569
keep_files=file_deletion_strategy=='keep',
1570
force=file_deletion_strategy=='force')
1573
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1576
The file_id is assigned when the file is first added and remains the
1577
same through all revisions where the file exists, even when it is
1582
_see_also = ['inventory', 'ls']
1583
takes_args = ['filename']
1586
def run(self, filename):
1587
tree, relpath = WorkingTree.open_containing(filename)
1588
i = tree.path2id(relpath)
1590
raise errors.NotVersionedError(filename)
1592
self.outf.write(i + '\n')
1595
class cmd_file_path(Command):
1596
__doc__ = """Print path of file_ids to a file or directory.
1598
This prints one line for each directory down to the target,
1599
starting at the branch root.
1603
takes_args = ['filename']
1606
def run(self, filename):
1607
tree, relpath = WorkingTree.open_containing(filename)
1608
fid = tree.path2id(relpath)
1610
raise errors.NotVersionedError(filename)
1611
segments = osutils.splitpath(relpath)
1612
for pos in range(1, len(segments) + 1):
1613
path = osutils.joinpath(segments[:pos])
1614
self.outf.write("%s\n" % tree.path2id(path))
1928
1617
class cmd_reconcile(Command):
1929
__doc__ = """Reconcile brz metadata in a branch.
1618
__doc__ = """Reconcile bzr metadata in a branch.
1931
1620
This can correct data mismatches that may have been caused by
1932
previous ghost operations or brz upgrades. You should only
1933
need to run this command if 'brz check' or a brz developer
1621
previous ghost operations or bzr upgrades. You should only
1622
need to run this command if 'bzr check' or a bzr developer
1934
1623
advises you to run it.
1936
1625
If a second branch is provided, cross-branch reconciliation is
1937
1626
also attempted, which will check that data like the tree root
1938
id which was not present in very early brz versions is represented
1627
id which was not present in very early bzr versions is represented
1939
1628
correctly in both branches.
1941
1630
At the same time it is run it may recompress data resulting in
2071
1742
to_transport.ensure_base()
2072
1743
except errors.NoSuchFile:
2073
1744
if not create_prefix:
2074
raise errors.BzrCommandError(gettext("Parent directory of %s"
2076
"\nYou may supply --create-prefix to create all"
2077
" leading parent directories.")
1745
raise errors.BzrCommandError("Parent directory of %s"
1747
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
2079
1750
to_transport.create_prefix()
2082
a_controldir = controldir.ControlDir.open_from_transport(
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2084
1754
except errors.NotBranchError:
2085
1755
# really a NotBzrDir error...
2086
create_branch = controldir.ControlDir.create_branch_convenience
2088
force_new_tree = False
2090
force_new_tree = None
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
2091
1757
branch = create_branch(to_transport.base, format=format,
2092
possible_transports=[to_transport],
2093
force_new_tree=force_new_tree)
2094
a_controldir = branch.controldir
1758
possible_transports=[to_transport])
1759
a_bzrdir = branch.bzrdir
2096
from .transport.local import LocalTransport
2097
if a_controldir.has_branch():
1761
from bzrlib.transport.local import LocalTransport
1762
if a_bzrdir.has_branch():
2098
1763
if (isinstance(to_transport, LocalTransport)
2099
and not a_controldir.has_workingtree()):
2100
raise errors.BranchExistsWithoutWorkingTree(location)
1764
and not a_bzrdir.has_workingtree()):
1765
raise errors.BranchExistsWithoutWorkingTree(location)
2101
1766
raise errors.AlreadyBranchError(location)
2102
branch = a_controldir.create_branch()
2103
if not no_tree and not a_controldir.has_workingtree():
2104
a_controldir.create_workingtree()
1767
branch = a_bzrdir.create_branch()
1768
a_bzrdir.create_workingtree()
2105
1769
if append_revisions_only:
2107
1771
branch.set_append_revisions_only(True)
2108
1772
except errors.UpgradeRequired:
2109
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2110
' to append-revisions-only. Try --default.'))
1773
raise errors.BzrCommandError('This branch format cannot be set'
1774
' to append-revisions-only. Try --default.')
2111
1775
if not is_quiet():
2112
from .info import describe_layout, describe_format
1776
from bzrlib.info import describe_layout, describe_format
2114
tree = a_controldir.open_workingtree(recommend_upgrade=False)
1778
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
2115
1779
except (errors.NoWorkingTree, errors.NotLocalUrl):
2117
1781
repository = branch.repository
2118
1782
layout = describe_layout(repository, branch, tree).lower()
2119
format = describe_format(a_controldir, repository, branch, tree)
2120
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1783
format = describe_format(a_bzrdir, repository, branch, tree)
1784
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
2122
1785
if repository.is_shared():
2123
# XXX: maybe this can be refactored into transport.path_or_url()
2124
url = repository.controldir.root_transport.external_url()
1786
#XXX: maybe this can be refactored into transport.path_or_url()
1787
url = repository.bzrdir.root_transport.external_url()
2126
1789
url = urlutils.local_path_from_url(url)
2127
except urlutils.InvalidURL:
1790
except errors.InvalidURL:
2129
self.outf.write(gettext("Using shared repository: %s\n") % url)
1792
self.outf.write("Using shared repository: %s\n" % url)
2132
1795
class cmd_init_repository(Command):
2228
1875
Shows the difference in the working tree versus the last commit::
2232
1879
Difference between the working tree and revision 1::
2236
1883
Difference between revision 3 and revision 1::
2240
1887
Difference between revision 3 and revision 1 for branch xxx::
2244
The changes introduced by revision 2 (equivalent to -r1..2)::
2248
To see the changes introduced by revision X::
1891
To see the changes introduced in revision X::
2252
1895
Note that in the case of a merge, the -c option shows the changes
2253
1896
compared to the left hand parent. To see the changes against
2254
1897
another parent, use::
2256
brz diff -r<chosen_parent>..X
2258
The changes between the current revision and the previous revision
2259
(equivalent to -c-1 and -r-2..-1)
1899
bzr diff -r<chosen_parent>..X
1901
The changes introduced by revision 2 (equivalent to -r1..2)::
2263
1905
Show just the differences for file NEWS::
2267
1909
Show the differences in working tree xxx for file NEWS::
2271
1913
Show the differences from branch xxx to this working tree:
2275
1917
Show the differences between two branches for file NEWS::
2277
brz diff --old xxx --new yyy NEWS
2279
Same as 'brz diff' but prefix paths with old/ and new/::
2281
brz diff --prefix old/:new/
2283
Show the differences using a custom diff program with options::
2285
brz diff --using /usr/bin/diff --diff-options -wu
1919
bzr diff --old xxx --new yyy NEWS
1921
Same as 'bzr diff' but prefix paths with old/ and new/::
1923
bzr diff --prefix old/:new/
2287
1925
_see_also = ['status']
2288
1926
takes_args = ['file*']
2289
1927
takes_options = [
2290
Option('diff-options', type=text_type,
1928
Option('diff-options', type=str,
2291
1929
help='Pass these options to the external diff program.'),
2292
Option('prefix', type=text_type,
1930
Option('prefix', type=str,
2293
1931
short_name='p',
2294
1932
help='Set prefixes added to old and new filenames, as '
2295
1933
'two values separated by a colon. (eg "old/:new/").'),
2297
help='Branch/tree to compare from.',
1935
help='Branch/tree to compare from.',
2301
help='Branch/tree to compare to.',
1939
help='Branch/tree to compare to.',
2306
1944
Option('using',
2307
help='Use this command to compare files.',
1945
help='Use this command to compare files.',
2310
1948
RegistryOption('format',
2312
help='Diff format to use.',
2313
lazy_registry=('breezy.diff', 'format_registry'),
2314
title='Diff format'),
2316
help='How many lines of context to show.',
1949
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
2320
1953
aliases = ['di', 'dif']
2321
1954
encoding_type = 'exact'
2323
1956
@display_command
2324
1957
def run(self, revision=None, file_list=None, diff_options=None,
2325
prefix=None, old=None, new=None, using=None, format=None,
2327
from .diff import (get_trees_and_branches_to_diff_locked,
1958
prefix=None, old=None, new=None, using=None, format=None):
1959
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1962
if (prefix is None) or (prefix == '0'):
2331
1963
# diff -p0 format
2334
elif prefix == u'1' or prefix is None:
2335
1967
old_label = 'old/'
2336
1968
new_label = 'new/'
2337
elif u':' in prefix:
2338
old_label, new_label = prefix.split(u":")
1970
old_label, new_label = prefix.split(":")
2340
raise errors.BzrCommandError(gettext(
1972
raise errors.BzrCommandError(
2341
1973
'--prefix expects two values separated by a colon'
2342
' (eg "old/:new/")'))
1974
' (eg "old/:new/")')
2344
1976
if revision and len(revision) > 2:
2345
raise errors.BzrCommandError(gettext('brz diff --revision takes exactly'
2346
' one or two revision specifiers'))
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2348
1980
if using is not None and format is not None:
2349
raise errors.BzrCommandError(gettext(
2350
'{0} and {1} are mutually exclusive').format(
2351
'--using', '--format'))
1981
raise errors.BzrCommandError('--using and --format are mutually '
2353
1984
(old_tree, new_tree,
2354
1985
old_branch, new_branch,
2355
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2356
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2357
# GNU diff on Windows uses ANSI encoding for filenames
2358
path_encoding = osutils.get_diff_header_encoding()
2359
return show_diff_trees(old_tree, new_tree, self.outf,
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
2360
1989
specific_files=specific_files,
2361
1990
external_diff_options=diff_options,
2362
1991
old_label=old_label, new_label=new_label,
2363
extra_trees=extra_trees,
2364
path_encoding=path_encoding,
2365
using=using, context=context,
1992
extra_trees=extra_trees, using=using,
2366
1993
format_cls=format)
2950
2522
_see_also = ['status', 'cat']
2951
2523
takes_args = ['path?']
2952
2524
takes_options = [
2955
Option('recursive', short_name='R',
2956
help='Recurse into subdirectories.'),
2958
help='Print paths relative to the root of the branch.'),
2959
Option('unknown', short_name='u',
2960
help='Print unknown files.'),
2961
Option('versioned', help='Print versioned files.',
2963
Option('ignored', short_name='i',
2964
help='Print ignored files.'),
2965
Option('kind', short_name='k',
2966
help=('List entries of a particular kind: file, '
2967
'directory, symlink, tree-reference.'),
2527
Option('recursive', short_name='R',
2528
help='Recurse into subdirectories.'),
2530
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2532
Option('versioned', help='Print versioned files.',
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2539
help='List entries of a particular kind: file, directory, symlink.',
2974
2543
@display_command
2975
2544
def run(self, revision=None, verbose=False,
2976
2545
recursive=False, from_root=False,
2977
2546
unknown=False, versioned=False, ignored=False,
2978
null=False, kind=None, show_ids=False, path=None, directory=None):
2547
null=False, kind=None, show_ids=False, path=None):
2980
if kind and kind not in ('file', 'directory', 'symlink', 'tree-reference'):
2981
raise errors.BzrCommandError(gettext('invalid kind specified'))
2549
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2983
2552
if verbose and null:
2984
raise errors.BzrCommandError(
2985
gettext('Cannot set both --verbose and --null'))
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2986
2554
all = not (unknown or versioned or ignored)
2988
selection = {'I': ignored, '?': unknown, 'V': versioned}
2556
selection = {'I':ignored, '?':unknown, 'V':versioned}
2990
2558
if path is None:
2994
raise errors.BzrCommandError(gettext('cannot specify both --from-root'
2562
raise errors.BzrCommandError('cannot specify both --from-root'
2997
tree, branch, relpath = \
2998
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2565
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
3000
2568
# Calculate the prefix to use
3092
2660
After adding, editing or deleting that file either indirectly by
3093
2661
using this command or directly by using an editor, be sure to commit
3096
Breezy also supports a global ignore file ~/.config/breezy/ignore. On
3097
Windows the global ignore file can be found in the application data
3099
C:\\Documents and Settings\\<user>\\Application Data\\Breezy\\3.0\\ignore.
2664
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2665
the global ignore file can be found in the application data directory as
2666
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
3100
2667
Global ignores are not touched by this command. The global ignore file
3101
2668
can be edited directly using an editor.
3103
2670
Patterns prefixed with '!' are exceptions to ignore patterns and take
3104
2671
precedence over regular ignores. Such exceptions are used to specify
3105
2672
files that should be versioned which would otherwise be ignored.
3107
2674
Patterns prefixed with '!!' act as regular ignore patterns, but have
3108
2675
precedence over the '!' exception patterns.
3112
* Ignore patterns containing shell wildcards must be quoted from
3115
* Ignore patterns starting with "#" act as comments in the ignore file.
3116
To ignore patterns that begin with that character, use the "RE:" prefix.
2677
Note: ignore patterns containing shell wildcards must be quoted from
3119
2681
Ignore the top level Makefile::
3121
brz ignore ./Makefile
2683
bzr ignore ./Makefile
3123
2685
Ignore .class files in all directories...::
3125
brz ignore "*.class"
2687
bzr ignore "*.class"
3127
2689
...but do not ignore "special.class"::
3129
brz ignore "!special.class"
3131
Ignore files whose name begins with the "#" character::
3135
Ignore .o files under the lib directory::
3137
brz ignore "lib/**/*.o"
3139
Ignore .o files under the lib directory::
3141
brz ignore "RE:lib/.*\\.o"
2691
bzr ignore "!special.class"
2693
Ignore .o files under the lib directory::
2695
bzr ignore "lib/**/*.o"
2697
Ignore .o files under the lib directory::
2699
bzr ignore "RE:lib/.*\.o"
3143
2701
Ignore everything but the "debian" toplevel directory::
3145
brz ignore "RE:(?!debian/).*"
2703
bzr ignore "RE:(?!debian/).*"
3147
2705
Ignore everything except the "local" toplevel directory,
3148
but always ignore autosave files ending in ~, even under local/::
3151
brz ignore "!./local"
2706
but always ignore "*~" autosave files, even under local/::
2709
bzr ignore "!./local"
3155
2713
_see_also = ['status', 'ignored', 'patterns']
3156
2714
takes_args = ['name_pattern*']
3157
takes_options = ['directory',
3158
Option('default-rules',
3159
help='Display the default ignore rules that brz uses.')
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
3162
def run(self, name_pattern_list=None, default_rules=None,
3164
from breezy import ignores
2720
def run(self, name_pattern_list=None, default_rules=None):
2721
from bzrlib import ignores
3165
2722
if default_rules is not None:
3166
2723
# dump the default rules and exit
3167
2724
for pattern in ignores.USER_DEFAULTS:
3168
2725
self.outf.write("%s\n" % pattern)
3170
2727
if not name_pattern_list:
3171
raise errors.BzrCommandError(gettext("ignore requires at least one "
3172
"NAME_PATTERN or --default-rules."))
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3173
2730
name_pattern_list = [globbing.normalize_pattern(p)
3174
2731
for p in name_pattern_list]
3176
bad_patterns_count = 0
3177
for p in name_pattern_list:
3178
if not globbing.Globster.is_pattern_valid(p):
3179
bad_patterns_count += 1
3180
bad_patterns += ('\n %s' % p)
3182
msg = (ngettext('Invalid ignore pattern found. %s',
3183
'Invalid ignore patterns found. %s',
3184
bad_patterns_count) % bad_patterns)
3185
ui.ui_factory.show_error(msg)
3186
raise lazy_regex.InvalidPattern('')
3187
2732
for name_pattern in name_pattern_list:
3188
2733
if (name_pattern[0] == '/' or
3189
(len(name_pattern) > 1 and name_pattern[1] == ':')):
3190
raise errors.BzrCommandError(gettext(
3191
"NAME_PATTERN should not be an absolute path"))
3192
tree, relpath = WorkingTree.open_containing(directory)
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
raise errors.BzrCommandError(
2736
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
3193
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
3194
2739
ignored = globbing.Globster(name_pattern_list)
3196
self.add_cleanup(tree.lock_read().unlock)
3197
for filename, fc, fkind, entry in tree.list_files():
3198
id = getattr(entry, 'file_id', None)
2742
for entry in tree.list_files():
3199
2744
if id is not None:
3200
2746
if ignored.match(filename):
3201
2747
matches.append(filename)
3202
2749
if len(matches) > 0:
3203
self.outf.write(gettext("Warning: the following files are version "
3204
"controlled and match your ignore pattern:\n%s"
3205
"\nThese files will continue to be version controlled"
3206
" unless you 'brz remove' them.\n") % ("\n".join(matches),))
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
2752
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3209
2756
class cmd_ignored(Command):
3284
2829
================= =========================
3287
encoding_type = 'exact'
3288
2831
takes_args = ['dest', 'branch_or_subdir?']
3289
takes_options = ['directory',
3291
help="Type of file to export to.",
3294
Option('filters', help='Apply content filters to export the '
3295
'convenient form.'),
3298
help="Name of the root directory inside the exported file."),
3299
Option('per-file-timestamps',
3300
help='Set modification time of files to that of the last '
3301
'revision in which it was changed.'),
3302
Option('uncommitted',
3303
help='Export the working tree contents rather than that of the '
2834
help="Type of file to export to.",
2837
Option('filters', help='Apply content filters to export the '
2838
'convenient form.'),
2841
help="Name of the root directory inside the exported file."),
2842
Option('per-file-timestamps',
2843
help='Set modification time of files to that of the last '
2844
'revision in which it was changed.'),
3307
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
3308
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3310
from .export import export, guess_format, get_root_name
2847
root=None, filters=False, per_file_timestamps=False):
2848
from bzrlib.export import export
3312
2850
if branch_or_subdir is None:
3313
branch_or_subdir = directory
3315
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3317
if tree is not None:
3318
self.add_cleanup(tree.lock_read().unlock)
3322
raise errors.BzrCommandError(
3323
gettext("--uncommitted requires a working tree"))
3326
export_tree = _get_one_revision_tree(
3327
'export', revision, branch=b,
3331
format = guess_format(dest)
3334
root = get_root_name(dest)
3336
if not per_file_timestamps:
3337
force_mtime = time.time()
3342
from breezy.filter_tree import ContentFilterTree
3343
export_tree = ContentFilterTree(
3344
export_tree, export_tree._content_filter_stack)
2851
tree = WorkingTree.open_containing(u'.')[0]
2855
b, subdir = Branch.open_containing(branch_or_subdir)
2858
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3347
export(export_tree, dest, format, root, subdir,
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3348
2861
per_file_timestamps=per_file_timestamps)
3349
except errors.NoSuchExportFormat as e:
3350
raise errors.BzrCommandError(
3351
gettext('Unsupported export format: %s') % e.format)
2862
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3354
2866
class cmd_cat(Command):
3363
2875
_see_also = ['ls']
3364
takes_options = ['directory',
3365
Option('name-from-revision',
3366
help='The path name in the old tree.'),
3367
Option('filters', help='Apply content filters to display the '
3368
'convenience form.'),
2877
Option('name-from-revision', help='The path name in the old tree.'),
2878
Option('filters', help='Apply content filters to display the '
2879
'convenience form.'),
3371
2882
takes_args = ['filename']
3372
2883
encoding_type = 'exact'
3374
2885
@display_command
3375
2886
def run(self, filename, revision=None, name_from_revision=False,
3376
filters=False, directory=None):
3377
2888
if revision is not None and len(revision) != 1:
3378
raise errors.BzrCommandError(gettext("brz cat --revision takes exactly"
3379
" one revision specifier"))
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
" one revision specifier")
3380
2891
tree, branch, relpath = \
3381
_open_directory_or_containing_tree_or_branch(filename, directory)
3382
self.add_cleanup(branch.lock_read().unlock)
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3383
2895
return self._run(tree, branch, relpath, filename, revision,
3384
2896
name_from_revision, filters)
3386
2898
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
3389
2900
if tree is None:
3390
2901
tree = b.basis_tree()
3391
2902
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
3392
self.add_cleanup(rev_tree.lock_read().unlock)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2906
old_file_id = rev_tree.path2id(relpath)
3394
2908
if name_from_revision:
3395
2909
# Try in revision if requested
3396
if not rev_tree.is_versioned(relpath):
3397
raise errors.BzrCommandError(gettext(
3398
"{0!r} is not present in revision {1}").format(
2910
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3399
2913
filename, rev_tree.get_revision_id()))
3400
rev_tree_path = relpath
2915
content = rev_tree.get_file_text(old_file_id)
3403
rev_tree_path = _mod_tree.find_previous_path(
3404
tree, rev_tree, relpath)
3405
except errors.NoSuchFile:
3406
rev_tree_path = None
3408
if rev_tree_path is None:
3409
# Path didn't exist in working tree
3410
if not rev_tree.is_versioned(relpath):
3411
raise errors.BzrCommandError(gettext(
3412
"{0!r} is not present in revision {1}").format(
3413
filename, rev_tree.get_revision_id()))
3415
# Fall back to the same path in the basis tree, if present.
3416
rev_tree_path = relpath
2917
cur_file_id = tree.path2id(relpath)
2919
if cur_file_id is not None:
2920
# Then try with the actual file id
2922
content = rev_tree.get_file_text(cur_file_id)
2924
except errors.NoSuchId:
2925
# The actual file id didn't exist at that time
2927
if not found and old_file_id is not None:
2928
# Finally try with the old file id
2929
content = rev_tree.get_file_text(old_file_id)
2932
# Can't be found anywhere
2933
raise errors.BzrCommandError(
2934
"%r is not present in revision %s" % (
2935
filename, rev_tree.get_revision_id()))
3419
from .filter_tree import ContentFilterTree
3420
filter_tree = ContentFilterTree(
3421
rev_tree, rev_tree._content_filter_stack)
3422
fileobj = filter_tree.get_file(rev_tree_path)
2937
from bzrlib.filters import (
2938
ContentFilterContext,
2939
filtered_output_bytes,
2941
filters = rev_tree._content_filter_stack(relpath)
2942
chunks = content.splitlines(True)
2943
content = filtered_output_bytes(chunks, filters,
2944
ContentFilterContext(relpath, rev_tree))
2946
self.outf.writelines(content)
3424
fileobj = rev_tree.get_file(rev_tree_path)
3425
shutil.copyfileobj(fileobj, self.outf)
2949
self.outf.write(content)
3429
2952
class cmd_local_time_offset(Command):
3430
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
3433
2955
@display_command
3435
2957
self.outf.write("%s\n" % osutils.local_time_offset())
3438
2961
class cmd_commit(Command):
3439
2962
__doc__ = """Commit changes into a new revision.
3471
2994
"John Doe <jdoe@example.com>". If there is more than one author of
3472
2995
the change you can specify the option multiple times, once for each
3477
3000
A common mistake is to forget to add a new file or directory before
3478
3001
running the commit command. The --strict option checks for unknown
3479
3002
files and aborts the commit if any are found. More advanced pre-commit
3480
checks can be implemented by defining hooks. See ``brz help hooks``
3003
checks can be implemented by defining hooks. See ``bzr help hooks``
3483
3006
:Things to note:
3485
If you accidentally commit the wrong changes or make a spelling
3008
If you accidentially commit the wrong changes or make a spelling
3486
3009
mistake in the commit message say, you can use the uncommit command
3487
to undo it. See ``brz help uncommit`` for details.
3010
to undo it. See ``bzr help uncommit`` for details.
3489
3012
Hooks can also be configured to run after a commit. This allows you
3490
3013
to trigger updates to external systems like bug trackers. The --fixes
3491
3014
option can be used to record the association between a revision and
3492
one or more bugs. See ``brz help bugs`` for details.
3015
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3034
# TODO: Run hooks on tree to-be-committed, and after commit.
3036
# TODO: Strict commit that fails if there are deleted files.
3037
# (what does "deleted files" mean ??)
3039
# TODO: Give better message for -s, --summary, used by tla people
3041
# XXX: verbose currently does nothing
3495
3043
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3496
3044
takes_args = ['selected*']
3497
3045
takes_options = [
3499
'exclude', type=text_type, short_name='x',
3500
help="Do not consider changes made to a given path."),
3501
Option('message', type=text_type,
3503
help="Description of the new revision."),
3506
help='Commit even if nothing has changed.'),
3507
Option('file', type=text_type,
3510
help='Take commit message from this file.'),
3512
help="Refuse to commit if there are unknown "
3513
"files in the working tree."),
3514
Option('commit-time', type=text_type,
3515
help="Manually set a commit time using commit date "
3516
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3518
'bugs', type=text_type,
3519
help="Link to a related bug. (see \"brz help bugs\")."),
3521
'fixes', type=text_type,
3522
help="Mark a bug as being fixed by this revision "
3523
"(see \"brz help bugs\")."),
3525
'author', type=text_type,
3526
help="Set the author's name, if it's different "
3527
"from the committer."),
3529
help="Perform a local commit in a bound "
3530
"branch. Local commits are not pushed to "
3531
"the master branch until a normal commit "
3534
Option('show-diff', short_name='p',
3535
help='When no message is supplied, show the diff along'
3536
' with the status summary in the message editor.'),
3538
help='When committing to a foreign version control '
3539
'system do not push data that can not be natively '
3046
ListOption('exclude', type=str, short_name='x',
3047
help="Do not consider changes made to a given path."),
3048
Option('message', type=unicode,
3050
help="Description of the new revision."),
3053
help='Commit even if nothing has changed.'),
3054
Option('file', type=str,
3057
help='Take commit message from this file.'),
3059
help="Refuse to commit if there are unknown "
3060
"files in the working tree."),
3061
Option('commit-time', type=str,
3062
help="Manually set a commit time using commit date "
3063
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3064
ListOption('fixes', type=str,
3065
help="Mark a bug as being fixed by this revision "
3066
"(see \"bzr help bugs\")."),
3067
ListOption('author', type=unicode,
3068
help="Set the author's name, if it's different "
3069
"from the committer."),
3071
help="Perform a local commit in a bound "
3072
"branch. Local commits are not pushed to "
3073
"the master branch until a normal commit "
3076
Option('show-diff', short_name='p',
3077
help='When no message is supplied, show the diff along'
3078
' with the status summary in the message editor.'),
3541
3080
aliases = ['ci', 'checkin']
3543
def _iter_bug_urls(self, bugs, branch, status):
3544
default_bugtracker = None
3082
def _iter_bug_fix_urls(self, fixes, branch):
3545
3083
# Configure the properties for bug fixing attributes.
3547
tokens = bug.split(':')
3548
if len(tokens) == 1:
3549
if default_bugtracker is None:
3550
branch_config = branch.get_config_stack()
3551
default_bugtracker = branch_config.get(
3553
if default_bugtracker is None:
3554
raise errors.BzrCommandError(gettext(
3555
"No tracker specified for bug %s. Use the form "
3556
"'tracker:id' or specify a default bug tracker "
3557
"using the `bugtracker` option.\nSee "
3558
"\"brz help bugs\" for more information on this "
3559
"feature. Commit refused.") % bug)
3560
tag = default_bugtracker
3562
elif len(tokens) != 2:
3563
raise errors.BzrCommandError(gettext(
3084
for fixed_bug in fixes:
3085
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3564
3088
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3565
"See \"brz help bugs\" for more information on this "
3566
"feature.\nCommit refused.") % bug)
3568
tag, bug_id = tokens
3089
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3570
yield bugtracker.get_bug_url(tag, branch, bug_id), status
3571
except bugtracker.UnknownBugTrackerAbbreviation:
3572
raise errors.BzrCommandError(gettext(
3573
'Unrecognized bug %s. Commit refused.') % bug)
3574
except bugtracker.MalformedBugIdentifier as e:
3575
raise errors.BzrCommandError(gettext(
3576
u"%s\nCommit refused.") % (e,))
3093
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3097
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3578
3101
def run(self, message=None, file=None, verbose=False, selected_list=None,
3579
unchanged=False, strict=False, local=False, fixes=None, bugs=None,
3580
author=None, show_diff=False, exclude=None, commit_time=None,
3583
from .commit import (
3102
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3104
from bzrlib.errors import (
3584
3105
PointlessCommit,
3586
from .errors import (
3587
3106
ConflictsInTree,
3588
3107
StrictCommitFailed
3590
from .msgeditor import (
3109
from bzrlib.msgeditor import (
3591
3110
edit_commit_message_encoded,
3592
3111
generate_commit_message_template,
3593
make_commit_message_template_encoded,
3112
make_commit_message_template_encoded
3597
3115
commit_stamp = offset = None
3598
3116
if commit_time is not None:
3600
3118
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3601
except ValueError as e:
3602
raise errors.BzrCommandError(gettext(
3603
"Could not parse --commit-time: " + str(e)))
3119
except ValueError, e:
3120
raise errors.BzrCommandError(
3121
"Could not parse --commit-time: " + str(e))
3123
# TODO: Need a blackbox test for invoking the external editor; may be
3124
# slightly problematic to run this cross-platform.
3126
# TODO: do more checks that the commit will succeed before
3127
# spending the user's valuable time typing a commit message.
3605
3129
properties = {}
3607
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3131
tree, selected_list = tree_files(selected_list)
3608
3132
if selected_list == ['']:
3609
3133
# workaround - commit of root of tree should be exactly the same
3610
3134
# as just default commit in that tree, and succeed even though
3788
3297
class cmd_upgrade(Command):
3789
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3791
When the default format has changed after a major new release of
3792
Bazaar/Breezy, you may be informed during certain operations that you
3793
should upgrade. Upgrading to a newer format may improve performance
3794
or make new features available. It may however limit interoperability
3795
with older repositories or with older versions of Bazaar or Breezy.
3797
If you wish to upgrade to a particular format rather than the
3798
current default, that can be specified using the --format option.
3799
As a consequence, you can use the upgrade command this way to
3800
"downgrade" to an earlier format, though some conversions are
3801
a one way process (e.g. changing from the 1.x default to the
3802
2.x default) so downgrading is not always possible.
3804
A backup.bzr.~#~ directory is created at the start of the conversion
3805
process (where # is a number). By default, this is left there on
3806
completion. If the conversion fails, delete the new .bzr directory
3807
and rename this one back in its place. Use the --clean option to ask
3808
for the backup.bzr directory to be removed on successful conversion.
3809
Alternatively, you can delete it by hand if everything looks good
3812
If the location given is a shared repository, dependent branches
3813
are also converted provided the repository converts successfully.
3814
If the conversion of a branch fails, remaining branches are still
3817
For more information on upgrades, see the Breezy Upgrade Guide,
3818
https://www.breezy-vcs.org/doc/en/upgrade-guide/.
3298
__doc__ = """Upgrade branch storage to current format.
3300
The check command or bzr developers may sometimes advise you to run
3301
this command. When the default format has changed you may also be warned
3302
during other operations to upgrade.
3821
_see_also = ['check', 'reconcile', 'formats']
3305
_see_also = ['check']
3822
3306
takes_args = ['url?']
3823
3307
takes_options = [
3824
RegistryOption('format',
3825
help='Upgrade to a specific format. See "brz help'
3826
' formats" for details.',
3827
lazy_registry=('breezy.controldir', 'format_registry'),
3828
converter=lambda name: controldir.format_registry.make_controldir(
3830
value_switches=True, title='Branch format'),
3832
help='Remove the backup.bzr directory if successful.'),
3834
help="Show what would be done, but don't actually do anything."),
3308
RegistryOption('format',
3309
help='Upgrade to a specific format. See "bzr help'
3310
' formats" for details.',
3311
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3312
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3313
value_switches=True, title='Branch format'),
3837
def run(self, url='.', format=None, clean=False, dry_run=False):
3838
from .upgrade import upgrade
3839
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3841
if len(exceptions) == 1:
3842
# Compatibility with historical behavior
3316
def run(self, url='.', format=None):
3317
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3848
3321
class cmd_whoami(Command):
3849
__doc__ = """Show or set brz user id.
3322
__doc__ = """Show or set bzr user id.
3852
3325
Show the email of the current user::
3856
3329
Set the current user::
3858
brz whoami "Frank Chu <fchu@example.com>"
3331
bzr whoami "Frank Chu <fchu@example.com>"
3860
takes_options = ['directory',
3862
help='Display email address only.'),
3864
help='Set identity for the current branch instead of '
3333
takes_options = [ Option('email',
3334
help='Display email address only.'),
3336
help='Set identity for the current branch instead of '
3867
3339
takes_args = ['name?']
3868
3340
encoding_type = 'replace'
3870
3342
@display_command
3871
def run(self, email=False, branch=False, name=None, directory=None):
3343
def run(self, email=False, branch=False, name=None):
3872
3344
if name is None:
3873
if directory is None:
3874
# use branch if we're inside one; otherwise global config
3876
c = Branch.open_containing(u'.')[0].get_config_stack()
3877
except errors.NotBranchError:
3878
c = _mod_config.GlobalStack()
3880
c = Branch.open(directory).get_config_stack()
3881
identity = c.get('email')
3345
# use branch if we're inside one; otherwise global config
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3883
self.outf.write(_mod_config.extract_email_address(identity)
3351
self.outf.write(c.user_email() + '\n')
3886
self.outf.write(identity + '\n')
3353
self.outf.write(c.username() + '\n')
3890
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3893
3356
# display a warning if an email address isn't included in the given name.
3895
_mod_config.extract_email_address(name)
3896
except _mod_config.NoEmailInUsername:
3358
config.extract_email_address(name)
3359
except errors.NoEmailInUsername, e:
3897
3360
warning('"%s" does not seem to contain an email address. '
3898
3361
'This is allowed, but not recommended.', name)
3900
3363
# use global config unless --branch given
3902
if directory is None:
3903
c = Branch.open_containing(u'.')[0].get_config_stack()
3905
b = Branch.open(directory)
3906
self.add_cleanup(b.lock_write().unlock)
3907
c = b.get_config_stack()
3365
c = Branch.open_containing('.')[0].get_config()
3909
c = _mod_config.GlobalStack()
3910
c.set('email', name)
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3913
3371
class cmd_nick(Command):
3914
3372
__doc__ = """Print or set the branch nickname.
3916
If unset, the colocated branch name is used for colocated branches, and
3917
the branch directory name is used for other branches. To print the
3918
current nickname, execute with no argument.
3374
If unset, the tree root directory name is used as the nickname.
3375
To print the current nickname, execute with no argument.
3920
3377
Bound branches use the nickname of its master branch unless it is set
4138
3586
def run(self, testspecs_list=None, verbose=False, one=False,
4139
3587
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
4141
3589
first=False, list_only=False,
4142
3590
randomize=None, exclude=None, strict=False,
4143
load_list=None, debugflag=None, starting_with=None, subunit1=False,
4144
subunit2=False, parallel=None, lsprof_tests=False, sync=False):
4146
# During selftest, disallow proxying, as it can cause severe
4147
# performance penalties and is only needed for thread
4148
# safety. The selftest command is assumed to not use threads
4149
# too heavily. The call should be as early as possible, as
4150
# error reporting for past duplicate imports won't have useful
4152
if sys.version_info[0] < 3:
4153
# TODO(pad.lv/1696545): Allow proxying on Python 3, since
4154
# disallowing it currently leads to failures in many places.
4155
lazy_import.disallow_proxying()
4160
raise errors.BzrCommandError("tests not available. Install the "
4161
"breezy tests to run the breezy testsuite.")
3591
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
parallel=None, lsprof_tests=False):
3593
from bzrlib.tests import selftest
3594
import bzrlib.benchmarks as benchmarks
3595
from bzrlib.benchmarks import tree_creator
3597
# Make deprecation warnings visible, unless -Werror is set
3598
symbol_versioning.activate_deprecation_warnings(override=False)
3600
if cache_dir is not None:
3601
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
4163
3602
if testspecs_list is not None:
4164
3603
pattern = '|'.join(testspecs_list)
4169
from .tests import SubUnitBzrRunnerv1
3608
from bzrlib.tests import SubUnitBzrRunner
4170
3609
except ImportError:
4171
raise errors.BzrCommandError(gettext(
4172
"subunit not available. subunit needs to be installed "
4173
"to use --subunit."))
4174
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv1
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
4175
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
4176
# stdout, which would corrupt the subunit stream.
4177
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4178
# following code can be deleted when it's sufficiently deployed
4179
# -- vila/mgz 20100514
4180
if (sys.platform == "win32"
4181
and getattr(sys.stdout, 'fileno', None) is not None):
3614
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4183
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
4186
from .tests import SubUnitBzrRunnerv2
4188
raise errors.BzrCommandError(gettext(
4189
"subunit not available. subunit "
4190
"needs to be installed to use --subunit2."))
4191
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv2
4194
3619
self.additional_selftest_args.setdefault(
4195
3620
'suite_decorators', []).append(parallel)
4197
raise errors.BzrCommandError(gettext(
4198
"--benchmark is no longer supported from brz 2.2; "
4199
"use bzr-usertest instead"))
4200
test_suite_factory = None
4202
exclude_pattern = None
3622
test_suite_factory = benchmarks.test_suite
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
verbose = not is_quiet()
3625
# TODO: should possibly lock the history file...
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
4204
exclude_pattern = '(' + '|'.join(exclude) + ')'
4206
self._disable_fsync()
3629
test_suite_factory = None
4207
3631
selftest_kwargs = {"verbose": verbose,
4209
"stop_on_failure": one,
4210
"transport": transport,
4211
"test_suite_factory": test_suite_factory,
4212
"lsprof_timed": lsprof_timed,
4213
"lsprof_tests": lsprof_tests,
4214
"matching_tests_first": first,
4215
"list_only": list_only,
4216
"random_seed": randomize,
4217
"exclude_pattern": exclude_pattern,
4219
"load_list": load_list,
4220
"debug_flags": debugflag,
4221
"starting_with": starting_with
3633
"stop_on_failure": one,
3634
"transport": transport,
3635
"test_suite_factory": test_suite_factory,
3636
"lsprof_timed": lsprof_timed,
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
"matching_tests_first": first,
3640
"list_only": list_only,
3641
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3644
"load_list": load_list,
3645
"debug_flags": debugflag,
3646
"starting_with": starting_with
4223
3648
selftest_kwargs.update(self.additional_selftest_args)
4225
# Make deprecation warnings visible, unless -Werror is set
4226
cleanup = symbol_versioning.activate_deprecation_warnings(
4229
result = tests.selftest(**selftest_kwargs)
3649
result = selftest(**selftest_kwargs)
4232
3650
return int(not result)
4234
def _disable_fsync(self):
4235
"""Change the 'os' functionality to not synchronize."""
4236
self._orig_fsync = getattr(os, 'fsync', None)
4237
if self._orig_fsync is not None:
4238
os.fsync = lambda filedes: None
4239
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4240
if self._orig_fdatasync is not None:
4241
os.fdatasync = lambda filedes: None
4244
3653
class cmd_version(Command):
4245
__doc__ = """Show version of brz."""
3654
__doc__ = """Show version of bzr."""
4247
3656
encoding_type = 'replace'
4248
3657
takes_options = [
4299
3709
The source of the merge can be specified either in the form of a branch,
4300
3710
or in the form of a path to a file containing a merge directive generated
4301
with brz send. If neither is specified, the default is the upstream branch
4302
or the branch most recently merged using --remember. The source of the
4303
merge may also be specified in the form of a path to a file in another
4304
branch: in this case, only the modifications to that file are merged into
4305
the current working tree.
4307
When merging from a branch, by default brz will try to merge in all new
4308
work from the other branch, automatically determining an appropriate base
4309
revision. If this fails, you may need to give an explicit base.
4311
To pick a different ending revision, pass "--revision OTHER". brz will
4312
try to merge in all new work up to and including revision OTHER.
4314
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4315
through OTHER, excluding BASE but including OTHER, will be merged. If this
4316
causes some revisions to be skipped, i.e. if the destination branch does
4317
not already contain revision BASE, such a merge is commonly referred to as
4318
a "cherrypick". Unlike a normal merge, Breezy does not currently track
4319
cherrypicks. The changes look like a normal commit, and the history of the
4320
changes from the other branch is not stored in the commit.
4322
Revision numbers are always relative to the source branch.
3711
with bzr send. If neither is specified, the default is the upstream branch
3712
or the branch most recently merged using --remember.
3714
When merging a branch, by default the tip will be merged. To pick a different
3715
revision, pass --revision. If you specify two values, the first will be used as
3716
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3717
available revisions, like this is commonly referred to as "cherrypicking".
3719
Revision numbers are always relative to the branch being merged.
3721
By default, bzr will try to merge in all new work from the other
3722
branch, automatically determining an appropriate base. If this
3723
fails, you may need to give an explicit base.
4324
3725
Merge will do its best to combine the changes in two branches, but there
4325
3726
are some kinds of problems only a human can fix. When it encounters those,
4326
3727
it will mark a conflict. A conflict means that you need to fix something,
4327
before you can commit.
4329
Use brz resolve when you have fixed a problem. See also brz conflicts.
4331
If there is no default branch set, the first merge will set it (use
4332
--no-remember to avoid setting it). After that, you can omit the branch
4333
to use the default. To change the default, use --remember. The value will
4334
only be saved if the remote location can be accessed.
3728
before you should commit.
3730
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3732
If there is no default branch set, the first merge will set it. After
3733
that, you can omit the branch to use the default. To change the
3734
default, use --remember. The value will only be saved if the remote
3735
location can be accessed.
4336
3737
The results of the merge are placed into the destination working
4337
directory, where they can be reviewed (with brz diff), tested, and then
3738
directory, where they can be reviewed (with bzr diff), tested, and then
4338
3739
committed to record the result of the merge.
4340
3741
merge refuses to run if there are any uncommitted changes, unless
4341
--force is given. If --force is given, then the changes from the source
4342
will be merged with the current working tree, including any uncommitted
4343
changes in the tree. The --force option can also be used to create a
3742
--force is given. The --force option can also be used to create a
4344
3743
merge revision which has more than two parents.
4346
3745
If one would like to merge changes from the working tree of the other
4435
3837
unversioned_filter=tree.is_ignored, view_info=view_info)
4436
3838
pb = ui.ui_factory.nested_progress_bar()
4437
3839
self.add_cleanup(pb.finished)
4438
self.add_cleanup(tree.lock_write().unlock)
3841
self.add_cleanup(tree.unlock)
4439
3842
if location is not None:
4441
mergeable = _mod_mergeable.read_mergeable_from_url(
4442
location, possible_transports=possible_transports)
3844
mergeable = bundle.read_mergeable_from_url(location,
3845
possible_transports=possible_transports)
4443
3846
except errors.NotABundle:
4444
3847
mergeable = None
4446
3849
if uncommitted:
4447
raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4448
' with bundles or merge directives.'))
3850
raise errors.BzrCommandError('Cannot use --uncommitted'
3851
' with bundles or merge directives.')
4450
3853
if revision is not None:
4451
raise errors.BzrCommandError(gettext(
4452
'Cannot use -r with merge directives or bundles'))
3854
raise errors.BzrCommandError(
3855
'Cannot use -r with merge directives or bundles')
4453
3856
merger, verified = _mod_merge.Merger.from_mergeable(tree,
4456
3859
if merger is None and uncommitted:
4457
3860
if revision is not None and len(revision) > 0:
4458
raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4459
' --revision at the same time.'))
3861
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
' --revision at the same time.')
4460
3863
merger = self.get_merger_from_uncommitted(tree, location, None)
4461
3864
allow_pending = False
4463
3866
if merger is None:
4464
3867
merger, allow_pending = self._get_merger_from_branch(tree,
4465
location, revision, remember, possible_transports, None)
3868
location, revision, remember, possible_transports, None)
4467
3870
merger.merge_type = merge_type
4468
3871
merger.reprocess = reprocess
4469
3872
merger.show_base = show_base
4470
3873
self.sanity_check_merger(merger)
4471
3874
if (merger.base_rev_id == merger.other_rev_id and
4472
merger.other_rev_id is not None):
4473
# check if location is a nonexistent file (and not a branch) to
4474
# disambiguate the 'Nothing to do'
4475
if merger.interesting_files:
4476
if not merger.other_tree.has_filename(
4477
merger.interesting_files[0]):
4478
note(gettext("merger: ") + str(merger))
4479
raise errors.PathsDoNotExist([location])
4480
note(gettext('Nothing to do.'))
3875
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4482
if pull and not preview:
4483
3879
if merger.interesting_files is not None:
4484
raise errors.BzrCommandError(
4485
gettext('Cannot pull individual files'))
3880
raise errors.BzrCommandError('Cannot pull individual files')
4486
3881
if (merger.base_rev_id == tree.last_revision()):
4487
3882
result = tree.pull(merger.other_branch, False,
4488
3883
merger.other_rev_id)
4489
3884
result.report(self.outf)
4491
3886
if merger.this_basis is None:
4492
raise errors.BzrCommandError(gettext(
3887
raise errors.BzrCommandError(
4493
3888
"This branch has no commits."
4494
" (perhaps you would prefer 'brz pull')"))
3889
" (perhaps you would prefer 'bzr pull')")
4496
3891
return self._do_preview(merger)
4497
3892
elif interactive:
4703
4079
Re-do the merge of all conflicted files, and show the base text in
4704
4080
conflict regions, in addition to the usual THIS and OTHER texts::
4706
brz remerge --show-base
4082
bzr remerge --show-base
4708
4084
Re-do the merge of "foobar", using the weave merge algorithm, with
4709
4085
additional processing to reduce the size of conflict regions::
4711
brz remerge --merge-type weave --reprocess foobar
4087
bzr remerge --merge-type weave --reprocess foobar
4713
4089
takes_args = ['file*']
4714
4090
takes_options = [
4718
help="Show base revision text in conflicts."),
4094
help="Show base revision text in conflicts."),
4721
4097
def run(self, file_list=None, merge_type=None, show_base=False,
4722
4098
reprocess=False):
4723
from .conflicts import restore
4099
from bzrlib.conflicts import restore
4724
4100
if merge_type is None:
4725
4101
merge_type = _mod_merge.Merge3Merger
4726
tree, file_list = WorkingTree.open_containing_paths(file_list)
4727
self.add_cleanup(tree.lock_write().unlock)
4102
tree, file_list = tree_files(file_list)
4104
self.add_cleanup(tree.unlock)
4728
4105
parents = tree.get_parent_ids()
4729
4106
if len(parents) != 2:
4730
raise errors.BzrCommandError(
4731
gettext("Sorry, remerge only works after normal"
4732
" merges. Not cherrypicking or multi-merges."))
4733
interesting_files = None
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4108
" merges. Not cherrypicking or"
4110
repository = tree.branch.repository
4111
interesting_ids = None
4734
4112
new_conflicts = []
4735
4113
conflicts = tree.conflicts()
4736
4114
if file_list is not None:
4737
interesting_files = set()
4115
interesting_ids = set()
4738
4116
for filename in file_list:
4739
if not tree.is_versioned(filename):
4117
file_id = tree.path2id(filename)
4740
4119
raise errors.NotVersionedError(filename)
4741
interesting_files.add(filename)
4742
if tree.kind(filename) != "directory":
4120
interesting_ids.add(file_id)
4121
if tree.kind(file_id) != "directory":
4745
for path, ie in tree.iter_entries_by_dir(
4746
specific_files=[filename]):
4747
interesting_files.add(path)
4124
for name, ie in tree.inventory.iter_entries(file_id):
4125
interesting_ids.add(ie.file_id)
4748
4126
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4750
4128
# Remerge only supports resolving contents conflicts
4751
4129
allowed_conflicts = ('text conflict', 'contents conflict')
4752
4130
restore_files = [c.path for c in conflicts
4753
4131
if c.typestring in allowed_conflicts]
4754
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_files)
4132
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4755
4133
tree.set_conflicts(ConflictList(new_conflicts))
4756
4134
if file_list is not None:
4757
4135
restore_files = file_list
5208
4578
Option('long', help='Show commit date in annotations.'),
5213
4582
encoding_type = 'exact'
5215
4584
@display_command
5216
4585
def run(self, filename, all=False, long=False, revision=None,
5217
show_ids=False, directory=None):
5218
from .annotate import (
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5221
4588
wt, branch, relpath = \
5222
_open_directory_or_containing_tree_or_branch(filename, directory)
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5223
4590
if wt is not None:
5224
self.add_cleanup(wt.lock_read().unlock)
4592
self.add_cleanup(wt.unlock)
5226
self.add_cleanup(branch.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5227
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
5228
self.add_cleanup(tree.lock_read().unlock)
4598
self.add_cleanup(tree.unlock)
4600
file_id = wt.path2id(relpath)
4602
file_id = tree.path2id(relpath)
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
5229
4606
if wt is not None and revision is None:
5230
if not wt.is_versioned(relpath):
5231
raise errors.NotVersionedError(relpath)
5232
4607
# If there is a tree and we're not annotating historical
5233
4608
# versions, annotate the working tree's content.
5234
annotate_file_tree(wt, relpath, self.outf, long, all,
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
5237
if not tree.is_versioned(relpath):
5238
raise errors.NotVersionedError(relpath)
5239
annotate_file_tree(tree, relpath, self.outf, long, all,
5240
show_ids=show_ids, branch=branch)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5243
4616
class cmd_re_sign(Command):
5244
4617
__doc__ = """Create a digital signature for an existing revision."""
5245
4618
# TODO be able to replace existing ones.
5247
hidden = True # is this right ?
4620
hidden = True # is this right ?
5248
4621
takes_args = ['revision_id*']
5249
takes_options = ['directory', 'revision']
4622
takes_options = ['revision']
5251
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4624
def run(self, revision_id_list=None, revision=None):
5252
4625
if revision_id_list is not None and revision is not None:
5253
raise errors.BzrCommandError(
5254
gettext('You can only supply one of revision_id or --revision'))
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5255
4627
if revision_id_list is None and revision is None:
5256
raise errors.BzrCommandError(
5257
gettext('You must supply either --revision or a revision_id'))
5258
b = WorkingTree.open_containing(directory)[0].branch
5259
self.add_cleanup(b.lock_write().unlock)
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
5260
4632
return self._run(b, revision_id_list, revision)
5262
4634
def _run(self, b, revision_id_list, revision):
5263
from .repository import WriteGroup
5264
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4635
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5265
4637
if revision_id_list is not None:
5266
with WriteGroup(b.repository):
4638
b.repository.start_write_group()
5267
4640
for revision_id in revision_id_list:
5268
revision_id = cache_utf8.encode(revision_id)
5269
4641
b.repository.sign_revision(revision_id, gpg_strategy)
4643
b.repository.abort_write_group()
4646
b.repository.commit_write_group()
5270
4647
elif revision is not None:
5271
4648
if len(revision) == 1:
5272
4649
revno, rev_id = revision[0].in_history(b)
5273
with WriteGroup(b.repository):
4650
b.repository.start_write_group()
5274
4652
b.repository.sign_revision(rev_id, gpg_strategy)
4654
b.repository.abort_write_group()
4657
b.repository.commit_write_group()
5275
4658
elif len(revision) == 2:
5276
4659
# are they both on rh- if so we can walk between them
5277
4660
# might be nice to have a range helper for arbitrary
5445
4827
end_revision=last_revno)
5448
self.outf.write(gettext('Dry-run, pretending to remove'
5449
' the above revisions.\n'))
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5452
gettext('The above revision(s) will be removed.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5455
if not ui.ui_factory.confirm_action(
5456
gettext(u'Uncommit these revisions'),
5457
'breezy.builtins.uncommit',
5459
self.outf.write(gettext('Canceled\n'))
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5462
4840
mutter('Uncommitting from {%s} to {%s}',
5463
4841
last_rev_id, rev_id)
5464
4842
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5465
revno=revno, local=local, keep_tags=keep_tags)
5468
gettext('You can restore the old tip by running:\n'
5469
' brz pull -d %s %s -r revid:%s\n')
5470
% (location, location, last_rev_id.decode('utf-8')))
5473
gettext('You can restore the old tip by running:\n'
5474
' brz pull . -r revid:%s\n')
5475
% last_rev_id.decode('utf-8'))
4843
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
5478
4848
class cmd_break_lock(Command):
5479
__doc__ = """Break a dead lock.
5481
This command breaks a lock on a repository, branch, working directory or
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5484
4851
CAUTION: Locks should only be broken when you are sure that the process
5485
4852
holding the lock has been stopped.
5487
You can get information on what locks are open via the 'brz info
4854
You can get information on what locks are open via the 'bzr info
5488
4855
[location]' command.
5492
brz break-lock brz+ssh://example.com/brz/foo
5493
brz break-lock --conf ~/.config/breezy
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
5496
4861
takes_args = ['location?']
5499
help='LOCATION is the directory where the config lock is.'),
5501
help='Do not ask for confirmation before breaking the lock.'),
5504
def run(self, location=None, config=False, force=False):
4863
def run(self, location=None, show=False):
5505
4864
if location is None:
5506
4865
location = u'.'
5508
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5510
{'breezy.lockdir.break': True})
5512
conf = _mod_config.LockableConfig(file_name=location)
5515
control, relpath = controldir.ControlDir.open_containing(location)
5517
control.break_lock()
5518
except NotImplementedError:
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5522
4873
class cmd_wait_until_signalled(Command):
5523
__doc__ = """Test helper for test_start_and_stop_brz_subprocess_send_signal.
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5525
4876
This just prints a line to signal when it is ready, then blocks on stdin.
5543
4894
help='Serve on stdin/out for use from inetd or sshd.'),
5544
4895
RegistryOption('protocol',
5545
help="Protocol to serve.",
5546
lazy_registry=('breezy.transport',
5547
'transport_server_registry'),
5548
value_switches=True),
5550
help='Listen for connections on nominated address.',
4896
help="Protocol to serve.",
4897
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4898
value_switches=True),
5553
help='Listen for connections on nominated port. Passing 0 as '
5554
'the port number will result in a dynamically allocated '
5555
'port. The default port depends on the protocol.',
5557
custom_help('directory',
5558
help='Serve contents of this directory.'),
4900
help='Listen for connections on nominated port of the form '
4901
'[hostname:]portnumber. Passing 0 as the port number will '
4902
'result in a dynamically allocated port. The default port '
4903
'depends on the protocol.',
4906
help='Serve contents of this directory.',
5559
4908
Option('allow-writes',
5560
4909
help='By default the server is a readonly server. Supplying '
5561
4910
'--allow-writes enables write access to the contents of '
5562
'the served directory and below. Note that ``brz serve`` '
4911
'the served directory and below. Note that ``bzr serve`` '
5563
4912
'does not perform authentication, so unless some form of '
5564
4913
'external authentication is arranged supplying this '
5565
4914
'option leads to global uncontrolled write access to your '
5568
Option('client-timeout', type=float,
5569
help='Override the default idle client timeout (5min).'),
5572
def run(self, listen=None, port=None, inet=False, directory=None,
5573
allow_writes=False, protocol=None, client_timeout=None):
5574
from . import location, transport
4919
def get_host_and_port(self, port):
4920
"""Return the host and port to run the smart server on.
4922
If 'port' is None, None will be returned for the host and port.
4924
If 'port' has a colon in it, the string before the colon will be
4925
interpreted as the host.
4927
:param port: A string of the port to run the server on.
4928
:return: A tuple of (host, port), where 'host' is a host name or IP,
4929
and port is an integer TCP/IP port.
4932
if port is not None:
4934
host, port = port.split(':')
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5575
4941
if directory is None:
5576
directory = osutils.getcwd()
4942
directory = os.getcwd()
5577
4943
if protocol is None:
5578
protocol = transport.transport_server_registry.get()
5579
url = location.location_to_url(directory)
4944
protocol = transport_server_registry.get()
4945
host, port = self.get_host_and_port(port)
4946
url = urlutils.local_path_to_url(directory)
5580
4947
if not allow_writes:
5581
4948
url = 'readonly+' + url
5582
t = transport.get_transport_from_url(url)
5583
protocol(t, listen, port, inet, client_timeout)
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5586
4953
class cmd_join(Command):
6122
5476
takes_args = ['location?']
6123
5477
takes_options = [
6124
5478
RegistryOption.from_kwargs(
6127
help='The relation between branch and tree.',
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6128
5482
value_switches=True, enum_switch=False,
6129
5483
branch='Reconfigure to be an unbound branch with no working tree.',
6130
5484
tree='Reconfigure to be an unbound branch with a working tree.',
6131
5485
checkout='Reconfigure to be a bound branch with a working tree.',
6132
5486
lightweight_checkout='Reconfigure to be a lightweight'
6133
' checkout (with no local history).',
6135
RegistryOption.from_kwargs(
6137
title='Repository type',
6138
help='Location fo the repository.',
6139
value_switches=True, enum_switch=False,
5487
' checkout (with no local history).',
6140
5488
standalone='Reconfigure to be a standalone branch '
6141
'(i.e. stop using shared repository).',
5489
'(i.e. stop using shared repository).',
6142
5490
use_shared='Reconfigure to use a shared repository.',
6144
RegistryOption.from_kwargs(
6146
title='Trees in Repository',
6147
help='Whether new branches in the repository have trees.',
6148
value_switches=True, enum_switch=False,
6149
5491
with_trees='Reconfigure repository to create '
6150
'working trees on branches by default.',
5492
'working trees on branches by default.',
6151
5493
with_no_trees='Reconfigure repository to not create '
6152
'working trees on branches by default.'
5494
'working trees on branches by default.'
6154
Option('bind-to', help='Branch to bind checkout to.', type=text_type),
5496
Option('bind-to', help='Branch to bind checkout to.', type=str),
6155
5497
Option('force',
6156
help='Perform reconfiguration even if local changes'
5498
help='Perform reconfiguration even if local changes'
6158
5500
Option('stacked-on',
6159
help='Reconfigure a branch to be stacked on another branch.',
5501
help='Reconfigure a branch to be stacked on another branch.',
6162
5504
Option('unstacked',
6163
help='Reconfigure a branch to be unstacked. This '
6164
'may require copying substantial data into it.',
5505
help='Reconfigure a branch to be unstacked. This '
5506
'may require copying substantial data into it.',
6168
def run(self, location=None, bind_to=None, force=False,
6169
tree_type=None, repository_type=None, repository_trees=None,
6170
stacked_on=None, unstacked=None):
6171
directory = controldir.ControlDir.open(location)
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5513
directory = bzrdir.BzrDir.open(location)
6172
5514
if stacked_on and unstacked:
6173
raise errors.BzrCommandError(
6174
gettext("Can't use both --stacked-on and --unstacked"))
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
6175
5516
elif stacked_on is not None:
6176
5517
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
6177
5518
elif unstacked:
6245
5575
takes_args = ['to_location?']
6246
takes_options = ['directory',
6248
help='Switch even if local commits will be lost.'),
5576
takes_options = [Option('force',
5577
help='Switch even if local commits will be lost.'),
6250
5579
Option('create-branch', short_name='b',
6251
help='Create the target branch from this one before'
6252
' switching to it.'),
6254
help='Store and restore uncommitted changes in the'
5580
help='Create the target branch from this one before'
5581
' switching to it.'),
6258
5584
def run(self, to_location=None, force=False, create_branch=False,
6259
revision=None, directory=u'.', store=False):
6260
from . import switch
6261
tree_location = directory
5586
from bzrlib import switch
6262
5588
revision = _get_one_revision('switch', revision)
6263
control_dir = controldir.ControlDir.open_containing(tree_location)[0]
6264
possible_transports = [control_dir.root_transport]
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6265
5590
if to_location is None:
6266
5591
if revision is None:
6267
raise errors.BzrCommandError(gettext('You must supply either a'
6268
' revision or a location'))
6269
to_location = tree_location
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6271
branch = control_dir.open_branch(
6272
possible_transports=possible_transports)
5596
branch = control_dir.open_branch()
6273
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
6274
5598
except errors.NotBranchError:
6276
5600
had_explicit_nick = False
6278
possible_transports.append(branch.user_transport)
6279
5601
if create_branch:
6280
5602
if branch is None:
6281
raise errors.BzrCommandError(
6282
gettext('cannot create branch without source branch'))
6283
to_location = lookup_new_sibling_branch(
6284
control_dir, to_location,
6285
possible_transports=possible_transports)
6286
if revision is not None:
6287
revision = revision.as_revision_id(branch)
6288
to_branch = branch.controldir.sprout(
6290
possible_transports=possible_transports,
6291
revision_id=revision,
6292
source_branch=branch).open_branch()
5603
raise errors.BzrCommandError('cannot create branch without'
5605
to_location = directory_service.directories.dereference(
5607
if '/' not in to_location and '\\' not in to_location:
5608
# This path is meant to be relative to the existing branch
5609
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
5611
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
5616
to_branch = Branch.open(to_location)
5617
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
6295
5619
to_branch = Branch.open(
6296
to_location, possible_transports=possible_transports)
6297
except errors.NotBranchError:
6298
to_branch = open_sibling_branch(
6299
control_dir, to_location,
6300
possible_transports=possible_transports)
6301
if revision is not None:
6302
revision = revision.as_revision_id(to_branch)
6303
possible_transports.append(to_branch.user_transport)
6305
switch.switch(control_dir, to_branch, force, revision_id=revision,
6306
store_uncommitted=store,
6307
possible_transports=possible_transports)
6308
except controldir.BranchReferenceLoop:
6309
raise errors.BzrCommandError(
6310
gettext('switching would create a branch reference loop. '
6311
'Use the "bzr up" command to switch to a '
6312
'different revision.'))
5620
urlutils.join(this_url, '..', to_location))
5621
if revision is not None:
5622
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
6313
5624
if had_explicit_nick:
6314
branch = control_dir.open_branch() # get the new branch!
5625
branch = control_dir.open_branch() #get the new branch!
6315
5626
branch.nick = to_branch.nick
6317
if to_branch.controldir.control_url != control_dir.control_url:
6318
note(gettext('Switched to branch %s at %s'),
6319
to_branch.name, urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5627
note('Switched to branch: %s',
5628
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
def _get_branch_location(self, control_dir):
5631
"""Return location of branch for this control dir."""
5633
this_branch = control_dir.open_branch()
5634
# This may be a heavy checkout, where we want the master branch
5635
master_location = this_branch.get_bound_location()
5636
if master_location is not None:
5637
return master_location
5638
# If not, use a local sibling
5639
return this_branch.base
5640
except errors.NotBranchError:
5641
format = control_dir.find_branch_format()
5642
if getattr(format, 'get_reference', None) is not None:
5643
return format.get_reference(control_dir)
6321
note(gettext('Switched to branch %s'), to_branch.name)
6323
note(gettext('Switched to branch at %s'),
6324
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5645
return control_dir.root_transport.base
6327
5648
class cmd_view(Command):
6711
5998
takes_args = ['path?', 'location?']
6713
Option('force-unversioned',
6714
help='Set reference even if path is not versioned.'),
6717
def run(self, path=None, location=None, force_unversioned=False):
6000
def run(self, path=None, location=None):
6718
6001
branchdir = '.'
6719
6002
if path is not None:
6720
6003
branchdir = path
6721
tree, branch, relpath = (
6722
controldir.ControlDir.open_containing_tree_or_branch(branchdir))
6004
tree, branch, relpath =(
6005
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
6723
6006
if path is not None:
6725
6008
if tree is None:
6726
6009
tree = branch.basis_tree()
6727
6010
if path is None:
6728
info = viewitems(branch._get_all_reference_info())
6011
info = branch._get_all_reference_info().iteritems()
6729
6012
self._display_reference_info(tree, branch, info)
6731
if not tree.is_versioned(path) and not force_unversioned:
6014
file_id = tree.path2id(path)
6732
6016
raise errors.NotVersionedError(path)
6733
6017
if location is None:
6734
info = [(path, branch.get_reference_info(path))]
6018
info = [(file_id, branch.get_reference_info(file_id))]
6735
6019
self._display_reference_info(tree, branch, info)
6737
branch.set_reference_info(
6738
path, location, file_id=tree.path2id(path))
6021
branch.set_reference_info(file_id, path, location)
6740
6023
def _display_reference_info(self, tree, branch, info):
6742
for path, (location, file_id) in info:
6025
for file_id, (path, location) in info:
6027
path = tree.id2path(file_id)
6028
except errors.NoSuchId:
6743
6030
ref_list.append((path, location))
6744
6031
for path, location in sorted(ref_list):
6745
6032
self.outf.write('%s %s\n' % (path, location))
6748
class cmd_export_pot(Command):
6749
__doc__ = """Export command helps and error messages in po format."""
6752
takes_options = [Option('plugin',
6753
help='Export help text from named command '
6754
'(defaults to all built in commands).',
6756
Option('include-duplicates',
6757
help='Output multiple copies of the same msgid '
6758
'string if it appears more than once.'),
6761
def run(self, plugin=None, include_duplicates=False):
6762
from .export_pot import export_pot
6763
export_pot(self.outf, plugin, include_duplicates)
6766
class cmd_import(Command):
6767
__doc__ = """Import sources from a directory, tarball or zip file
6769
This command will import a directory, tarball or zip file into a bzr
6770
tree, replacing any versioned files already present. If a directory is
6771
specified, it is used as the target. If the directory does not exist, or
6772
is not versioned, it is created.
6774
Tarballs may be gzip or bzip2 compressed. This is autodetected.
6776
If the tarball or zip has a single root directory, that directory is
6777
stripped when extracting the tarball. This is not done for directories.
6780
takes_args = ['source', 'tree?']
6782
def run(self, source, tree=None):
6783
from .upstream_import import do_import
6784
do_import(source, tree)
6787
class cmd_link_tree(Command):
6788
__doc__ = """Hardlink matching files to another tree.
6790
Only files with identical content and execute bit will be linked.
6793
takes_args = ['location']
6795
def run(self, location):
6796
from .transform import link_tree
6797
target_tree = WorkingTree.open_containing(".")[0]
6798
source_tree = WorkingTree.open(location)
6799
with target_tree.lock_write(), source_tree.lock_read():
6800
link_tree(target_tree, source_tree)
6803
class cmd_fetch_ghosts(Command):
6804
__doc__ = """Attempt to retrieve ghosts from another branch.
6806
If the other branch is not supplied, the last-pulled branch is used.
6810
aliases = ['fetch-missing']
6811
takes_args = ['branch?']
6812
takes_options = [Option('no-fix', help="Skip additional synchonization.")]
6814
def run(self, branch=None, no_fix=False):
6815
from .fetch_ghosts import GhostFetcher
6816
installed, failed = GhostFetcher.from_cmdline(branch).run()
6817
if len(installed) > 0:
6818
self.outf.write("Installed:\n")
6819
for rev in installed:
6820
self.outf.write(rev.decode('utf-8') + "\n")
6822
self.outf.write("Still missing:\n")
6824
self.outf.write(rev.decode('utf-8') + "\n")
6825
if not no_fix and len(installed) > 0:
6826
cmd_reconcile().run(".")
6829
class cmd_grep(Command):
6830
"""Print lines matching PATTERN for specified files and revisions.
6832
This command searches the specified files and revisions for a given
6833
pattern. The pattern is specified as a Python regular expressions[1].
6835
If the file name is not specified, the revisions starting with the
6836
current directory are searched recursively. If the revision number is
6837
not specified, the working copy is searched. To search the last committed
6838
revision, use the '-r -1' or '-r last:1' option.
6840
Unversioned files are not searched unless explicitly specified on the
6841
command line. Unversioned directores are not searched.
6843
When searching a pattern, the output is shown in the 'filepath:string'
6844
format. If a revision is explicitly searched, the output is shown as
6845
'filepath~N:string', where N is the revision number.
6847
--include and --exclude options can be used to search only (or exclude
6848
from search) files with base name matches the specified Unix style GLOB
6849
pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \\
6850
to quote wildcard or backslash character literally. Note that the glob
6851
pattern is not a regular expression.
6853
[1] http://docs.python.org/library/re.html#regular-expression-syntax
6856
encoding_type = 'replace'
6857
takes_args = ['pattern', 'path*']
6861
Option('color', type=text_type, argname='when',
6862
help='Show match in color. WHEN is never, always or auto.'),
6863
Option('diff', short_name='p',
6864
help='Grep for pattern in changeset for each revision.'),
6865
ListOption('exclude', type=text_type, argname='glob', short_name='X',
6866
help="Skip files whose base name matches GLOB."),
6867
ListOption('include', type=text_type, argname='glob', short_name='I',
6868
help="Search only files whose base name matches GLOB."),
6869
Option('files-with-matches', short_name='l',
6870
help='Print only the name of each input file in '
6871
'which PATTERN is found.'),
6872
Option('files-without-match', short_name='L',
6873
help='Print only the name of each input file in '
6874
'which PATTERN is not found.'),
6875
Option('fixed-string', short_name='F',
6876
help='Interpret PATTERN is a single fixed string (not regex).'),
6878
help='Search for pattern starting from the root of the branch. '
6879
'(implies --recursive)'),
6880
Option('ignore-case', short_name='i',
6881
help='Ignore case distinctions while matching.'),
6883
help='Number of levels to display - 0 for all, 1 for collapsed '
6886
type=_parse_levels),
6887
Option('line-number', short_name='n',
6888
help='Show 1-based line number.'),
6889
Option('no-recursive',
6890
help="Don't recurse into subdirectories. (default is --recursive)"),
6891
Option('null', short_name='Z',
6892
help='Write an ASCII NUL (\\0) separator '
6893
'between output lines rather than a newline.'),
6897
def run(self, verbose=False, ignore_case=False, no_recursive=False,
6898
from_root=False, null=False, levels=None, line_number=False,
6899
path_list=None, revision=None, pattern=None, include=None,
6900
exclude=None, fixed_string=False, files_with_matches=False,
6901
files_without_match=False, color=None, diff=False):
6902
from breezy import _termcolor
6905
if path_list is None:
6909
raise errors.BzrCommandError(
6910
'cannot specify both --from-root and PATH.')
6912
if files_with_matches and files_without_match:
6913
raise errors.BzrCommandError(
6914
'cannot specify both '
6915
'-l/--files-with-matches and -L/--files-without-matches.')
6917
global_config = _mod_config.GlobalConfig()
6920
color = global_config.get_user_option('grep_color')
6925
if color not in ['always', 'never', 'auto']:
6926
raise errors.BzrCommandError('Valid values for --color are '
6927
'"always", "never" or "auto".')
6933
if revision is not None or levels == 0:
6934
# print revision numbers as we may be showing multiple revisions
6941
if not ignore_case and grep.is_fixed_string(pattern):
6942
# if the pattern isalnum, implicitly use to -F for faster grep
6944
elif ignore_case and fixed_string:
6945
# GZ 2010-06-02: Fall back to regexp rather than lowercasing
6946
# pattern and text which will cause pain later
6947
fixed_string = False
6948
pattern = re.escape(pattern)
6951
re_flags = re.MULTILINE
6953
re_flags |= re.IGNORECASE
6955
if not fixed_string:
6956
patternc = grep.compile_pattern(
6957
pattern.encode(grep._user_encoding), re_flags)
6959
if color == 'always':
6961
elif color == 'never':
6963
elif color == 'auto':
6964
show_color = _termcolor.allow_color()
6966
opts = grep.GrepOptions()
6968
opts.verbose = verbose
6969
opts.ignore_case = ignore_case
6970
opts.no_recursive = no_recursive
6971
opts.from_root = from_root
6973
opts.levels = levels
6974
opts.line_number = line_number
6975
opts.path_list = path_list
6976
opts.revision = revision
6977
opts.pattern = pattern
6978
opts.include = include
6979
opts.exclude = exclude
6980
opts.fixed_string = fixed_string
6981
opts.files_with_matches = files_with_matches
6982
opts.files_without_match = files_without_match
6986
opts.eol_marker = eol_marker
6987
opts.print_revno = print_revno
6988
opts.patternc = patternc
6989
opts.recursive = not no_recursive
6990
opts.fixed_string = fixed_string
6991
opts.outf = self.outf
6992
opts.show_color = show_color
6996
# files_with_matches, files_without_match
6997
# levels(?), line_number, from_root
6999
# These are silently ignored.
7000
grep.grep_diff(opts)
7001
elif revision is None:
7002
grep.workingtree_grep(opts)
7004
grep.versioned_grep(opts)
7007
class cmd_patch(Command):
7008
"""Apply a named patch to the current tree.
7012
takes_args = ['filename?']
7013
takes_options = [Option('strip', type=int, short_name='p',
7014
help=("Strip the smallest prefix containing num "
7015
"leading slashes from filenames.")),
7016
Option('silent', help='Suppress chatter.')]
7018
def run(self, filename=None, strip=None, silent=False):
7019
from .patch import patch_tree
7020
wt = WorkingTree.open_containing('.')[0]
7024
if filename is None:
7025
my_file = getattr(sys.stdin, 'buffer', sys.stdin)
7027
my_file = open(filename, 'rb')
7028
patches = [my_file.read()]
7029
return patch_tree(wt, patches, strip, quiet=is_quiet(), out=self.outf)
7032
class cmd_resolve_location(Command):
7033
__doc__ = """Expand a location to a full URL.
7036
Look up a Launchpad URL.
7038
brz resolve-location lp:brz
7040
takes_args = ['location']
7043
def run(self, location):
7044
from .location import location_to_url
7045
url = location_to_url(location)
7046
display_url = urlutils.unescape_for_display(url, self.outf.encoding)
7047
self.outf.write('%s\n' % display_url)
7050
6035
def _register_lazy_builtins():
7051
6036
# register lazy builtins from other modules; called at startup and should
7052
6037
# be only called once.
7053
6038
for (name, aliases, module_name) in [
7054
('cmd_bisect', [], 'breezy.bisect'),
7055
('cmd_bundle_info', [], 'breezy.bundle.commands'),
7056
('cmd_config', [], 'breezy.config'),
7057
('cmd_dump_btree', [], 'breezy.bzr.debug_commands'),
7058
('cmd_file_id', [], 'breezy.bzr.debug_commands'),
7059
('cmd_file_path', [], 'breezy.bzr.debug_commands'),
7060
('cmd_version_info', [], 'breezy.cmd_version_info'),
7061
('cmd_resolve', ['resolved'], 'breezy.conflicts'),
7062
('cmd_conflicts', [], 'breezy.conflicts'),
7063
('cmd_ping', [], 'breezy.bzr.smart.ping'),
7064
('cmd_sign_my_commits', [], 'breezy.commit_signature_commands'),
7065
('cmd_verify_signatures', [], 'breezy.commit_signature_commands'),
7066
('cmd_test_script', [], 'breezy.cmd_test_script'),
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
7068
6046
builtin_command_registry.register_lazy(name, aliases, module_name)