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
60
from breezy.branch import Branch
61
from breezy.conflicts import ConflictList
62
from breezy.transport import memory
63
from breezy.revisionspec import RevisionSpec, RevisionInfo
64
from breezy.smtp_connection import SMTPConnection
65
from breezy.workingtree import WorkingTree
66
from breezy.i18n import gettext, ngettext
63
from bzrlib.commands import (
69
from .commands import (
65
71
builtin_command_registry,
68
from bzrlib.option import (
73
79
_parse_revision_str,
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]))
87
from .trace import mutter, note, warning, is_quiet, get_verbosity_level
90
def _get_branch_location(control_dir, possible_transports=None):
91
"""Return location of branch for this control dir."""
93
target = control_dir.get_branch_reference()
94
except errors.NotBranchError:
95
return control_dir.root_transport.base
96
if target is not None:
98
this_branch = control_dir.open_branch(
99
possible_transports=possible_transports)
100
# This may be a heavy checkout, where we want the master branch
101
master_location = this_branch.get_bound_location()
102
if master_location is not None:
103
return master_location
104
# If not, use a local sibling
105
return this_branch.base
108
def _is_colocated(control_dir, possible_transports=None):
109
"""Check if the branch in control_dir is colocated.
111
:param control_dir: Control directory
112
:return: Tuple with boolean indicating whether the branch is colocated
113
and the full URL to the actual branch
115
# This path is meant to be relative to the existing branch
116
this_url = _get_branch_location(control_dir,
117
possible_transports=possible_transports)
118
# Perhaps the target control dir supports colocated branches?
120
root = controldir.ControlDir.open(this_url,
121
possible_transports=possible_transports)
122
except errors.NotBranchError:
123
return (False, this_url)
126
wt = control_dir.open_workingtree()
127
except (errors.NoWorkingTree, errors.NotLocalUrl):
128
return (False, this_url)
131
root._format.colocated_branches and
132
control_dir.control_url == root.control_url,
136
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
137
"""Lookup the location for a new sibling branch.
139
:param control_dir: Control directory to find sibling branches from
140
:param location: Name of the new branch
141
:return: Full location to the new branch
143
location = directory_service.directories.dereference(location)
144
if '/' not in location and '\\' not in location:
145
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
148
return urlutils.join_segment_parameters(this_url,
149
{"branch": urlutils.escape(location)})
151
return urlutils.join(this_url, '..', urlutils.escape(location))
155
def open_sibling_branch(control_dir, location, possible_transports=None):
156
"""Open a branch, possibly a sibling of another.
158
:param control_dir: Control directory relative to which to lookup the
160
:param location: Location to look up
161
:return: branch to open
164
# Perhaps it's a colocated branch?
165
return control_dir.open_branch(location,
166
possible_transports=possible_transports)
167
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
168
this_url = _get_branch_location(control_dir)
171
this_url, '..', urlutils.escape(location)))
174
def open_nearby_branch(near=None, location=None, possible_transports=None):
175
"""Open a nearby branch.
177
:param near: Optional location of container from which to open branch
178
:param location: Location of the branch
179
:return: Branch instance
185
return Branch.open(location,
186
possible_transports=possible_transports)
187
except errors.NotBranchError:
189
cdir = controldir.ControlDir.open(near,
190
possible_transports=possible_transports)
191
return open_sibling_branch(cdir, location,
192
possible_transports=possible_transports)
195
def iter_sibling_branches(control_dir, possible_transports=None):
196
"""Iterate over the siblings of a branch.
198
:param control_dir: Control directory for which to look up the siblings
199
:return: Iterator over tuples with branch name and branch object
203
reference = control_dir.get_branch_reference()
204
except errors.NotBranchError:
205
# There is no active branch, just return the colocated branches.
206
for name, branch in viewitems(control_dir.get_branches()):
209
if reference is not None:
210
ref_branch = Branch.open(reference,
211
possible_transports=possible_transports)
214
if ref_branch is None or ref_branch.name:
215
if ref_branch is not None:
216
control_dir = ref_branch.bzrdir
217
for name, branch in viewitems(control_dir.get_branches()):
220
repo = ref_branch.bzrdir.find_repository()
221
for branch in repo.find_branches(using=True):
222
name = urlutils.relative_url(repo.user_url,
223
branch.user_url).rstrip("/")
88
227
def tree_files_for_add(file_list):
153
# XXX: Bad function name; should possibly also be a class method of
154
# WorkingTree rather than a function.
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
157
"""Convert command-line paths to a WorkingTree and relative paths.
159
This is typically used for command-line processors that take one or
160
more filenames, and infer the workingtree that contains them.
162
The filenames given are not required to exist.
164
:param file_list: Filenames to convert.
166
:param default_branch: Fallback tree path to use if file_list is empty or
169
:param apply_view: if True and a view is set, apply it or check that
170
specified files are within it
172
:return: workingtree, [relative_paths]
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
223
292
def _get_view_info_for_change_reporter(tree):
224
293
"""Get the view information from a tree for change reporting."""
342
429
takes_args = ['revision_id?']
343
takes_options = ['revision']
430
takes_options = ['directory', 'revision']
344
431
# cat-revision is more for frontends so should be exact
345
432
encoding = 'strict'
347
434
def print_revision(self, revisions, revid):
348
435
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
436
record = next(stream)
350
437
if record.storage_kind == 'absent':
351
438
raise errors.NoSuchRevision(revisions, revid)
352
439
revtext = record.get_bytes_as('fulltext')
353
440
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
443
def run(self, revision_id=None, revision=None, directory=u'.'):
357
444
if revision_id is not None and revision is not None:
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
445
raise errors.BzrCommandError(gettext('You can only supply one of'
446
' revision_id or --revision'))
360
447
if revision_id is None and revision is None:
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
448
raise errors.BzrCommandError(gettext('You must supply either'
449
' --revision or a revision_id'))
451
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
453
revisions = b.repository.revisions
366
454
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
455
raise errors.BzrCommandError(gettext('Repository %r does not support '
456
'access to raw revision texts'))
370
458
b.repository.lock_read()
372
460
# TODO: jam 20060112 should cat-revision always output utf-8?
373
461
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
462
revision_id = cache_utf8.encode(revision_id)
376
464
self.print_revision(revisions, revision_id)
377
465
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
466
msg = gettext("The repository {0} contains no revision {1}.").format(
379
467
b.repository.base, revision_id)
380
468
raise errors.BzrCommandError(msg)
381
469
elif revision is not None:
382
470
for rev in revision:
384
472
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
473
gettext('You cannot specify a NULL revision.'))
386
474
rev_id = rev.as_revision_id(b)
387
475
self.print_revision(revisions, rev_id)
491
582
location_list=['.']
493
584
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
585
d = controldir.ControlDir.open(location)
497
588
working = d.open_workingtree()
498
589
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
590
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
591
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
592
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
593
" of a remote path"))
504
595
if (working.has_changes()):
505
596
raise errors.UncommittedChanges(working)
597
if working.get_shelf_manager().last_shelf() is not None:
598
raise errors.ShelvedChanges(working)
507
600
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
601
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
602
" from a lightweight checkout"))
511
604
d.destroy_workingtree()
607
class cmd_repair_workingtree(Command):
608
__doc__ = """Reset the working tree state file.
610
This is not meant to be used normally, but more as a way to recover from
611
filesystem corruption, etc. This rebuilds the working inventory back to a
612
'known good' state. Any new modifications (adding a file, renaming, etc)
613
will be lost, though modified files will still be detected as such.
615
Most users will want something more like "brz revert" or "brz update"
616
unless the state file has become corrupted.
618
By default this attempts to recover the current state by looking at the
619
headers of the state file. If the state file is too corrupted to even do
620
that, you can supply --revision to force the state of the tree.
623
takes_options = ['revision', 'directory',
625
help='Reset the tree even if it doesn\'t appear to be'
630
def run(self, revision=None, directory='.', force=False):
631
tree, _ = WorkingTree.open_containing(directory)
632
self.add_cleanup(tree.lock_tree_write().unlock)
636
except errors.BzrError:
637
pass # There seems to be a real error here, so we'll reset
640
raise errors.BzrCommandError(gettext(
641
'The tree does not appear to be corrupt. You probably'
642
' want "brz revert" instead. Use "--force" if you are'
643
' sure you want to reset the working tree.'))
647
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
649
tree.reset_state(revision_ids)
650
except errors.BzrError as e:
651
if revision_ids is None:
652
extra = (gettext(', the header appears corrupt, try passing -r -1'
653
' to set the state to the last commit'))
656
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
659
class cmd_revno(Command):
515
660
__doc__ = """Show current revision number.
520
665
_see_also = ['info']
521
666
takes_args = ['location?']
522
667
takes_options = [
523
Option('tree', help='Show revno of working tree'),
668
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
673
def run(self, tree=False, location=u'.', revision=None):
674
if revision is not None and tree:
675
raise errors.BzrCommandError(gettext("--tree and --revision can "
676
"not be used together"))
530
680
wt = WorkingTree.open_containing(location)[0]
531
681
self.add_cleanup(wt.lock_read().unlock)
532
682
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
683
raise errors.NoWorkingTree(location)
534
685
revid = wt.last_revision()
536
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
537
except errors.NoSuchRevision:
539
revno = ".".join(str(n) for n in revno_t)
541
687
b = Branch.open_containing(location)[0]
542
688
self.add_cleanup(b.lock_read().unlock)
690
if len(revision) != 1:
691
raise errors.BzrCommandError(gettext(
692
"Revision numbers only make sense for single "
693
"revisions, not ranges"))
694
revid = revision[0].as_revision_id(b)
696
revid = b.last_revision()
698
revno_t = b.revision_id_to_dotted_revno(revid)
699
except errors.NoSuchRevision:
701
revno = ".".join(str(n) for n in revno_t)
544
702
self.cleanup_now()
545
self.outf.write(str(revno) + '\n')
703
self.outf.write(revno + '\n')
548
706
class cmd_revision_info(Command):
821
1011
return self.run_auto(names_list, after, dry_run)
823
raise errors.BzrCommandError('--dry-run requires --auto.')
1013
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
824
1014
if names_list is None:
826
1016
if len(names_list) < 2:
827
raise errors.BzrCommandError("missing file argument")
828
tree, rel_names = tree_files(names_list, canonicalize=False)
1017
raise errors.BzrCommandError(gettext("missing file argument"))
1018
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1019
for file_name in rel_names[0:-1]:
1021
raise errors.BzrCommandError(gettext("can not move root of branch"))
829
1022
self.add_cleanup(tree.lock_tree_write().unlock)
830
1023
self._run(tree, names_list, rel_names, after)
832
1025
def run_auto(self, names_list, after, dry_run):
833
1026
if names_list is not None and len(names_list) > 1:
834
raise errors.BzrCommandError('Only one path may be specified to'
1027
raise errors.BzrCommandError(gettext('Only one path may be specified to'
837
raise errors.BzrCommandError('--after cannot be specified with'
839
work_tree, file_list = tree_files(names_list, default_branch='.')
1030
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1032
work_tree, file_list = WorkingTree.open_containing_paths(
1033
names_list, default_directory='.')
840
1034
self.add_cleanup(work_tree.lock_tree_write().unlock)
841
1035
rename_map.RenameMap.guess_renames(work_tree, dry_run)
937
1130
match the remote one, use pull --overwrite. This will work even if the two
938
1131
branches have diverged.
940
If there is no default location set, the first pull will set it. After
941
that, you can omit the location to use the default. To change the
942
default, use --remember. The value will only be saved if the remote
943
location can be accessed.
1133
If there is no default location set, the first pull will set it (use
1134
--no-remember to avoid setting it). After that, you can omit the
1135
location to use the default. To change the default, use --remember. The
1136
value will only be saved if the remote location can be accessed.
1138
The --verbose option will display the revisions pulled using the log_format
1139
configuration option. You can use a different format by overriding it with
1140
-Olog_format=<other_format>.
945
1142
Note: The location can be specified either in the form of a branch,
946
1143
or in the form of a path to a file containing a merge directive generated
950
1147
_see_also = ['push', 'update', 'status-flags', 'send']
951
1148
takes_options = ['remember', 'overwrite', 'revision',
952
1149
custom_help('verbose',
953
1150
help='Show logs of pulled revisions.'),
1151
custom_help('directory',
955
1152
help='Branch to pull into, '
956
'rather than the one containing the working directory.',
1153
'rather than the one containing the working directory.'),
961
1155
help="Perform a local pull in a bound "
962
1156
"branch. Local pulls are not applied to "
963
1157
"the master branch."
1160
help="Show base revision text in conflicts."),
1161
Option('overwrite-tags',
1162
help="Overwrite tags only."),
966
1164
takes_args = ['location?']
967
1165
encoding_type = 'replace'
969
def run(self, location=None, remember=False, overwrite=False,
1167
def run(self, location=None, remember=None, overwrite=False,
970
1168
revision=None, verbose=False,
971
directory=None, local=False):
1169
directory=None, local=False,
1170
show_base=False, overwrite_tags=False):
1173
overwrite = ["history", "tags"]
1174
elif overwrite_tags:
1175
overwrite = ["tags"]
972
1178
# FIXME: too much stuff is in the command class
973
1179
revision_id = None
974
1180
mergeable = None
1058
1273
considered diverged if the destination branch's most recent commit is one
1059
1274
that has not been merged (directly or indirectly) by the source branch.
1061
If branches have diverged, you can use 'bzr push --overwrite' to replace
1276
If branches have diverged, you can use 'brz push --overwrite' to replace
1062
1277
the other branch completely, discarding its unmerged changes.
1064
1279
If you want to ensure you have the different changes in the other branch,
1065
do a merge (see bzr help merge) from the other branch, and commit that.
1280
do a merge (see brz help merge) from the other branch, and commit that.
1066
1281
After that you will be able to do a push without '--overwrite'.
1068
If there is no default push location set, the first push will set it.
1069
After that, you can omit the location to use the default. To change the
1070
default, use --remember. The value will only be saved if the remote
1071
location can be accessed.
1283
If there is no default push location set, the first push will set it (use
1284
--no-remember to avoid setting it). After that, you can omit the
1285
location to use the default. To change the default, use --remember. The
1286
value will only be saved if the remote location can be accessed.
1288
The --verbose option will display the revisions pushed using the log_format
1289
configuration option. You can use a different format by overriding it with
1290
-Olog_format=<other_format>.
1074
1293
_see_also = ['pull', 'update', 'working-trees']
1094
1310
help='Create a stacked branch that refers to another branch '
1095
1311
'for the commit history. Only the work not present in the '
1096
1312
'referenced branch is included in the branch created.',
1098
1314
Option('strict',
1099
1315
help='Refuse to push if there are uncommitted changes in'
1100
1316
' the working tree, --no-strict disables the check.'),
1318
help="Don't populate the working tree, even for protocols"
1319
" that support it."),
1320
Option('overwrite-tags',
1321
help="Overwrite tags only."),
1102
1323
takes_args = ['location?']
1103
1324
encoding_type = 'replace'
1105
def run(self, location=None, remember=False, overwrite=False,
1326
def run(self, location=None, remember=None, overwrite=False,
1106
1327
create_prefix=False, verbose=False, revision=None,
1107
1328
use_existing_dir=False, directory=None, stacked_on=None,
1108
stacked=False, strict=None):
1109
from bzrlib.push import _show_push_branch
1329
stacked=False, strict=None, no_tree=False,
1330
overwrite_tags=False):
1331
from .push import _show_push_branch
1334
overwrite = ["history", "tags"]
1335
elif overwrite_tags:
1336
overwrite = ["tags"]
1111
1340
if directory is None:
1112
1341
directory = '.'
1113
1342
# Get the source branch
1114
1343
(tree, br_from,
1115
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1344
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1116
1345
# Get the tip's revision_id
1117
1346
revision = _get_one_revision('push', revision)
1118
1347
if revision is not None:
1139
1368
# error by the feedback given to them. RBC 20080227.
1140
1369
stacked_on = parent_url
1141
1370
if not stacked_on:
1142
raise errors.BzrCommandError(
1143
"Could not determine branch to refer to.")
1371
raise errors.BzrCommandError(gettext(
1372
"Could not determine branch to refer to."))
1145
1374
# Get the destination location
1146
1375
if location is None:
1147
1376
stored_loc = br_from.get_push_location()
1148
1377
if stored_loc is None:
1149
raise errors.BzrCommandError(
1150
"No push location known or specified.")
1378
parent_loc = br_from.get_parent()
1380
raise errors.BzrCommandError(gettext(
1381
"No push location known or specified. To push to the "
1382
"parent branch (at %s), use 'brz push :parent'." %
1383
urlutils.unescape_for_display(parent_loc,
1384
self.outf.encoding)))
1386
raise errors.BzrCommandError(gettext(
1387
"No push location known or specified."))
1152
1389
display_url = urlutils.unescape_for_display(stored_loc,
1153
1390
self.outf.encoding)
1154
self.outf.write("Using saved push location: %s\n" % display_url)
1391
note(gettext("Using saved push location: %s") % display_url)
1155
1392
location = stored_loc
1157
1394
_show_push_branch(br_from, revision_id, location, self.outf,
1158
1395
verbose=verbose, overwrite=overwrite, remember=remember,
1159
1396
stacked_on=stacked_on, create_prefix=create_prefix,
1160
use_existing_dir=use_existing_dir)
1397
use_existing_dir=use_existing_dir, no_tree=no_tree)
1163
1400
class cmd_branch(Command):
1202
1443
def run(self, from_location, to_location=None, revision=None,
1203
1444
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1205
from bzrlib import switch as _mod_switch
1206
from bzrlib.tag import _merge_tags_if_possible
1207
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1445
use_existing_dir=False, switch=False, bind=False,
1447
from breezy import switch as _mod_switch
1448
if self.invoked_as in ['get', 'clone']:
1449
ui.ui_factory.show_user_warning(
1450
'deprecated_command',
1451
deprecated_name=self.invoked_as,
1452
recommended_name='branch',
1453
deprecated_in_version='2.4')
1454
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1456
if not (hardlink or files_from):
1457
# accelerator_tree is usually slower because you have to read N
1458
# files (no readahead, lots of seeks, etc), but allow the user to
1459
# explicitly request it
1460
accelerator_tree = None
1461
if files_from is not None and files_from != from_location:
1462
accelerator_tree = WorkingTree.open(files_from)
1209
1463
revision = _get_one_revision('branch', revision)
1210
1464
self.add_cleanup(br_from.lock_read().unlock)
1211
1465
if revision is not None:
1217
1471
revision_id = br_from.last_revision()
1218
1472
if to_location is None:
1219
to_location = urlutils.derive_to_location(from_location)
1473
to_location = getattr(br_from, "name", None)
1475
to_location = urlutils.derive_to_location(from_location)
1220
1476
to_transport = transport.get_transport(to_location)
1222
1478
to_transport.mkdir('.')
1223
1479
except errors.FileExists:
1224
if not use_existing_dir:
1225
raise errors.BzrCommandError('Target directory "%s" '
1226
'already exists.' % to_location)
1481
to_dir = controldir.ControlDir.open_from_transport(
1483
except errors.NotBranchError:
1484
if not use_existing_dir:
1485
raise errors.BzrCommandError(gettext('Target directory "%s" '
1486
'already exists.') % to_location)
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1491
to_dir.open_branch()
1230
1492
except errors.NotBranchError:
1233
1495
raise errors.AlreadyBranchError(to_location)
1234
1496
except errors.NoSuchFile:
1235
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1497
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1238
# preserve whatever source format we have.
1239
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1240
possible_transports=[to_transport],
1241
accelerator_tree=accelerator_tree,
1242
hardlink=hardlink, stacked=stacked,
1243
force_new_repo=standalone,
1244
create_tree_if_local=not no_tree,
1245
source_branch=br_from)
1246
branch = dir.open_branch()
1247
except errors.NoSuchRevision:
1248
to_transport.delete_tree('.')
1249
msg = "The branch %s has no revision %s." % (from_location,
1251
raise errors.BzrCommandError(msg)
1252
_merge_tags_if_possible(br_from, branch)
1503
# preserve whatever source format we have.
1504
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1505
possible_transports=[to_transport],
1506
accelerator_tree=accelerator_tree,
1507
hardlink=hardlink, stacked=stacked,
1508
force_new_repo=standalone,
1509
create_tree_if_local=not no_tree,
1510
source_branch=br_from)
1511
branch = to_dir.open_branch(
1512
possible_transports=[
1513
br_from.bzrdir.root_transport, to_transport])
1514
except errors.NoSuchRevision:
1515
to_transport.delete_tree('.')
1516
msg = gettext("The branch {0} has no revision {1}.").format(
1517
from_location, revision)
1518
raise errors.BzrCommandError(msg)
1521
to_repo = to_dir.open_repository()
1522
except errors.NoRepositoryPresent:
1523
to_repo = to_dir.create_repository()
1524
to_repo.fetch(br_from.repository, revision_id=revision_id)
1525
branch = br_from.sprout(to_dir, revision_id=revision_id)
1526
br_from.tags.merge_to(branch.tags)
1253
1528
# If the source branch is stacked, the new branch may
1254
1529
# be stacked whether we asked for that explicitly or not.
1255
1530
# We therefore need a try/except here and not just 'if stacked:'
1257
note('Created new stacked branch referring to %s.' %
1532
note(gettext('Created new stacked branch referring to %s.') %
1258
1533
branch.get_stacked_on_url())
1259
1534
except (errors.NotStacked, errors.UnstackableBranchFormat,
1260
errors.UnstackableRepositoryFormat), e:
1261
note('Branched %d revision(s).' % branch.revno())
1535
errors.UnstackableRepositoryFormat) as e:
1536
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1263
1538
# Bind to the parent
1264
1539
parent_branch = Branch.open(from_location)
1265
1540
branch.bind(parent_branch)
1266
note('New branch bound to %s' % from_location)
1541
note(gettext('New branch bound to %s') % from_location)
1268
1543
# Switch to the new branch
1269
1544
wt, _ = WorkingTree.open_containing('.')
1270
1545
_mod_switch.switch(wt.bzrdir, branch)
1271
note('Switched to branch: %s',
1546
note(gettext('Switched to branch: %s'),
1272
1547
urlutils.unescape_for_display(branch.base, 'utf-8'))
1550
class cmd_branches(Command):
1551
__doc__ = """List the branches available at the current location.
1553
This command will print the names of all the branches at the current
1557
takes_args = ['location?']
1559
Option('recursive', short_name='R',
1560
help='Recursively scan for branches rather than '
1561
'just looking in the specified location.')]
1563
def run(self, location=".", recursive=False):
1565
t = transport.get_transport(location)
1566
if not t.listable():
1567
raise errors.BzrCommandError(
1568
"Can't scan this type of location.")
1569
for b in controldir.ControlDir.find_branches(t):
1570
self.outf.write("%s\n" % urlutils.unescape_for_display(
1571
urlutils.relative_url(t.base, b.base),
1572
self.outf.encoding).rstrip("/"))
1574
dir = controldir.ControlDir.open_containing(location)[0]
1576
active_branch = dir.open_branch(name="")
1577
except errors.NotBranchError:
1578
active_branch = None
1580
for name, branch in iter_sibling_branches(dir):
1583
active = (active_branch is not None and
1584
active_branch.base == branch.base)
1585
names[name] = active
1586
# Only mention the current branch explicitly if it's not
1587
# one of the colocated branches
1588
if not any(viewvalues(names)) and active_branch is not None:
1589
self.outf.write("* %s\n" % gettext("(default)"))
1590
for name in sorted(names):
1591
active = names[name]
1596
self.outf.write("%s %s\n" % (
1597
prefix, name.encode(self.outf.encoding)))
1275
1600
class cmd_checkout(Command):
1276
1601
__doc__ = """Create a new checkout of an existing branch.
1374
1702
class cmd_update(Command):
1375
__doc__ = """Update a tree to have the latest code committed to its branch.
1377
This will perform a merge into the working tree, and may generate
1378
conflicts. If you have any local changes, you will still
1379
need to commit them after the update for the update to be complete.
1381
If you want to discard your local changes, you can just do a
1382
'bzr revert' instead of 'bzr commit' after the update.
1384
If the tree's branch is bound to a master branch, it will also update
1703
__doc__ = """Update a working tree to a new revision.
1705
This will perform a merge of the destination revision (the tip of the
1706
branch, or the specified revision) into the working tree, and then make
1707
that revision the basis revision for the working tree.
1709
You can use this to visit an older revision, or to update a working tree
1710
that is out of date from its branch.
1712
If there are any uncommitted changes in the tree, they will be carried
1713
across and remain as uncommitted changes after the update. To discard
1714
these changes, use 'brz revert'. The uncommitted changes may conflict
1715
with the changes brought in by the change in basis revision.
1717
If the tree's branch is bound to a master branch, brz will also update
1385
1718
the branch from the master.
1720
You cannot update just a single file or directory, because each Bazaar
1721
working tree has just a single basis revision. If you want to restore a
1722
file that has been removed locally, use 'brz revert' instead of 'brz
1723
update'. If you want to restore a file to its state in a previous
1724
revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write
1725
out the old content of that file to a new location.
1727
The 'dir' argument, if given, must be the location of the root of a
1728
working tree to update. By default, the working tree that contains the
1729
current working directory is used.
1388
1732
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1733
takes_args = ['dir?']
1390
takes_options = ['revision']
1734
takes_options = ['revision',
1736
help="Show base revision text in conflicts."),
1391
1738
aliases = ['up']
1393
def run(self, dir='.', revision=None):
1740
def run(self, dir=None, revision=None, show_base=None):
1394
1741
if revision is not None and len(revision) != 1:
1395
raise errors.BzrCommandError(
1396
"bzr update --revision takes exactly one revision")
1397
tree = WorkingTree.open_containing(dir)[0]
1742
raise errors.brzCommandError(gettext(
1743
"brz update --revision takes exactly one revision"))
1745
tree = WorkingTree.open_containing('.')[0]
1747
tree, relpath = WorkingTree.open_containing(dir)
1750
raise errors.BzrCommandError(gettext(
1751
"brz update can only update a whole tree, "
1752
"not a file or subdirectory"))
1398
1753
branch = tree.branch
1399
1754
possible_transports = []
1400
1755
master = branch.get_master_branch(
1436
1791
change_reporter,
1437
1792
possible_transports=possible_transports,
1438
1793
revision=revision_id,
1440
except errors.NoSuchRevision, e:
1441
raise errors.BzrCommandError(
1795
show_base=show_base)
1796
except errors.NoSuchRevision as e:
1797
raise errors.BzrCommandError(gettext(
1442
1798
"branch has no revision %s\n"
1443
"bzr update --revision only works"
1444
" for a revision in the branch history"
1799
"brz update --revision only works"
1800
" for a revision in the branch history")
1445
1801
% (e.revision))
1446
1802
revno = tree.branch.revision_id_to_dotted_revno(
1447
1803
_mod_revision.ensure_null(tree.last_revision()))
1448
note('Updated to revision %s of branch %s' %
1449
('.'.join(map(str, revno)), branch_location))
1804
note(gettext('Updated to revision {0} of branch {1}').format(
1805
'.'.join(map(str, revno)), branch_location))
1450
1806
parent_ids = tree.get_parent_ids()
1451
1807
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1452
note('Your local commits will now show as pending merges with '
1453
"'bzr status', and can be committed with 'bzr commit'.")
1808
note(gettext('Your local commits will now show as pending merges with '
1809
"'brz status', and can be committed with 'brz commit'."))
1454
1810
if conflicts != 0:
1515
1872
RegistryOption.from_kwargs('file-deletion-strategy',
1516
1873
'The file deletion mode to be used.',
1517
1874
title='Deletion Strategy', value_switches=True, enum_switch=False,
1518
safe='Only delete files if they can be'
1519
' safely recovered (default).',
1520
keep='Delete from bzr but leave the working copy.',
1521
force='Delete all the specified files, even if they can not be '
1522
'recovered and even if they are non-empty directories.')]
1875
safe='Backup changed files (default).',
1876
keep='Delete from brz but leave the working copy.',
1877
no_backup='Don\'t backup changed files.'),
1523
1879
aliases = ['rm', 'del']
1524
1880
encoding_type = 'replace'
1526
1882
def run(self, file_list, verbose=False, new=False,
1527
1883
file_deletion_strategy='safe'):
1528
tree, file_list = tree_files(file_list)
1885
tree, file_list = WorkingTree.open_containing_paths(file_list)
1530
1887
if file_list is not None:
1531
1888
file_list = [f for f in file_list]
1726
2099
to_transport.ensure_base()
1727
2100
except errors.NoSuchFile:
1728
2101
if not create_prefix:
1729
raise errors.BzrCommandError("Parent directory of %s"
2102
raise errors.BzrCommandError(gettext("Parent directory of %s"
1730
2103
" does not exist."
1731
2104
"\nYou may supply --create-prefix to create all"
1732
" leading parent directories."
2105
" leading parent directories.")
1734
2107
to_transport.create_prefix()
1737
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2110
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1738
2111
except errors.NotBranchError:
1739
2112
# really a NotBzrDir error...
1740
create_branch = bzrdir.BzrDir.create_branch_convenience
2113
create_branch = controldir.ControlDir.create_branch_convenience
2115
force_new_tree = False
2117
force_new_tree = None
1741
2118
branch = create_branch(to_transport.base, format=format,
1742
possible_transports=[to_transport])
2119
possible_transports=[to_transport],
2120
force_new_tree=force_new_tree)
1743
2121
a_bzrdir = branch.bzrdir
1745
from bzrlib.transport.local import LocalTransport
2123
from .transport.local import LocalTransport
1746
2124
if a_bzrdir.has_branch():
1747
2125
if (isinstance(to_transport, LocalTransport)
1748
2126
and not a_bzrdir.has_workingtree()):
1749
2127
raise errors.BranchExistsWithoutWorkingTree(location)
1750
2128
raise errors.AlreadyBranchError(location)
1751
2129
branch = a_bzrdir.create_branch()
1752
a_bzrdir.create_workingtree()
2130
if not no_tree and not a_bzrdir.has_workingtree():
2131
a_bzrdir.create_workingtree()
1753
2132
if append_revisions_only:
1755
2134
branch.set_append_revisions_only(True)
1756
2135
except errors.UpgradeRequired:
1757
raise errors.BzrCommandError('This branch format cannot be set'
1758
' to append-revisions-only. Try --default.')
2136
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2137
' to append-revisions-only. Try --default.'))
1759
2138
if not is_quiet():
1760
from bzrlib.info import describe_layout, describe_format
2139
from .info import describe_layout, describe_format
1762
2141
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
1763
2142
except (errors.NoWorkingTree, errors.NotLocalUrl):
1821
2201
def run(self, location, format=None, no_trees=False):
1822
2202
if format is None:
1823
format = bzrdir.format_registry.make_bzrdir('default')
2203
format = controldir.format_registry.make_bzrdir('default')
1825
2205
if location is None:
1828
2208
to_transport = transport.get_transport(location)
1829
to_transport.ensure_base()
1831
newdir = format.initialize_on_transport(to_transport)
1832
repo = newdir.create_repository(shared=True)
1833
repo.set_make_working_trees(not no_trees)
2210
(repo, newdir, require_stacking, repository_policy) = (
2211
format.initialize_on_transport_ex(to_transport,
2212
create_prefix=True, make_working_trees=not no_trees,
2213
shared_repo=True, force_new_repo=True,
2214
use_existing_dir=True,
2215
repo_format_name=format.repository_format.get_format_string()))
1834
2216
if not is_quiet():
1835
from bzrlib.info import show_bzrdir_info
1836
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2217
from .info import show_bzrdir_info
2218
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1839
2221
class cmd_diff(Command):
1859
2248
Shows the difference in the working tree versus the last commit::
1863
2252
Difference between the working tree and revision 1::
1867
2256
Difference between revision 3 and revision 1::
1871
2260
Difference between revision 3 and revision 1 for branch xxx::
1875
To see the changes introduced in revision X::
2264
The changes introduced by revision 2 (equivalent to -r1..2)::
2268
To see the changes introduced by revision X::
1879
2272
Note that in the case of a merge, the -c option shows the changes
1880
2273
compared to the left hand parent. To see the changes against
1881
2274
another parent, use::
1883
bzr diff -r<chosen_parent>..X
1885
The changes introduced by revision 2 (equivalent to -r1..2)::
2276
brz diff -r<chosen_parent>..X
2278
The changes between the current revision and the previous revision
2279
(equivalent to -c-1 and -r-2..-1)
1889
2283
Show just the differences for file NEWS::
1893
2287
Show the differences in working tree xxx for file NEWS::
1897
2291
Show the differences from branch xxx to this working tree:
1901
2295
Show the differences between two branches for file NEWS::
1903
bzr diff --old xxx --new yyy NEWS
1905
Same as 'bzr diff' but prefix paths with old/ and new/::
1907
bzr diff --prefix old/:new/
2297
brz diff --old xxx --new yyy NEWS
2299
Same as 'brz diff' but prefix paths with old/ and new/::
2301
brz diff --prefix old/:new/
2303
Show the differences using a custom diff program with options::
2305
brz diff --using /usr/bin/diff --diff-options -wu
1909
2307
_see_also = ['status']
1910
2308
takes_args = ['file*']
1917
2315
'two values separated by a colon. (eg "old/:new/").'),
1919
2317
help='Branch/tree to compare from.',
1923
2321
help='Branch/tree to compare to.',
1928
2326
Option('using',
1929
2327
help='Use this command to compare files.',
1932
2330
RegistryOption('format',
1933
2332
help='Diff format to use.',
1934
lazy_registry=('bzrlib.diff', 'format_registry'),
1935
value_switches=False, title='Diff format'),
2333
lazy_registry=('breezy.diff', 'format_registry'),
2334
title='Diff format'),
2336
help='How many lines of context to show.',
1937
2340
aliases = ['di', 'dif']
1938
2341
encoding_type = 'exact'
1940
2343
@display_command
1941
2344
def run(self, revision=None, file_list=None, diff_options=None,
1942
prefix=None, old=None, new=None, using=None, format=None):
1943
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
2345
prefix=None, old=None, new=None, using=None, format=None,
2347
from .diff import (get_trees_and_branches_to_diff_locked,
1944
2348
show_diff_trees)
1946
if (prefix is None) or (prefix == '0'):
1947
2351
# diff -p0 format
2354
elif prefix == '1' or prefix is None:
1951
2355
old_label = 'old/'
1952
2356
new_label = 'new/'
1953
2357
elif ':' in prefix:
1954
2358
old_label, new_label = prefix.split(":")
1956
raise errors.BzrCommandError(
2360
raise errors.BzrCommandError(gettext(
1957
2361
'--prefix expects two values separated by a colon'
1958
' (eg "old/:new/")')
2362
' (eg "old/:new/")'))
1960
2364
if revision and len(revision) > 2:
1961
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
' one or two revision specifiers')
2365
raise errors.BzrCommandError(gettext('brz diff --revision takes exactly'
2366
' one or two revision specifiers'))
1964
2368
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
2369
raise errors.BzrCommandError(gettext(
2370
'{0} and {1} are mutually exclusive').format(
2371
'--using', '--format'))
1968
2373
(old_tree, new_tree,
1969
2374
old_branch, new_branch,
1970
2375
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
2376
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2377
# GNU diff on Windows uses ANSI encoding for filenames
2378
path_encoding = osutils.get_diff_header_encoding()
1972
2379
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
2380
specific_files=specific_files,
1974
2381
external_diff_options=diff_options,
1975
2382
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
2383
extra_trees=extra_trees,
2384
path_encoding=path_encoding,
2385
using=using, context=context,
1977
2386
format_cls=format)
2035
2442
_see_also = ['status', 'ls']
2038
help='Write an ascii NUL (\\0) separator '
2039
'between files rather than a newline.')
2443
takes_options = ['directory', 'null']
2042
2445
@display_command
2043
def run(self, null=False):
2044
wt = WorkingTree.open_containing(u'.')[0]
2446
def run(self, null=False, directory=u'.'):
2447
wt = WorkingTree.open_containing(directory)[0]
2045
2448
self.add_cleanup(wt.lock_read().unlock)
2046
2449
basis = wt.basis_tree()
2047
2450
self.add_cleanup(basis.lock_read().unlock)
2048
basis_inv = basis.inventory
2051
if file_id in basis_inv:
2053
if inv.is_root(file_id) and len(basis_inv) == 0:
2055
path = inv.id2path(file_id)
2056
if not os.access(osutils.abspath(path), os.F_OK):
2451
root_id = wt.get_root_id()
2452
for file_id in wt.all_file_ids():
2453
if basis.has_id(file_id):
2455
if root_id == file_id:
2457
path = wt.id2path(file_id)
2458
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2059
2461
self.outf.write(path + '\0')
2221
2626
top = log -l10 --line
2222
2627
show = log -v -p
2224
``bzr tip`` will then show the latest revision while ``bzr top``
2629
``brz tip`` will then show the latest revision while ``brz top``
2225
2630
will show the last 10 mainline revisions. To see the details of a
2226
particular revision X, ``bzr show -rX``.
2631
particular revision X, ``brz show -rX``.
2228
2633
If you are interested in looking deeper into a particular merge X,
2229
use ``bzr log -n0 -rX``.
2634
use ``brz log -n0 -rX``.
2231
``bzr log -v`` on a branch with lots of history is currently
2636
``brz log -v`` on a branch with lots of history is currently
2232
2637
very slow. A fix for this issue is currently under development.
2233
2638
With or without that fix, it is recommended that a revision range
2234
2639
be given when using the -v option.
2236
bzr has a generic full-text matching plugin, bzr-search, that can be
2641
brz has a generic full-text matching plugin, brz-search, that can be
2237
2642
used to find revisions matching user names, commit messages, etc.
2238
2643
Among other features, this plugin can find all revisions containing
2239
2644
a list of words but not others.
2277
2687
Option('show-diff',
2278
2688
short_name='p',
2279
2689
help='Show changes made in each revision as a patch.'),
2280
Option('include-merges',
2690
Option('include-merged',
2281
2691
help='Show merged revisions like --levels 0 does.'),
2692
Option('include-merges', hidden=True,
2693
help='Historical alias for --include-merged.'),
2694
Option('omit-merges',
2695
help='Do not report commits with more than one parent.'),
2282
2696
Option('exclude-common-ancestry',
2283
2697
help='Display only the revisions that are not part'
2284
' of both ancestries (require -rX..Y)'
2698
' of both ancestries (require -rX..Y).'
2700
Option('signatures',
2701
help='Show digital signature validity.'),
2704
help='Show revisions whose properties match this '
2707
ListOption('match-message',
2708
help='Show revisions whose message matches this '
2711
ListOption('match-committer',
2712
help='Show revisions whose committer matches this '
2715
ListOption('match-author',
2716
help='Show revisions whose authors match this '
2719
ListOption('match-bugs',
2720
help='Show revisions whose bugs match this '
2287
2724
encoding_type = 'replace'
2505
2975
help='Recurse into subdirectories.'),
2506
2976
Option('from-root',
2507
2977
help='Print paths relative to the root of the branch.'),
2508
Option('unknown', help='Print unknown files.'),
2978
Option('unknown', short_name='u',
2979
help='Print unknown files.'),
2509
2980
Option('versioned', help='Print versioned files.',
2510
2981
short_name='V'),
2511
Option('ignored', help='Print ignored files.'),
2513
help='Write an ascii NUL (\\0) separator '
2514
'between files rather than a newline.'),
2982
Option('ignored', short_name='i',
2983
help='Print ignored files.'),
2984
Option('kind', short_name='k',
2516
2985
help='List entries of a particular kind: file, directory, symlink.',
2520
2991
@display_command
2521
2992
def run(self, revision=None, verbose=False,
2522
2993
recursive=False, from_root=False,
2523
2994
unknown=False, versioned=False, ignored=False,
2524
null=False, kind=None, show_ids=False, path=None):
2995
null=False, kind=None, show_ids=False, path=None, directory=None):
2526
2997
if kind and kind not in ('file', 'directory', 'symlink'):
2527
raise errors.BzrCommandError('invalid kind specified')
2998
raise errors.BzrCommandError(gettext('invalid kind specified'))
2529
3000
if verbose and null:
2530
raise errors.BzrCommandError('Cannot set both --verbose and --null')
3001
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2531
3002
all = not (unknown or versioned or ignored)
2533
3004
selection = {'I':ignored, '?':unknown, 'V':versioned}
2650
3122
Patterns prefixed with '!!' act as regular ignore patterns, but have
2651
3123
precedence over the '!' exception patterns.
2653
Note: ignore patterns containing shell wildcards must be quoted from
3127
* Ignore patterns containing shell wildcards must be quoted from
3130
* Ignore patterns starting with "#" act as comments in the ignore file.
3131
To ignore patterns that begin with that character, use the "RE:" prefix.
2657
3134
Ignore the top level Makefile::
2659
bzr ignore ./Makefile
3136
brz ignore ./Makefile
2661
3138
Ignore .class files in all directories...::
2663
bzr ignore "*.class"
3140
brz ignore "*.class"
2665
3142
...but do not ignore "special.class"::
2667
bzr ignore "!special.class"
2669
Ignore .o files under the lib directory::
2671
bzr ignore "lib/**/*.o"
2673
Ignore .o files under the lib directory::
2675
bzr ignore "RE:lib/.*\.o"
3144
brz ignore "!special.class"
3146
Ignore files whose name begins with the "#" character::
3150
Ignore .o files under the lib directory::
3152
brz ignore "lib/**/*.o"
3154
Ignore .o files under the lib directory::
3156
brz ignore "RE:lib/.*\.o"
2677
3158
Ignore everything but the "debian" toplevel directory::
2679
bzr ignore "RE:(?!debian/).*"
3160
brz ignore "RE:(?!debian/).*"
2681
3162
Ignore everything except the "local" toplevel directory,
2682
but always ignore "*~" autosave files, even under local/::
3163
but always ignore autosave files ending in ~, even under local/::
2685
bzr ignore "!./local"
3166
brz ignore "!./local"
2689
3170
_see_also = ['status', 'ignored', 'patterns']
2690
3171
takes_args = ['name_pattern*']
3172
takes_options = ['directory',
2692
3173
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
3174
help='Display the default ignore rules that brz uses.')
2696
def run(self, name_pattern_list=None, default_rules=None):
2697
from bzrlib import ignores
3177
def run(self, name_pattern_list=None, default_rules=None,
3179
from breezy import ignores
2698
3180
if default_rules is not None:
2699
3181
# dump the default rules and exit
2700
3182
for pattern in ignores.USER_DEFAULTS:
2701
3183
self.outf.write("%s\n" % pattern)
2703
3185
if not name_pattern_list:
2704
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
3186
raise errors.BzrCommandError(gettext("ignore requires at least one "
3187
"NAME_PATTERN or --default-rules."))
2706
3188
name_pattern_list = [globbing.normalize_pattern(p)
2707
3189
for p in name_pattern_list]
3191
bad_patterns_count = 0
3192
for p in name_pattern_list:
3193
if not globbing.Globster.is_pattern_valid(p):
3194
bad_patterns_count += 1
3195
bad_patterns += ('\n %s' % p)
3197
msg = (ngettext('Invalid ignore pattern found. %s',
3198
'Invalid ignore patterns found. %s',
3199
bad_patterns_count) % bad_patterns)
3200
ui.ui_factory.show_error(msg)
3201
raise errors.InvalidPattern('')
2708
3202
for name_pattern in name_pattern_list:
2709
3203
if (name_pattern[0] == '/' or
2710
3204
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2711
raise errors.BzrCommandError(
2712
"NAME_PATTERN should not be an absolute path")
2713
tree, relpath = WorkingTree.open_containing(u'.')
3205
raise errors.BzrCommandError(gettext(
3206
"NAME_PATTERN should not be an absolute path"))
3207
tree, relpath = WorkingTree.open_containing(directory)
2714
3208
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2715
3209
ignored = globbing.Globster(name_pattern_list)
3211
self.add_cleanup(tree.lock_read().unlock)
2718
3212
for entry in tree.list_files():
2720
3214
if id is not None:
2721
3215
filename = entry[0]
2722
3216
if ignored.match(filename):
2723
3217
matches.append(filename)
2725
3218
if len(matches) > 0:
2726
self.outf.write("Warning: the following files are version controlled and"
2727
" match your ignore pattern:\n%s"
3219
self.outf.write(gettext("Warning: the following files are version "
3220
"controlled and match your ignore pattern:\n%s"
2728
3221
"\nThese files will continue to be version controlled"
2729
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3222
" unless you 'brz remove' them.\n") % ("\n".join(matches),))
2732
3225
class cmd_ignored(Command):
2817
3313
Option('per-file-timestamps',
2818
3314
help='Set modification time of files to that of the last '
2819
3315
'revision in which it was changed.'),
3316
Option('uncommitted',
3317
help='Export the working tree contents rather than that of the '
2821
3320
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2823
from bzrlib.export import export
3321
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3323
from .export import export
2825
3325
if branch_or_subdir is None:
2826
tree = WorkingTree.open_containing(u'.')[0]
3326
branch_or_subdir = directory
3328
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3330
if tree is not None:
3331
self.add_cleanup(tree.lock_read().unlock)
3335
raise errors.BzrCommandError(
3336
gettext("--uncommitted requires a working tree"))
2830
b, subdir = Branch.open_containing(branch_or_subdir)
2833
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3339
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2835
export(rev_tree, dest, format, root, subdir, filtered=filters,
3341
export(export_tree, dest, format, root, subdir, filtered=filters,
2836
3342
per_file_timestamps=per_file_timestamps)
2837
except errors.NoSuchExportFormat, e:
2838
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3343
except errors.NoSuchExportFormat as e:
3344
raise errors.BzrCommandError(
3345
gettext('Unsupported export format: %s') % e.format)
2841
3348
class cmd_cat(Command):
2879
3386
old_file_id = rev_tree.path2id(relpath)
3388
# TODO: Split out this code to something that generically finds the
3389
# best id for a path across one or more trees; it's like
3390
# find_ids_across_trees but restricted to find just one. -- mbp
2881
3392
if name_from_revision:
2882
3393
# Try in revision if requested
2883
3394
if old_file_id is None:
2884
raise errors.BzrCommandError(
2885
"%r is not present in revision %s" % (
3395
raise errors.BzrCommandError(gettext(
3396
"{0!r} is not present in revision {1}").format(
2886
3397
filename, rev_tree.get_revision_id()))
2888
content = rev_tree.get_file_text(old_file_id)
3399
actual_file_id = old_file_id
2890
3401
cur_file_id = tree.path2id(relpath)
2892
if cur_file_id is not None:
2893
# Then try with the actual file id
2895
content = rev_tree.get_file_text(cur_file_id)
2897
except errors.NoSuchId:
2898
# The actual file id didn't exist at that time
2900
if not found and old_file_id is not None:
2901
# Finally try with the old file id
2902
content = rev_tree.get_file_text(old_file_id)
2905
# Can't be found anywhere
2906
raise errors.BzrCommandError(
2907
"%r is not present in revision %s" % (
3402
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3403
actual_file_id = cur_file_id
3404
elif old_file_id is not None:
3405
actual_file_id = old_file_id
3407
raise errors.BzrCommandError(gettext(
3408
"{0!r} is not present in revision {1}").format(
2908
3409
filename, rev_tree.get_revision_id()))
2910
from bzrlib.filters import (
2911
ContentFilterContext,
2912
filtered_output_bytes,
2914
filters = rev_tree._content_filter_stack(relpath)
2915
chunks = content.splitlines(True)
2916
content = filtered_output_bytes(chunks, filters,
2917
ContentFilterContext(relpath, rev_tree))
2919
self.outf.writelines(content)
3411
from .filter_tree import ContentFilterTree
3412
filter_tree = ContentFilterTree(rev_tree,
3413
rev_tree._content_filter_stack)
3414
content = filter_tree.get_file_text(actual_file_id)
2922
self.outf.write(content)
3416
content = rev_tree.get_file_text(actual_file_id)
3418
self.outf.write(content)
2925
3421
class cmd_local_time_offset(Command):
2973
3469
A common mistake is to forget to add a new file or directory before
2974
3470
running the commit command. The --strict option checks for unknown
2975
3471
files and aborts the commit if any are found. More advanced pre-commit
2976
checks can be implemented by defining hooks. See ``bzr help hooks``
3472
checks can be implemented by defining hooks. See ``brz help hooks``
2979
3475
:Things to note:
2981
3477
If you accidentially commit the wrong changes or make a spelling
2982
3478
mistake in the commit message say, you can use the uncommit command
2983
to undo it. See ``bzr help uncommit`` for details.
3479
to undo it. See ``brz help uncommit`` for details.
2985
3481
Hooks can also be configured to run after a commit. This allows you
2986
3482
to trigger updates to external systems like bug trackers. The --fixes
2987
3483
option can be used to record the association between a revision and
2988
one or more bugs. See ``bzr help bugs`` for details.
2990
A selective commit may fail in some cases where the committed
2991
tree would be invalid. Consider::
2996
bzr commit foo -m "committing foo"
2997
bzr mv foo/bar foo/baz
3000
bzr commit foo/bar -m "committing bar but not baz"
3002
In the example above, the last commit will fail by design. This gives
3003
the user the opportunity to decide whether they want to commit the
3004
rename at the same time, separately first, or not at all. (As a general
3005
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3484
one or more bugs. See ``brz help bugs`` for details.
3007
# TODO: Run hooks on tree to-be-committed, and after commit.
3009
# TODO: Strict commit that fails if there are deleted files.
3010
# (what does "deleted files" mean ??)
3012
# TODO: Give better message for -s, --summary, used by tla people
3014
# XXX: verbose currently does nothing
3016
3487
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3017
3488
takes_args = ['selected*']
3018
3489
takes_options = [
3019
3490
ListOption('exclude', type=str, short_name='x',
3020
3491
help="Do not consider changes made to a given path."),
3021
Option('message', type=unicode,
3492
Option('message', type=text_type,
3022
3493
short_name='m',
3023
3494
help="Description of the new revision."),
3049
3520
Option('show-diff', short_name='p',
3050
3521
help='When no message is supplied, show the diff along'
3051
3522
' with the status summary in the message editor.'),
3524
help='When committing to a foreign version control '
3525
'system do not push data that can not be natively '
3053
3528
aliases = ['ci', 'checkin']
3055
3530
def _iter_bug_fix_urls(self, fixes, branch):
3531
default_bugtracker = None
3056
3532
# Configure the properties for bug fixing attributes.
3057
3533
for fixed_bug in fixes:
3058
3534
tokens = fixed_bug.split(':')
3059
if len(tokens) != 2:
3060
raise errors.BzrCommandError(
3535
if len(tokens) == 1:
3536
if default_bugtracker is None:
3537
branch_config = branch.get_config_stack()
3538
default_bugtracker = branch_config.get(
3540
if default_bugtracker is None:
3541
raise errors.BzrCommandError(gettext(
3542
"No tracker specified for bug %s. Use the form "
3543
"'tracker:id' or specify a default bug tracker "
3544
"using the `bugtracker` option.\nSee "
3545
"\"brz help bugs\" for more information on this "
3546
"feature. Commit refused.") % fixed_bug)
3547
tag = default_bugtracker
3549
elif len(tokens) != 2:
3550
raise errors.BzrCommandError(gettext(
3061
3551
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3062
"See \"bzr help bugs\" for more information on this "
3063
"feature.\nCommit refused." % fixed_bug)
3064
tag, bug_id = tokens
3552
"See \"brz help bugs\" for more information on this "
3553
"feature.\nCommit refused.") % fixed_bug)
3555
tag, bug_id = tokens
3066
3557
yield bugtracker.get_bug_url(tag, branch, bug_id)
3067
3558
except errors.UnknownBugTrackerAbbreviation:
3068
raise errors.BzrCommandError(
3069
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3070
except errors.MalformedBugIdentifier, e:
3071
raise errors.BzrCommandError(
3072
"%s\nCommit refused." % (str(e),))
3559
raise errors.BzrCommandError(gettext(
3560
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3561
except errors.MalformedBugIdentifier as e:
3562
raise errors.BzrCommandError(gettext(
3563
"%s\nCommit refused.") % (str(e),))
3074
3565
def run(self, message=None, file=None, verbose=False, selected_list=None,
3075
3566
unchanged=False, strict=False, local=False, fixes=None,
3076
author=None, show_diff=False, exclude=None, commit_time=None):
3077
from bzrlib.errors import (
3567
author=None, show_diff=False, exclude=None, commit_time=None,
3569
from .errors import (
3078
3570
PointlessCommit,
3079
3571
ConflictsInTree,
3080
3572
StrictCommitFailed
3082
from bzrlib.msgeditor import (
3574
from .msgeditor import (
3083
3575
edit_commit_message_encoded,
3084
3576
generate_commit_message_template,
3085
make_commit_message_template_encoded
3577
make_commit_message_template_encoded,
3088
3581
commit_stamp = offset = None
3089
3582
if commit_time is not None:
3091
3584
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3092
except ValueError, e:
3093
raise errors.BzrCommandError(
3094
"Could not parse --commit-time: " + str(e))
3096
# TODO: Need a blackbox test for invoking the external editor; may be
3097
# slightly problematic to run this cross-platform.
3099
# TODO: do more checks that the commit will succeed before
3100
# spending the user's valuable time typing a commit message.
3585
except ValueError as e:
3586
raise errors.BzrCommandError(gettext(
3587
"Could not parse --commit-time: " + str(e)))
3102
3589
properties = {}
3104
tree, selected_list = tree_files(selected_list)
3591
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3105
3592
if selected_list == ['']:
3106
3593
# workaround - commit of root of tree should be exactly the same
3107
3594
# as just default commit in that tree, and succeed even though
3178
3673
reporter=None, verbose=verbose, revprops=properties,
3179
3674
authors=author, timestamp=commit_stamp,
3180
3675
timezone=offset,
3181
exclude=safe_relpath_files(tree, exclude))
3676
exclude=tree.safe_relpath_files(exclude),
3182
3678
except PointlessCommit:
3183
raise errors.BzrCommandError("No changes to commit."
3184
" Use --unchanged to commit anyhow.")
3679
raise errors.BzrCommandError(gettext("No changes to commit."
3680
" Please 'brz add' the files you want to commit, or use"
3681
" --unchanged to force an empty commit."))
3185
3682
except ConflictsInTree:
3186
raise errors.BzrCommandError('Conflicts detected in working '
3187
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3683
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3684
'tree. Use "brz conflicts" to list, "brz resolve FILE" to'
3189
3686
except StrictCommitFailed:
3190
raise errors.BzrCommandError("Commit refused because there are"
3191
" unknown files in the working tree.")
3192
except errors.BoundBranchOutOfDate, e:
3193
e.extra_help = ("\n"
3687
raise errors.BzrCommandError(gettext("Commit refused because there are"
3688
" unknown files in the working tree."))
3689
except errors.BoundBranchOutOfDate as e:
3690
e.extra_help = (gettext("\n"
3194
3691
'To commit to master branch, run update and then commit.\n'
3195
3692
'You can also pass --local to commit to continue working '
3270
3767
class cmd_upgrade(Command):
3271
__doc__ = """Upgrade branch storage to current format.
3273
The check command or bzr developers may sometimes advise you to run
3274
this command. When the default format has changed you may also be warned
3275
during other operations to upgrade.
3768
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3770
When the default format has changed after a major new release of
3771
Bazaar, you may be informed during certain operations that you
3772
should upgrade. Upgrading to a newer format may improve performance
3773
or make new features available. It may however limit interoperability
3774
with older repositories or with older versions of Bazaar.
3776
If you wish to upgrade to a particular format rather than the
3777
current default, that can be specified using the --format option.
3778
As a consequence, you can use the upgrade command this way to
3779
"downgrade" to an earlier format, though some conversions are
3780
a one way process (e.g. changing from the 1.x default to the
3781
2.x default) so downgrading is not always possible.
3783
A backup.bzr.~#~ directory is created at the start of the conversion
3784
process (where # is a number). By default, this is left there on
3785
completion. If the conversion fails, delete the new .bzr directory
3786
and rename this one back in its place. Use the --clean option to ask
3787
for the backup.bzr directory to be removed on successful conversion.
3788
Alternatively, you can delete it by hand if everything looks good
3791
If the location given is a shared repository, dependent branches
3792
are also converted provided the repository converts successfully.
3793
If the conversion of a branch fails, remaining branches are still
3796
For more information on upgrades, see the Bazaar Upgrade Guide,
3797
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3278
_see_also = ['check']
3800
_see_also = ['check', 'reconcile', 'formats']
3279
3801
takes_args = ['url?']
3280
3802
takes_options = [
3281
RegistryOption('format',
3282
help='Upgrade to a specific format. See "bzr help'
3283
' formats" for details.',
3284
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3285
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3286
value_switches=True, title='Branch format'),
3803
RegistryOption('format',
3804
help='Upgrade to a specific format. See "brz help'
3805
' formats" for details.',
3806
lazy_registry=('breezy.controldir', 'format_registry'),
3807
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3808
value_switches=True, title='Branch format'),
3810
help='Remove the backup.bzr directory if successful.'),
3812
help="Show what would be done, but don't actually do anything."),
3289
def run(self, url='.', format=None):
3290
from bzrlib.upgrade import upgrade
3291
upgrade(url, format)
3815
def run(self, url='.', format=None, clean=False, dry_run=False):
3816
from .upgrade import upgrade
3817
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3819
if len(exceptions) == 1:
3820
# Compatibility with historical behavior
3294
3826
class cmd_whoami(Command):
3295
__doc__ = """Show or set bzr user id.
3827
__doc__ = """Show or set brz user id.
3298
3830
Show the email of the current user::
3302
3834
Set the current user::
3304
bzr whoami "Frank Chu <fchu@example.com>"
3836
brz whoami "Frank Chu <fchu@example.com>"
3306
takes_options = [ Option('email',
3838
takes_options = [ 'directory',
3307
3840
help='Display email address only.'),
3308
3841
Option('branch',
3309
3842
help='Set identity for the current branch instead of '
3313
3846
encoding_type = 'replace'
3315
3848
@display_command
3316
def run(self, email=False, branch=False, name=None):
3849
def run(self, email=False, branch=False, name=None, directory=None):
3317
3850
if name is None:
3318
# use branch if we're inside one; otherwise global config
3320
c = Branch.open_containing('.')[0].get_config()
3321
except errors.NotBranchError:
3322
c = config.GlobalConfig()
3851
if directory is None:
3852
# use branch if we're inside one; otherwise global config
3854
c = Branch.open_containing(u'.')[0].get_config_stack()
3855
except errors.NotBranchError:
3856
c = _mod_config.GlobalStack()
3858
c = Branch.open(directory).get_config_stack()
3859
identity = c.get('email')
3324
self.outf.write(c.user_email() + '\n')
3861
self.outf.write(_mod_config.extract_email_address(identity)
3326
self.outf.write(c.username() + '\n')
3864
self.outf.write(identity + '\n')
3868
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3329
3871
# display a warning if an email address isn't included in the given name.
3331
config.extract_email_address(name)
3332
except errors.NoEmailInUsername, e:
3873
_mod_config.extract_email_address(name)
3874
except errors.NoEmailInUsername as e:
3333
3875
warning('"%s" does not seem to contain an email address. '
3334
3876
'This is allowed, but not recommended.', name)
3336
3878
# use global config unless --branch given
3338
c = Branch.open_containing('.')[0].get_config()
3880
if directory is None:
3881
c = Branch.open_containing(u'.')[0].get_config_stack()
3883
b = Branch.open(directory)
3884
self.add_cleanup(b.lock_write().unlock)
3885
c = b.get_config_stack()
3340
c = config.GlobalConfig()
3341
c.set_user_option('email', name)
3887
c = _mod_config.GlobalStack()
3888
c.set('email', name)
3344
3891
class cmd_nick(Command):
3345
3892
__doc__ = """Print or set the branch nickname.
3347
If unset, the tree root directory name is used as the nickname.
3348
To print the current nickname, execute with no argument.
3894
If unset, the colocated branch name is used for colocated branches, and
3895
the branch directory name is used for other branches. To print the
3896
current nickname, execute with no argument.
3350
3898
Bound branches use the nickname of its master branch unless it is set
3406
3955
def remove_alias(self, alias_name):
3407
3956
if alias_name is None:
3408
raise errors.BzrCommandError(
3409
'bzr alias --remove expects an alias to remove.')
3957
raise errors.BzrCommandError(gettext(
3958
'brz alias --remove expects an alias to remove.'))
3410
3959
# If alias is not found, print something like:
3411
3960
# unalias: foo: not found
3412
c = config.GlobalConfig()
3961
c = _mod_config.GlobalConfig()
3413
3962
c.unset_alias(alias_name)
3415
3964
@display_command
3416
3965
def print_aliases(self):
3417
3966
"""Print out the defined aliases in a similar format to bash."""
3418
aliases = config.GlobalConfig().get_aliases()
3419
for key, value in sorted(aliases.iteritems()):
3420
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3967
aliases = _mod_config.GlobalConfig().get_aliases()
3968
for key, value in sorted(viewitems(aliases)):
3969
self.outf.write('brz alias %s="%s"\n' % (key, value))
3422
3971
@display_command
3423
3972
def print_alias(self, alias_name):
3424
from bzrlib.commands import get_alias
3973
from .commands import get_alias
3425
3974
alias = get_alias(alias_name)
3426
3975
if alias is None:
3427
self.outf.write("bzr alias: %s: not found\n" % alias_name)
3976
self.outf.write("brz alias: %s: not found\n" % alias_name)
3429
3978
self.outf.write(
3430
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3979
'brz alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3432
3981
def set_alias(self, alias_name, alias_command):
3433
3982
"""Save the alias in the global config."""
3434
c = config.GlobalConfig()
3983
c = _mod_config.GlobalConfig()
3435
3984
c.set_alias(alias_name, alias_command)
3469
4018
Tests that need working space on disk use a common temporary directory,
3470
4019
typically inside $TMPDIR or /tmp.
3472
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
4021
If you set BRZ_TEST_PDB=1 when running selftest, failing tests will drop
3473
4022
into a pdb postmortem session.
4024
The --coverage=DIRNAME global option produces a report with covered code
3476
4028
Run only tests relating to 'ignore'::
3480
4032
Disable plugins and list tests as they're run::
3482
bzr --no-plugins selftest -v
4034
brz --no-plugins selftest -v
3484
4036
# NB: this is used from the class without creating an instance, which is
3485
4037
# why it does not have a self parameter.
3486
4038
def get_transport_type(typestring):
3487
4039
"""Parse and return a transport specifier."""
3488
4040
if typestring == "sftp":
3489
from bzrlib.tests import stub_sftp
4041
from .tests import stub_sftp
3490
4042
return stub_sftp.SFTPAbsoluteServer
3491
if typestring == "memory":
3492
from bzrlib.tests import test_server
4043
elif typestring == "memory":
4044
from .tests import test_server
3493
4045
return memory.MemoryServer
3494
if typestring == "fakenfs":
3495
from bzrlib.tests import test_server
4046
elif typestring == "fakenfs":
4047
from .tests import test_server
3496
4048
return test_server.FakeNFSServer
3497
4049
msg = "No known transport type %s. Supported types are: sftp\n" %\
3527
4077
help='List the tests instead of running them.'),
3528
4078
RegistryOption('parallel',
3529
4079
help="Run the test suite in parallel.",
3530
lazy_registry=('bzrlib.tests', 'parallel_registry'),
4080
lazy_registry=('breezy.tests', 'parallel_registry'),
3531
4081
value_switches=False,
3533
4083
Option('randomize', type=str, argname="SEED",
3534
4084
help='Randomize the order of tests using the given'
3535
4085
' seed or "now" for the current time.'),
3536
Option('exclude', type=str, argname="PATTERN",
3538
help='Exclude tests that match this regular'
4086
ListOption('exclude', type=str, argname="PATTERN",
4088
help='Exclude tests that match this regular'
3540
4090
Option('subunit',
3541
4091
help='Output test progress via subunit.'),
3542
4092
Option('strict', help='Fail on missing dependencies or '
3559
4112
def run(self, testspecs_list=None, verbose=False, one=False,
3560
4113
transport=None, benchmark=None,
3561
lsprof_timed=None, cache_dir=None,
3562
4115
first=False, list_only=False,
3563
4116
randomize=None, exclude=None, strict=False,
3564
4117
load_list=None, debugflag=None, starting_with=None, subunit=False,
3565
parallel=None, lsprof_tests=False):
3566
from bzrlib.tests import selftest
3567
import bzrlib.benchmarks as benchmarks
3568
from bzrlib.benchmarks import tree_creator
3570
# Make deprecation warnings visible, unless -Werror is set
3571
symbol_versioning.activate_deprecation_warnings(override=False)
3573
if cache_dir is not None:
3574
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
4118
parallel=None, lsprof_tests=False,
4121
# During selftest, disallow proxying, as it can cause severe
4122
# performance penalties and is only needed for thread
4123
# safety. The selftest command is assumed to not use threads
4124
# too heavily. The call should be as early as possible, as
4125
# error reporting for past duplicate imports won't have useful
4127
lazy_import.disallow_proxying()
3575
4131
if testspecs_list is not None:
3576
4132
pattern = '|'.join(testspecs_list)
3581
from bzrlib.tests import SubUnitBzrRunner
4137
from .tests import SubUnitBzrRunner
3582
4138
except ImportError:
3583
raise errors.BzrCommandError("subunit not available. subunit "
3584
"needs to be installed to use --subunit.")
4139
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4140
"needs to be installed to use --subunit."))
3585
4141
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3586
4142
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
4143
# stdout, which would corrupt the subunit stream.
3588
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4144
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4145
# following code can be deleted when it's sufficiently deployed
4146
# -- vila/mgz 20100514
4147
if (sys.platform == "win32"
4148
and getattr(sys.stdout, 'fileno', None) is not None):
3590
4150
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3592
4152
self.additional_selftest_args.setdefault(
3593
4153
'suite_decorators', []).append(parallel)
3595
test_suite_factory = benchmarks.test_suite
3596
# Unless user explicitly asks for quiet, be verbose in benchmarks
3597
verbose = not is_quiet()
3598
# TODO: should possibly lock the history file...
3599
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
4155
raise errors.BzrCommandError(gettext(
4156
"--benchmark is no longer supported from brz 2.2; "
4157
"use bzr-usertest instead"))
4158
test_suite_factory = None
4160
exclude_pattern = None
3602
test_suite_factory = None
4162
exclude_pattern = '(' + '|'.join(exclude) + ')'
4164
self._disable_fsync()
3604
4165
selftest_kwargs = {"verbose": verbose,
3605
4166
"pattern": pattern,
3606
4167
"stop_on_failure": one,
3608
4169
"test_suite_factory": test_suite_factory,
3609
4170
"lsprof_timed": lsprof_timed,
3610
4171
"lsprof_tests": lsprof_tests,
3611
"bench_history": benchfile,
3612
4172
"matching_tests_first": first,
3613
4173
"list_only": list_only,
3614
4174
"random_seed": randomize,
3615
"exclude_pattern": exclude,
4175
"exclude_pattern": exclude_pattern,
3616
4176
"strict": strict,
3617
4177
"load_list": load_list,
3618
4178
"debug_flags": debugflag,
3619
4179
"starting_with": starting_with
3621
4181
selftest_kwargs.update(self.additional_selftest_args)
3622
result = selftest(**selftest_kwargs)
4183
# Make deprecation warnings visible, unless -Werror is set
4184
cleanup = symbol_versioning.activate_deprecation_warnings(
4187
result = tests.selftest(**selftest_kwargs)
3623
4190
return int(not result)
4192
def _disable_fsync(self):
4193
"""Change the 'os' functionality to not synchronize."""
4194
self._orig_fsync = getattr(os, 'fsync', None)
4195
if self._orig_fsync is not None:
4196
os.fsync = lambda filedes: None
4197
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4198
if self._orig_fdatasync is not None:
4199
os.fdatasync = lambda filedes: None
3626
4202
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
4203
__doc__ = """Show version of brz."""
3629
4205
encoding_type = 'replace'
3630
4206
takes_options = [
3680
4256
The source of the merge can be specified either in the form of a branch,
3681
4257
or in the form of a path to a file containing a merge directive generated
3682
with bzr send. If neither is specified, the default is the upstream branch
3683
or the branch most recently merged using --remember.
3685
When merging a branch, by default the tip will be merged. To pick a different
3686
revision, pass --revision. If you specify two values, the first will be used as
3687
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3688
available revisions, like this is commonly referred to as "cherrypicking".
3690
Revision numbers are always relative to the branch being merged.
3692
By default, bzr will try to merge in all new work from the other
3693
branch, automatically determining an appropriate base. If this
3694
fails, you may need to give an explicit base.
4258
with brz send. If neither is specified, the default is the upstream branch
4259
or the branch most recently merged using --remember. The source of the
4260
merge may also be specified in the form of a path to a file in another
4261
branch: in this case, only the modifications to that file are merged into
4262
the current working tree.
4264
When merging from a branch, by default brz will try to merge in all new
4265
work from the other branch, automatically determining an appropriate base
4266
revision. If this fails, you may need to give an explicit base.
4268
To pick a different ending revision, pass "--revision OTHER". brz will
4269
try to merge in all new work up to and including revision OTHER.
4271
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4272
through OTHER, excluding BASE but including OTHER, will be merged. If this
4273
causes some revisions to be skipped, i.e. if the destination branch does
4274
not already contain revision BASE, such a merge is commonly referred to as
4275
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4276
cherrypicks. The changes look like a normal commit, and the history of the
4277
changes from the other branch is not stored in the commit.
4279
Revision numbers are always relative to the source branch.
3696
4281
Merge will do its best to combine the changes in two branches, but there
3697
4282
are some kinds of problems only a human can fix. When it encounters those,
3698
4283
it will mark a conflict. A conflict means that you need to fix something,
3699
before you should commit.
3701
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3703
If there is no default branch set, the first merge will set it. After
3704
that, you can omit the branch to use the default. To change the
3705
default, use --remember. The value will only be saved if the remote
3706
location can be accessed.
4284
before you can commit.
4286
Use brz resolve when you have fixed a problem. See also brz conflicts.
4288
If there is no default branch set, the first merge will set it (use
4289
--no-remember to avoid setting it). After that, you can omit the branch
4290
to use the default. To change the default, use --remember. The value will
4291
only be saved if the remote location can be accessed.
3708
4293
The results of the merge are placed into the destination working
3709
directory, where they can be reviewed (with bzr diff), tested, and then
4294
directory, where they can be reviewed (with brz diff), tested, and then
3710
4295
committed to record the result of the merge.
3712
4297
merge refuses to run if there are any uncommitted changes, unless
3713
--force is given. The --force option can also be used to create a
4298
--force is given. If --force is given, then the changes from the source
4299
will be merged with the current working tree, including any uncommitted
4300
changes in the tree. The --force option can also be used to create a
3714
4301
merge revision which has more than two parents.
3716
4303
If one would like to merge changes from the working tree of the other
3843
4431
self.sanity_check_merger(merger)
3844
4432
if (merger.base_rev_id == merger.other_rev_id and
3845
4433
merger.other_rev_id is not None):
3846
note('Nothing to do.')
4434
# check if location is a nonexistent file (and not a branch) to
4435
# disambiguate the 'Nothing to do'
4436
if merger.interesting_files:
4437
if not merger.other_tree.has_filename(
4438
merger.interesting_files[0]):
4439
note(gettext("merger: ") + str(merger))
4440
raise errors.PathsDoNotExist([location])
4441
note(gettext('Nothing to do.'))
4443
if pull and not preview:
3849
4444
if merger.interesting_files is not None:
3850
raise errors.BzrCommandError('Cannot pull individual files')
4445
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3851
4446
if (merger.base_rev_id == tree.last_revision()):
3852
4447
result = tree.pull(merger.other_branch, False,
3853
4448
merger.other_rev_id)
3854
4449
result.report(self.outf)
3856
4451
if merger.this_basis is None:
3857
raise errors.BzrCommandError(
4452
raise errors.BzrCommandError(gettext(
3858
4453
"This branch has no commits."
3859
" (perhaps you would prefer 'bzr pull')")
4454
" (perhaps you would prefer 'brz pull')"))
3861
4456
return self._do_preview(merger)
3862
4457
elif interactive:
3958
4554
if other_revision_id is None:
3959
4555
other_revision_id = _mod_revision.ensure_null(
3960
4556
other_branch.last_revision())
3961
# Remember where we merge from
3962
if ((remember or tree.branch.get_submit_branch() is None) and
3963
user_location is not None):
4557
# Remember where we merge from. We need to remember if:
4558
# - user specify a location (and we don't merge from the parent
4560
# - user ask to remember or there is no previous location set to merge
4561
# from and user didn't ask to *not* remember
4562
if (user_location is not None
4564
or (remember is None
4565
and tree.branch.get_submit_branch() is None)))):
3964
4566
tree.branch.set_submit_branch(other_branch.base)
3965
_merge_tags_if_possible(other_branch, tree.branch)
4567
# Merge tags (but don't set them in the master branch yet, the user
4568
# might revert this merge). Commit will propagate them.
4569
other_branch.tags.merge_to(tree.branch.tags, ignore_master=True)
3966
4570
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3967
4571
other_revision_id, base_revision_id, other_branch, base_branch)
3968
4572
if other_path != '':
4131
4736
class cmd_revert(Command):
4132
__doc__ = """Revert files to a previous revision.
4738
Set files in the working tree back to the contents of a previous revision.
4134
4740
Giving a list of files will revert only those files. Otherwise, all files
4135
4741
will be reverted. If the revision is not specified with '--revision', the
4136
last committed revision is used.
4742
working tree basis revision is used. A revert operation affects only the
4743
working tree, not any revision history like the branch and repository or
4744
the working tree basis revision.
4138
4746
To remove only some changes, without reverting to a prior version, use
4139
merge instead. For example, "merge . --revision -2..-3" will remove the
4140
changes introduced by -2, without affecting the changes introduced by -1.
4141
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4747
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4748
will remove the changes introduced by the second last commit (-2), without
4749
affecting the changes introduced by the last commit (-1). To remove
4750
certain changes on a hunk-by-hunk basis, see the shelve command.
4751
To update the branch to a specific revision or the latest revision and
4752
update the working tree accordingly while preserving local changes, see the
4143
By default, any files that have been manually changed will be backed up
4144
first. (Files changed only by merge are not backed up.) Backup files have
4145
'.~#~' appended to their name, where # is a number.
4755
Uncommitted changes to files that are reverted will be discarded.
4756
Howver, by default, any files that have been manually changed will be
4757
backed up first. (Files changed only by merge are not backed up.) Backup
4758
files have '.~#~' appended to their name, where # is a number.
4147
4760
When you provide files, you can use their current pathname or the pathname
4148
4761
from the target revision. So you can use revert to "undelete" a file by
4385
5010
if remote_extra and not mine_only:
4386
5011
if printed_local is True:
4387
5012
message("\n\n\n")
4388
message("You are missing %d revision(s):\n" %
5013
message(ngettext("You are missing %d revision:\n",
5014
"You are missing %d revisions:\n",
5015
len(remote_extra)) %
4389
5016
len(remote_extra))
5017
if remote_branch.supports_tags():
5018
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4390
5019
for revision in iter_log_revisions(remote_extra,
4391
5020
remote_branch.repository,
4393
5023
lf.log_revision(revision)
4394
5024
status_code = 1
4396
5026
if mine_only and not local_extra:
4397
5027
# We checked local, and found nothing extra
4398
message('This branch is up to date.\n')
5028
message(gettext('This branch has no new revisions.\n'))
4399
5029
elif theirs_only and not remote_extra:
4400
5030
# We checked remote, and found nothing extra
4401
message('Other branch is up to date.\n')
5031
message(gettext('Other branch has no new revisions.\n'))
4402
5032
elif not (mine_only or theirs_only or local_extra or
4404
5034
# We checked both branches, and neither one had extra
4406
message("Branches are up to date.\n")
5036
message(gettext("Branches are up to date.\n"))
4407
5037
self.cleanup_now()
4408
5038
if not status_code and parent is None and other_branch is not None:
4409
5039
self.add_cleanup(local_branch.lock_write().unlock)
4542
5157
Option('long', help='Show commit date in annotations.'),
4546
5162
encoding_type = 'exact'
4548
5164
@display_command
4549
5165
def run(self, filename, all=False, long=False, revision=None,
4551
from bzrlib.annotate import annotate_file, annotate_file_tree
5166
show_ids=False, directory=None):
5167
from .annotate import (
4552
5170
wt, branch, relpath = \
4553
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5171
_open_directory_or_containing_tree_or_branch(filename, directory)
4554
5172
if wt is not None:
4555
5173
self.add_cleanup(wt.lock_read().unlock)
4557
5175
self.add_cleanup(branch.lock_read().unlock)
4558
5176
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
5177
self.add_cleanup(tree.lock_read().unlock)
5178
if wt is not None and revision is None:
4561
5179
file_id = wt.path2id(relpath)
4563
5181
file_id = tree.path2id(relpath)
4564
5182
if file_id is None:
4565
5183
raise errors.NotVersionedError(filename)
4566
file_version = tree.inventory[file_id].revision
4567
5184
if wt is not None and revision is None:
4568
5185
# If there is a tree and we're not annotating historical
4569
5186
# versions, annotate the working tree's content.
4570
5187
annotate_file_tree(wt, file_id, self.outf, long, all,
4571
5188
show_ids=show_ids)
4573
annotate_file(branch, file_version, file_id, long, all, self.outf,
5190
annotate_file_tree(tree, file_id, self.outf, long, all,
5191
show_ids=show_ids, branch=branch)
4577
5194
class cmd_re_sign(Command):
4581
5198
hidden = True # is this right ?
4582
5199
takes_args = ['revision_id*']
4583
takes_options = ['revision']
5200
takes_options = ['directory', 'revision']
4585
def run(self, revision_id_list=None, revision=None):
5202
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4586
5203
if revision_id_list is not None and revision is not None:
4587
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5204
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4588
5205
if revision_id_list is None and revision is None:
4589
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
b = WorkingTree.open_containing(u'.')[0].branch
5206
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5207
b = WorkingTree.open_containing(directory)[0].branch
4591
5208
self.add_cleanup(b.lock_write().unlock)
4592
5209
return self._run(b, revision_id_list, revision)
4594
5211
def _run(self, b, revision_id_list, revision):
4595
import bzrlib.gpg as gpg
4596
gpg_strategy = gpg.GPGStrategy(b.get_config())
5213
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4597
5214
if revision_id_list is not None:
4598
5215
b.repository.start_write_group()
4654
5271
_see_also = ['checkouts', 'unbind']
4655
5272
takes_args = ['location?']
5273
takes_options = ['directory']
4658
def run(self, location=None):
4659
b, relpath = Branch.open_containing(u'.')
5275
def run(self, location=None, directory=u'.'):
5276
b, relpath = Branch.open_containing(directory)
4660
5277
if location is None:
4662
5279
location = b.get_old_bound_location()
4663
5280
except errors.UpgradeRequired:
4664
raise errors.BzrCommandError('No location supplied. '
4665
'This format does not remember old locations.')
5281
raise errors.BzrCommandError(gettext('No location supplied. '
5282
'This format does not remember old locations.'))
4667
5284
if location is None:
4668
5285
if b.get_bound_location() is not None:
4669
raise errors.BzrCommandError('Branch is already bound')
5286
raise errors.BzrCommandError(
5287
gettext('Branch is already bound'))
4671
raise errors.BzrCommandError('No location supplied '
4672
'and no previous location known')
5289
raise errors.BzrCommandError(
5290
gettext('No location supplied'
5291
' and no previous location known'))
4673
5292
b_other = Branch.open(location)
4675
5294
b.bind(b_other)
4676
5295
except errors.DivergedBranches:
4677
raise errors.BzrCommandError('These branches have diverged.'
4678
' Try merging, and then bind again.')
5296
raise errors.BzrCommandError(gettext('These branches have diverged.'
5297
' Try merging, and then bind again.'))
4679
5298
if b.get_config().has_explicit_nickname():
4680
5299
b.nick = b_other.nick
4747
5367
self.add_cleanup(tree.lock_write().unlock)
4749
5369
self.add_cleanup(b.lock_write().unlock)
4750
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5370
return self._run(b, tree, dry_run, verbose, revision, force,
4752
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4753
from bzrlib.log import log_formatter, show_log
4754
from bzrlib.uncommit import uncommit
5373
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5375
from .log import log_formatter, show_log
5376
from .uncommit import uncommit
4756
5378
last_revno, last_rev_id = b.last_revision_info()
4785
5407
end_revision=last_revno)
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
5410
self.outf.write(gettext('Dry-run, pretending to remove'
5411
' the above revisions.\n'))
4791
self.outf.write('The above revision(s) will be removed.\n')
5413
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4794
if not ui.ui_factory.get_boolean('Are you sure'):
4795
self.outf.write('Canceled')
5416
if not ui.ui_factory.confirm_action(
5417
gettext(u'Uncommit these revisions'),
5418
'breezy.builtins.uncommit',
5420
self.outf.write(gettext('Canceled\n'))
4798
5423
mutter('Uncommitting from {%s} to {%s}',
4799
5424
last_rev_id, rev_id)
4800
5425
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
revno=revno, local=local)
4802
self.outf.write('You can restore the old tip by running:\n'
4803
' bzr pull . -r revid:%s\n' % last_rev_id)
5426
revno=revno, local=local, keep_tags=keep_tags)
5427
self.outf.write(gettext('You can restore the old tip by running:\n'
5428
' brz pull . -r revid:%s\n') % last_rev_id)
4806
5431
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
5432
__doc__ = """Break a dead lock.
5434
This command breaks a lock on a repository, branch, working directory or
4809
5437
CAUTION: Locks should only be broken when you are sure that the process
4810
5438
holding the lock has been stopped.
4812
You can get information on what locks are open via the 'bzr info
5440
You can get information on what locks are open via the 'brz info
4813
5441
[location]' command.
4817
bzr break-lock bzr+ssh://example.com/bzr/foo
5445
brz break-lock brz+ssh://example.com/brz/foo
5446
brz break-lock --conf ~/.bazaar
4819
5449
takes_args = ['location?']
5452
help='LOCATION is the directory where the config lock is.'),
5454
help='Do not ask for confirmation before breaking the lock.'),
4821
def run(self, location=None, show=False):
5457
def run(self, location=None, config=False, force=False):
4822
5458
if location is None:
4823
5459
location = u'.'
4824
control, relpath = bzrdir.BzrDir.open_containing(location)
4826
control.break_lock()
4827
except NotImplementedError:
5461
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5463
{'breezy.lockdir.break': True})
5465
conf = _mod_config.LockableConfig(file_name=location)
5468
control, relpath = controldir.ControlDir.open_containing(location)
5470
control.break_lock()
5471
except NotImplementedError:
4831
5475
class cmd_wait_until_signalled(Command):
4832
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5476
__doc__ = """Test helper for test_start_and_stop_brz_subprocess_send_signal.
4834
5478
This just prints a line to signal when it is ready, then blocks on stdin.
4852
5496
help='Serve on stdin/out for use from inetd or sshd.'),
4853
5497
RegistryOption('protocol',
4854
5498
help="Protocol to serve.",
4855
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5499
lazy_registry=('breezy.transport', 'transport_server_registry'),
4856
5500
value_switches=True),
5502
help='Listen for connections on nominated address.', type=str),
4858
help='Listen for connections on nominated port of the form '
4859
'[hostname:]portnumber. Passing 0 as the port number will '
4860
'result in a dynamically allocated port. The default port '
4861
'depends on the protocol.',
4864
help='Serve contents of this directory.',
5504
help='Listen for connections on nominated port. Passing 0 as '
5505
'the port number will result in a dynamically allocated '
5506
'port. The default port depends on the protocol.',
5508
custom_help('directory',
5509
help='Serve contents of this directory.'),
4866
5510
Option('allow-writes',
4867
5511
help='By default the server is a readonly server. Supplying '
4868
5512
'--allow-writes enables write access to the contents of '
4869
'the served directory and below. Note that ``bzr serve`` '
5513
'the served directory and below. Note that ``brz serve`` '
4870
5514
'does not perform authentication, so unless some form of '
4871
5515
'external authentication is arranged supplying this '
4872
5516
'option leads to global uncontrolled write access to your '
5519
Option('client-timeout', type=float,
5520
help='Override the default idle client timeout (5min).'),
4877
def get_host_and_port(self, port):
4878
"""Return the host and port to run the smart server on.
4880
If 'port' is None, None will be returned for the host and port.
4882
If 'port' has a colon in it, the string before the colon will be
4883
interpreted as the host.
4885
:param port: A string of the port to run the server on.
4886
:return: A tuple of (host, port), where 'host' is a host name or IP,
4887
and port is an integer TCP/IP port.
4890
if port is not None:
4892
host, port = port.split(':')
4896
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4898
from bzrlib.transport import get_transport, transport_server_registry
5523
def run(self, listen=None, port=None, inet=False, directory=None,
5524
allow_writes=False, protocol=None, client_timeout=None):
5525
from . import transport
4899
5526
if directory is None:
4900
directory = os.getcwd()
5527
directory = osutils.getcwd()
4901
5528
if protocol is None:
4902
protocol = transport_server_registry.get()
4903
host, port = self.get_host_and_port(port)
4904
url = urlutils.local_path_to_url(directory)
5529
protocol = transport.transport_server_registry.get()
5530
url = transport.location_to_url(directory)
4905
5531
if not allow_writes:
4906
5532
url = 'readonly+' + url
4907
transport = get_transport(url)
4908
protocol(transport, host, port, inet)
5533
t = transport.get_transport_from_url(url)
5534
protocol(t, listen, port, inet, client_timeout)
4911
5537
class cmd_join(Command):
4934
5560
containing_tree = WorkingTree.open_containing(parent_dir)[0]
4935
5561
repo = containing_tree.branch.repository
4936
5562
if not repo.supports_rich_root():
4937
raise errors.BzrCommandError(
5563
raise errors.BzrCommandError(gettext(
4938
5564
"Can't join trees because %s doesn't support rich root data.\n"
4939
"You can use bzr upgrade on the repository."
5565
"You can use brz upgrade on the repository.")
4943
5569
containing_tree.add_reference(sub_tree)
4944
except errors.BadReferenceTarget, e:
5570
except errors.BadReferenceTarget as e:
4945
5571
# XXX: Would be better to just raise a nicely printable
4946
5572
# exception from the real origin. Also below. mbp 20070306
4947
raise errors.BzrCommandError("Cannot join %s. %s" %
5573
raise errors.BzrCommandError(
5574
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4951
5577
containing_tree.subsume(sub_tree)
4952
except errors.BadSubsumeSource, e:
4953
raise errors.BzrCommandError("Cannot join %s. %s" %
5578
except errors.BadSubsumeSource as e:
5579
raise errors.BzrCommandError(
5580
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4957
5583
class cmd_split(Command):
5166
5801
help='Branch to generate the submission from, '
5167
5802
'rather than the one containing the working directory.',
5168
5803
short_name='f',
5170
5805
Option('output', short_name='o',
5171
5806
help='Write merge directive to this file or directory; '
5172
5807
'use - for stdout.',
5174
5809
Option('strict',
5175
5810
help='Refuse to send if there are uncommitted changes in'
5176
5811
' the working tree, --no-strict disables the check.'),
5177
5812
Option('mail-to', help='Mail the request to this address.',
5181
Option('body', help='Body for the email.', type=unicode),
5816
Option('body', help='Body for the email.', type=text_type),
5182
5817
RegistryOption('format',
5183
5818
help='Use the specified output format.',
5184
lazy_registry=('bzrlib.send', 'format_registry')),
5819
lazy_registry=('breezy.send', 'format_registry')),
5187
5822
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5188
no_patch=False, revision=None, remember=False, output=None,
5823
no_patch=False, revision=None, remember=None, output=None,
5189
5824
format=None, mail_to=None, message=None, body=None,
5190
5825
strict=None, **kwargs):
5191
from bzrlib.send import send
5826
from .send import send
5192
5827
return send(submit_branch, revision, public_branch, remember,
5193
5828
format, no_bundle, no_patch, output,
5194
5829
kwargs.get('from', '.'), mail_to, message, body,
5318
5950
self.add_cleanup(branch.lock_write().unlock)
5320
5952
if tag_name is None:
5321
raise errors.BzrCommandError("No tag specified to delete.")
5953
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5322
5954
branch.tags.delete_tag(tag_name)
5323
self.outf.write('Deleted tag %s.\n' % tag_name)
5955
note(gettext('Deleted tag %s.') % tag_name)
5326
5958
if len(revision) != 1:
5327
raise errors.BzrCommandError(
5959
raise errors.BzrCommandError(gettext(
5328
5960
"Tags can only be placed on a single revision, "
5330
5962
revision_id = revision[0].as_revision_id(branch)
5332
5964
revision_id = branch.last_revision()
5333
5965
if tag_name is None:
5334
5966
tag_name = branch.automatic_tag_name(revision_id)
5335
5967
if tag_name is None:
5336
raise errors.BzrCommandError(
5337
"Please specify a tag name.")
5338
if (not force) and branch.tags.has_tag(tag_name):
5968
raise errors.BzrCommandError(gettext(
5969
"Please specify a tag name."))
5971
existing_target = branch.tags.lookup_tag(tag_name)
5972
except errors.NoSuchTag:
5973
existing_target = None
5974
if not force and existing_target not in (None, revision_id):
5339
5975
raise errors.TagAlreadyExists(tag_name)
5340
branch.tags.set_tag(tag_name, revision_id)
5341
self.outf.write('Created tag %s.\n' % tag_name)
5976
if existing_target == revision_id:
5977
note(gettext('Tag %s already exists for that revision.') % tag_name)
5979
branch.tags.set_tag(tag_name, revision_id)
5980
if existing_target is None:
5981
note(gettext('Created tag %s.') % tag_name)
5983
note(gettext('Updated tag %s.') % tag_name)
5344
5986
class cmd_tags(Command):
5350
5992
_see_also = ['tag']
5351
5993
takes_options = [
5353
help='Branch whose tags should be displayed.',
5357
RegistryOption.from_kwargs('sort',
5994
custom_help('directory',
5995
help='Branch whose tags should be displayed.'),
5996
RegistryOption('sort',
5358
5997
'Sort tags by different criteria.', title='Sorting',
5359
alpha='Sort tags lexicographically (default).',
5360
time='Sort tags chronologically.',
5998
lazy_registry=('breezy.tag', 'tag_sort_methods')
5366
6004
@display_command
6005
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6006
from .tag import tag_sort_methods
5373
6007
branch, relpath = Branch.open_containing(directory)
5375
tags = branch.tags.get_tag_dict().items()
6009
tags = list(viewitems(branch.tags.get_tag_dict()))
5379
6013
self.add_cleanup(branch.lock_read().unlock)
5381
graph = branch.repository.get_graph()
5382
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5383
revid1, revid2 = rev1.rev_id, rev2.rev_id
5384
# only show revisions between revid1 and revid2 (inclusive)
5385
tags = [(tag, revid) for tag, revid in tags if
5386
graph.is_between(revid, revid1, revid2)]
5389
elif sort == 'time':
5391
for tag, revid in tags:
5393
revobj = branch.repository.get_revision(revid)
5394
except errors.NoSuchRevision:
5395
timestamp = sys.maxint # place them at the end
5397
timestamp = revobj.timestamp
5398
timestamps[revid] = timestamp
5399
tags.sort(key=lambda x: timestamps[x[1]])
6015
# Restrict to the specified range
6016
tags = self._tags_for_range(branch, revision)
6018
sort = tag_sort_methods.get()
5400
6020
if not show_ids:
5401
6021
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
6022
for index, (tag, revid) in enumerate(tags):
5413
6035
for tag, revspec in tags:
5414
6036
self.outf.write('%-20s %s\n' % (tag, revspec))
6038
def _tags_for_range(self, branch, revision):
6040
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6041
revid1, revid2 = rev1.rev_id, rev2.rev_id
6042
# _get_revision_range will always set revid2 if it's not specified.
6043
# If revid1 is None, it means we want to start from the branch
6044
# origin which is always a valid ancestor. If revid1 == revid2, the
6045
# ancestry check is useless.
6046
if revid1 and revid1 != revid2:
6047
# FIXME: We really want to use the same graph than
6048
# branch.iter_merge_sorted_revisions below, but this is not
6049
# easily available -- vila 2011-09-23
6050
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6051
# We don't want to output anything in this case...
6053
# only show revisions between revid1 and revid2 (inclusive)
6054
tagged_revids = branch.tags.get_reverse_tag_dict()
6056
for r in branch.iter_merge_sorted_revisions(
6057
start_revision_id=revid2, stop_revision_id=revid1,
6058
stop_rule='include'):
6059
revid_tags = tagged_revids.get(r[0], None)
6061
found.extend([(tag, r[0]) for tag in revid_tags])
5417
6065
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
6066
__doc__ = """Reconfigure the type of a brz directory.
5420
6068
A target configuration must be specified.
5432
6080
takes_args = ['location?']
5433
6081
takes_options = [
5434
6082
RegistryOption.from_kwargs(
5436
title='Target type',
5437
help='The type to reconfigure the directory to.',
6085
help='The relation between branch and tree.',
5438
6086
value_switches=True, enum_switch=False,
5439
6087
branch='Reconfigure to be an unbound branch with no working tree.',
5440
6088
tree='Reconfigure to be an unbound branch with a working tree.',
5441
6089
checkout='Reconfigure to be a bound branch with a working tree.',
5442
6090
lightweight_checkout='Reconfigure to be a lightweight'
5443
6091
' checkout (with no local history).',
6093
RegistryOption.from_kwargs(
6095
title='Repository type',
6096
help='Location fo the repository.',
6097
value_switches=True, enum_switch=False,
5444
6098
standalone='Reconfigure to be a standalone branch '
5445
6099
'(i.e. stop using shared repository).',
5446
6100
use_shared='Reconfigure to use a shared repository.',
6102
RegistryOption.from_kwargs(
6104
title='Trees in Repository',
6105
help='Whether new branches in the repository have trees.',
6106
value_switches=True, enum_switch=False,
5447
6107
with_trees='Reconfigure repository to create '
5448
6108
'working trees on branches by default.',
5449
6109
with_no_trees='Reconfigure repository to not create '
5476
6136
# At the moment you can use --stacked-on and a different
5477
6137
# reconfiguration shape at the same time; there seems no good reason
5479
if target_type is None:
6139
if (tree_type is None and
6140
repository_type is None and
6141
repository_trees is None):
5480
6142
if stacked_on or unstacked:
5483
raise errors.BzrCommandError('No target configuration '
5485
elif target_type == 'branch':
6145
raise errors.BzrCommandError(gettext('No target configuration '
6147
reconfiguration = None
6148
if tree_type == 'branch':
5486
6149
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5487
elif target_type == 'tree':
6150
elif tree_type == 'tree':
5488
6151
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5489
elif target_type == 'checkout':
6152
elif tree_type == 'checkout':
5490
6153
reconfiguration = reconfigure.Reconfigure.to_checkout(
5491
6154
directory, bind_to)
5492
elif target_type == 'lightweight-checkout':
6155
elif tree_type == 'lightweight-checkout':
5493
6156
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5494
6157
directory, bind_to)
5495
elif target_type == 'use-shared':
6159
reconfiguration.apply(force)
6160
reconfiguration = None
6161
if repository_type == 'use-shared':
5496
6162
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5497
elif target_type == 'standalone':
6163
elif repository_type == 'standalone':
5498
6164
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5499
elif target_type == 'with-trees':
6166
reconfiguration.apply(force)
6167
reconfiguration = None
6168
if repository_trees == 'with-trees':
5500
6169
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5501
6170
directory, True)
5502
elif target_type == 'with-no-trees':
6171
elif repository_trees == 'with-no-trees':
5503
6172
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5504
6173
directory, False)
5505
reconfiguration.apply(force)
6175
reconfiguration.apply(force)
6176
reconfiguration = None
5508
6179
class cmd_switch(Command):
5531
6202
takes_args = ['to_location?']
5532
takes_options = [Option('force',
6203
takes_options = ['directory',
5533
6205
help='Switch even if local commits will be lost.'),
5535
6207
Option('create-branch', short_name='b',
5536
6208
help='Create the target branch from this one before'
5537
6209
' switching to it.'),
6211
help='Store and restore uncommitted changes in the'
5540
6215
def run(self, to_location=None, force=False, create_branch=False,
5542
from bzrlib import switch
6216
revision=None, directory=u'.', store=False):
6217
from . import switch
6218
tree_location = directory
5544
6219
revision = _get_one_revision('switch', revision)
5545
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6220
possible_transports = []
6221
control_dir = controldir.ControlDir.open_containing(tree_location,
6222
possible_transports=possible_transports)[0]
5546
6223
if to_location is None:
5547
6224
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
6225
raise errors.BzrCommandError(gettext('You must supply either a'
6226
' revision or a location'))
6227
to_location = tree_location
5552
branch = control_dir.open_branch()
6229
branch = control_dir.open_branch(
6230
possible_transports=possible_transports)
5553
6231
had_explicit_nick = branch.get_config().has_explicit_nickname()
5554
6232
except errors.NotBranchError:
5556
6234
had_explicit_nick = False
5557
6235
if create_branch:
5558
6236
if branch is None:
5559
raise errors.BzrCommandError('cannot create branch without'
5561
to_location = directory_service.directories.dereference(
5563
if '/' not in to_location and '\\' not in to_location:
5564
# This path is meant to be relative to the existing branch
5565
this_url = self._get_branch_location(control_dir)
5566
to_location = urlutils.join(this_url, '..', to_location)
6237
raise errors.BzrCommandError(
6238
gettext('cannot create branch without source branch'))
6239
to_location = lookup_new_sibling_branch(control_dir, to_location,
6240
possible_transports=possible_transports)
5567
6241
to_branch = branch.bzrdir.sprout(to_location,
5568
possible_transports=[branch.bzrdir.root_transport],
5569
source_branch=branch).open_branch()
6242
possible_transports=possible_transports,
6243
source_branch=branch).open_branch()
5572
to_branch = Branch.open(to_location)
6246
to_branch = Branch.open(to_location,
6247
possible_transports=possible_transports)
5573
6248
except errors.NotBranchError:
5574
this_url = self._get_branch_location(control_dir)
5575
to_branch = Branch.open(
5576
urlutils.join(this_url, '..', to_location))
6249
to_branch = open_sibling_branch(control_dir, to_location,
6250
possible_transports=possible_transports)
5577
6251
if revision is not None:
5578
6252
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
6253
switch.switch(control_dir, to_branch, force, revision_id=revision,
6254
store_uncommitted=store)
5580
6255
if had_explicit_nick:
5581
6256
branch = control_dir.open_branch() #get the new branch!
5582
6257
branch.nick = to_branch.nick
5583
note('Switched to branch: %s',
6258
note(gettext('Switched to branch: %s'),
5584
6259
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5586
def _get_branch_location(self, control_dir):
5587
"""Return location of branch for this control dir."""
5589
this_branch = control_dir.open_branch()
5590
# This may be a heavy checkout, where we want the master branch
5591
master_location = this_branch.get_bound_location()
5592
if master_location is not None:
5593
return master_location
5594
# If not, use a local sibling
5595
return this_branch.base
5596
except errors.NotBranchError:
5597
format = control_dir.find_branch_format()
5598
if getattr(format, 'get_reference', None) is not None:
5599
return format.get_reference(control_dir)
5601
return control_dir.root_transport.base
5604
6263
class cmd_view(Command):
5691
tree, file_list = tree_files(file_list, apply_view=False)
6350
tree, file_list = WorkingTree.open_containing_paths(file_list,
5692
6352
current_view, view_dict = tree.views.get_view_info()
5693
6353
if name is None:
5694
6354
name = current_view
5697
raise errors.BzrCommandError(
5698
"Both --delete and a file list specified")
6357
raise errors.BzrCommandError(gettext(
6358
"Both --delete and a file list specified"))
5700
raise errors.BzrCommandError(
5701
"Both --delete and --switch specified")
6360
raise errors.BzrCommandError(gettext(
6361
"Both --delete and --switch specified"))
5703
6363
tree.views.set_view_info(None, {})
5704
self.outf.write("Deleted all views.\n")
6364
self.outf.write(gettext("Deleted all views.\n"))
5705
6365
elif name is None:
5706
raise errors.BzrCommandError("No current view to delete")
6366
raise errors.BzrCommandError(gettext("No current view to delete"))
5708
6368
tree.views.delete_view(name)
5709
self.outf.write("Deleted '%s' view.\n" % name)
6369
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5712
raise errors.BzrCommandError(
5713
"Both --switch and a file list specified")
6372
raise errors.BzrCommandError(gettext(
6373
"Both --switch and a file list specified"))
5715
raise errors.BzrCommandError(
5716
"Both --switch and --all specified")
6375
raise errors.BzrCommandError(gettext(
6376
"Both --switch and --all specified"))
5717
6377
elif switch == 'off':
5718
6378
if current_view is None:
5719
raise errors.BzrCommandError("No current view to disable")
6379
raise errors.BzrCommandError(gettext("No current view to disable"))
5720
6380
tree.views.set_view_info(None, view_dict)
5721
self.outf.write("Disabled '%s' view.\n" % (current_view))
6381
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5723
6383
tree.views.set_view_info(switch, view_dict)
5724
6384
view_str = views.view_display_str(tree.views.lookup_view())
5725
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6385
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5728
self.outf.write('Views defined:\n')
6388
self.outf.write(gettext('Views defined:\n'))
5729
6389
for view in sorted(view_dict):
5730
6390
if view == current_view:
5734
6394
view_str = views.view_display_str(view_dict[view])
5735
6395
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5737
self.outf.write('No views defined.\n')
6397
self.outf.write(gettext('No views defined.\n'))
5738
6398
elif file_list:
5739
6399
if name is None:
5740
6400
# No name given and no current view set
5742
6402
elif name == 'off':
5743
raise errors.BzrCommandError(
5744
"Cannot change the 'off' pseudo view")
6403
raise errors.BzrCommandError(gettext(
6404
"Cannot change the 'off' pseudo view"))
5745
6405
tree.views.set_view(name, sorted(file_list))
5746
6406
view_str = views.view_display_str(tree.views.lookup_view())
5747
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6407
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5749
6409
# list the files
5750
6410
if name is None:
5751
6411
# No name given and no current view set
5752
self.outf.write('No current view.\n')
6412
self.outf.write(gettext('No current view.\n'))
5754
6414
view_str = views.view_display_str(tree.views.lookup_view(name))
5755
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6415
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5758
6418
class cmd_hooks(Command):
5786
6446
Remove the branch at repo/trunk::
5788
bzr remove-branch repo/trunk
6448
brz remove-branch repo/trunk
5792
6452
takes_args = ["location?"]
6454
takes_options = ['directory',
6455
Option('force', help='Remove branch even if it is the active branch.')]
5794
6457
aliases = ["rmbranch"]
5796
def run(self, location=None):
5797
if location is None:
5799
branch = Branch.open_containing(location)[0]
5800
branch.bzrdir.destroy_branch()
6459
def run(self, directory=None, location=None, force=False):
6460
br = open_nearby_branch(near=directory, location=location)
6461
if not force and br.bzrdir.has_workingtree():
6463
active_branch = br.bzrdir.open_branch(name="")
6464
except errors.NotBranchError:
6465
active_branch = None
6466
if (active_branch is not None and
6467
br.control_url == active_branch.control_url):
6468
raise errors.BzrCommandError(
6469
gettext("Branch is active. Use --force to remove it."))
6470
br.bzrdir.destroy_branch(br.name)
5803
6473
class cmd_shelve(Command):
5804
6474
__doc__ = """Temporarily set aside some changes from the current tree.
5824
6494
You can put multiple items on the shelf, and by default, 'unshelve' will
5825
6495
restore the most recently shelved changes.
6497
For complicated changes, it is possible to edit the changes in a separate
6498
editor program to decide what the file remaining in the working copy
6499
should look like. To do this, add the configuration option
6501
change_editor = PROGRAM @new_path @old_path
6503
where @new_path is replaced with the path of the new version of the
6504
file and @old_path is replaced with the path of the old version of
6505
the file. The PROGRAM should save the new file with the desired
6506
contents of the file in the working tree.
5828
6510
takes_args = ['file*']
5830
6512
takes_options = [
5832
6515
Option('all', help='Shelve all changes.'),
5834
6517
RegistryOption('writer', 'Method to use for writing diffs.',
5835
bzrlib.option.diff_writer_registry,
6518
breezy.option.diff_writer_registry,
5836
6519
value_switches=True, enum_switch=False),
5838
6521
Option('list', help='List shelved changes.'),
5839
6522
Option('destroy',
5840
6523
help='Destroy removed changes instead of shelving them.'),
5842
_see_also = ['unshelve']
6525
_see_also = ['unshelve', 'configuration']
5844
6527
def run(self, revision=None, all=False, file_list=None, message=None,
5845
writer=None, list=False, destroy=False):
6528
writer=None, list=False, destroy=False, directory=None):
5847
return self.run_for_list()
5848
from bzrlib.shelf_ui import Shelver
6530
return self.run_for_list(directory=directory)
6531
from .shelf_ui import Shelver
5849
6532
if writer is None:
5850
writer = bzrlib.option.diff_writer_registry.get()
6533
writer = breezy.option.diff_writer_registry.get()
5852
6535
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
6536
file_list, message, destroy=destroy, directory=directory)
5922
6608
To check what clean-tree will do, use --dry-run.
5924
takes_options = [Option('ignored', help='Delete all ignored files.'),
5925
Option('detritus', help='Delete conflict files, merge'
6610
takes_options = ['directory',
6611
Option('ignored', help='Delete all ignored files.'),
6612
Option('detritus', help='Delete conflict files, merge and revert'
5926
6613
' backups, and failed selftest dirs.'),
5927
6614
Option('unknown',
5928
help='Delete files unknown to bzr (default).'),
6615
help='Delete files unknown to brz (default).'),
5929
6616
Option('dry-run', help='Show files to delete instead of'
5930
6617
' deleting them.'),
5931
6618
Option('force', help='Do not prompt before deleting.')]
5932
6619
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5934
from bzrlib.clean_tree import clean_tree
6620
force=False, directory=u'.'):
6621
from .clean_tree import clean_tree
5935
6622
if not (unknown or ignored or detritus):
5939
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5940
dry_run=dry_run, no_prompt=force)
6626
clean_tree(directory, unknown=unknown, ignored=ignored,
6627
detritus=detritus, dry_run=dry_run, no_prompt=force)
5943
6630
class cmd_reference(Command):
5987
6674
self.outf.write('%s %s\n' % (path, location))
6677
class cmd_export_pot(Command):
6678
__doc__ = """Export command helps and error messages in po format."""
6681
takes_options = [Option('plugin',
6682
help='Export help text from named command '\
6683
'(defaults to all built in commands).',
6685
Option('include-duplicates',
6686
help='Output multiple copies of the same msgid '
6687
'string if it appears more than once.'),
6690
def run(self, plugin=None, include_duplicates=False):
6691
from .export_pot import export_pot
6692
export_pot(self.outf, plugin, include_duplicates)
6695
class cmd_import(Command):
6696
__doc__ = """Import sources from a directory, tarball or zip file
6698
This command will import a directory, tarball or zip file into a bzr
6699
tree, replacing any versioned files already present. If a directory is
6700
specified, it is used as the target. If the directory does not exist, or
6701
is not versioned, it is created.
6703
Tarballs may be gzip or bzip2 compressed. This is autodetected.
6705
If the tarball or zip has a single root directory, that directory is
6706
stripped when extracting the tarball. This is not done for directories.
6709
takes_args = ['source', 'tree?']
6711
def run(self, source, tree=None):
6712
from .upstream_import import do_import
6713
do_import(source, tree)
6716
class cmd_fetch_ghosts(Command):
6717
__doc__ = """Attempt to retrieve ghosts from another branch.
6719
If the other branch is not supplied, the last-pulled branch is used.
6723
aliases = ['fetch-missing']
6724
takes_args = ['branch?']
6725
takes_options = [Option('no-fix', help="Skip additional synchonization.")]
6727
def run(self, branch=None, no_fix=False):
6728
from .fetch_ghosts import GhostFetcher
6729
installed, failed = GhostFetcher.from_cmdline(branch).run()
6730
if len(installed) > 0:
6731
self.outf.write("Installed:\n")
6732
for rev in installed:
6733
self.outf.write(rev + "\n")
6735
self.outf.write("Still missing:\n")
6737
self.outf.write(rev + "\n")
6738
if not no_fix and len(installed) > 0:
6739
cmd_reconcile().run(".")
5990
6742
def _register_lazy_builtins():
5991
6743
# register lazy builtins from other modules; called at startup and should
5992
6744
# be only called once.
5993
6745
for (name, aliases, module_name) in [
5994
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5995
('cmd_dpush', [], 'bzrlib.foreign'),
5996
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5997
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5998
('cmd_conflicts', [], 'bzrlib.conflicts'),
5999
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6746
('cmd_bundle_info', [], 'breezy.bundle.commands'),
6747
('cmd_config', [], 'breezy.config'),
6748
('cmd_dpush', [], 'breezy.foreign'),
6749
('cmd_version_info', [], 'breezy.cmd_version_info'),
6750
('cmd_resolve', ['resolved'], 'breezy.conflicts'),
6751
('cmd_conflicts', [], 'breezy.conflicts'),
6752
('cmd_ping', [], 'breezy.smart.ping'),
6753
('cmd_sign_my_commits', [], 'breezy.commit_signature_commands'),
6754
('cmd_verify_signatures', [], 'breezy.commit_signature_commands'),
6755
('cmd_test_script', [], 'breezy.cmd_test_script'),
6001
6757
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
breezy/builtins.py
