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
61
from breezy.bzr import (
64
from breezy.branch import Branch
65
from breezy.conflicts import ConflictList
66
from breezy.transport import memory
67
from breezy.smtp_connection import SMTPConnection
68
from breezy.workingtree import WorkingTree
69
from breezy.i18n import gettext, ngettext
63
from bzrlib.commands import (
72
from .commands import (
65
74
builtin_command_registry,
68
from bzrlib.option import (
73
82
_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]))
84
from .revisionspec import (
94
from .trace import mutter, note, warning, is_quiet, get_verbosity_level
97
def _get_branch_location(control_dir, possible_transports=None):
98
"""Return location of branch for this control dir."""
100
target = control_dir.get_branch_reference()
101
except errors.NotBranchError:
102
return control_dir.root_transport.base
103
if target is not None:
105
this_branch = control_dir.open_branch(
106
possible_transports=possible_transports)
107
# This may be a heavy checkout, where we want the master branch
108
master_location = this_branch.get_bound_location()
109
if master_location is not None:
110
return master_location
111
# If not, use a local sibling
112
return this_branch.base
115
def _is_colocated(control_dir, possible_transports=None):
116
"""Check if the branch in control_dir is colocated.
118
:param control_dir: Control directory
119
:return: Tuple with boolean indicating whether the branch is colocated
120
and the full URL to the actual branch
122
# This path is meant to be relative to the existing branch
123
this_url = _get_branch_location(control_dir,
124
possible_transports=possible_transports)
125
# Perhaps the target control dir supports colocated branches?
127
root = controldir.ControlDir.open(this_url,
128
possible_transports=possible_transports)
129
except errors.NotBranchError:
130
return (False, this_url)
133
wt = control_dir.open_workingtree()
134
except (errors.NoWorkingTree, errors.NotLocalUrl):
135
return (False, this_url)
138
root._format.colocated_branches and
139
control_dir.control_url == root.control_url,
143
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
144
"""Lookup the location for a new sibling branch.
146
:param control_dir: Control directory to find sibling branches from
147
:param location: Name of the new branch
148
:return: Full location to the new branch
150
location = directory_service.directories.dereference(location)
151
if '/' not in location and '\\' not in location:
152
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
155
return urlutils.join_segment_parameters(this_url,
156
{"branch": urlutils.escape(location)})
158
return urlutils.join(this_url, '..', urlutils.escape(location))
162
def open_sibling_branch(control_dir, location, possible_transports=None):
163
"""Open a branch, possibly a sibling of another.
165
:param control_dir: Control directory relative to which to lookup the
167
:param location: Location to look up
168
:return: branch to open
171
# Perhaps it's a colocated branch?
172
return control_dir.open_branch(location,
173
possible_transports=possible_transports)
174
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
175
this_url = _get_branch_location(control_dir)
178
this_url, '..', urlutils.escape(location)))
181
def open_nearby_branch(near=None, location=None, possible_transports=None):
182
"""Open a nearby branch.
184
:param near: Optional location of container from which to open branch
185
:param location: Location of the branch
186
:return: Branch instance
192
return Branch.open(location,
193
possible_transports=possible_transports)
194
except errors.NotBranchError:
196
cdir = controldir.ControlDir.open(near,
197
possible_transports=possible_transports)
198
return open_sibling_branch(cdir, location,
199
possible_transports=possible_transports)
202
def iter_sibling_branches(control_dir, possible_transports=None):
203
"""Iterate over the siblings of a branch.
205
:param control_dir: Control directory for which to look up the siblings
206
:return: Iterator over tuples with branch name and branch object
210
reference = control_dir.get_branch_reference()
211
except errors.NotBranchError:
212
# There is no active branch, just return the colocated branches.
213
for name, branch in viewitems(control_dir.get_branches()):
216
if reference is not None:
217
ref_branch = Branch.open(reference,
218
possible_transports=possible_transports)
221
if ref_branch is None or ref_branch.name:
222
if ref_branch is not None:
223
control_dir = ref_branch.controldir
224
for name, branch in viewitems(control_dir.get_branches()):
227
repo = ref_branch.controldir.find_repository()
228
for branch in repo.find_branches(using=True):
229
name = urlutils.relative_url(repo.user_url,
230
branch.user_url).rstrip("/")
88
234
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
299
def _get_view_info_for_change_reporter(tree):
224
300
"""Get the view information from a tree for change reporting."""
364
450
def run(self, revision_id=None, revision=None, directory=u'.'):
365
451
if revision_id is not None and revision is not None:
366
raise errors.BzrCommandError('You can only supply one of'
367
' revision_id or --revision')
452
raise errors.BzrCommandError(gettext('You can only supply one of'
453
' revision_id or --revision'))
368
454
if revision_id is None and revision is None:
369
raise errors.BzrCommandError('You must supply either'
370
' --revision or a revision_id')
371
b = WorkingTree.open_containing(directory)[0].branch
455
raise errors.BzrCommandError(gettext('You must supply either'
456
' --revision or a revision_id'))
458
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
373
460
revisions = b.repository.revisions
374
461
if revisions is None:
375
raise errors.BzrCommandError('Repository %r does not support '
376
'access to raw revision texts')
462
raise errors.BzrCommandError(gettext('Repository %r does not support '
463
'access to raw revision texts'))
378
b.repository.lock_read()
465
with b.repository.lock_read():
380
466
# TODO: jam 20060112 should cat-revision always output utf-8?
381
467
if revision_id is not None:
382
revision_id = osutils.safe_revision_id(revision_id, warn=False)
468
revision_id = cache_utf8.encode(revision_id)
384
470
self.print_revision(revisions, revision_id)
385
471
except errors.NoSuchRevision:
386
msg = "The repository %s contains no revision %s." % (
472
msg = gettext("The repository {0} contains no revision {1}.").format(
387
473
b.repository.base, revision_id)
388
474
raise errors.BzrCommandError(msg)
389
475
elif revision is not None:
390
476
for rev in revision:
392
478
raise errors.BzrCommandError(
393
'You cannot specify a NULL revision.')
479
gettext('You cannot specify a NULL revision.'))
394
480
rev_id = rev.as_revision_id(b)
395
481
self.print_revision(revisions, rev_id)
397
b.repository.unlock()
400
484
class cmd_dump_btree(Command):
401
485
__doc__ = """Dump the contents of a btree index file to stdout.
499
586
location_list=['.']
501
588
for location in location_list:
502
d = bzrdir.BzrDir.open(location)
589
d = controldir.ControlDir.open(location)
505
592
working = d.open_workingtree()
506
593
except errors.NoWorkingTree:
507
raise errors.BzrCommandError("No working tree to remove")
594
raise errors.BzrCommandError(gettext("No working tree to remove"))
508
595
except errors.NotLocalUrl:
509
raise errors.BzrCommandError("You cannot remove the working tree"
596
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
597
" of a remote path"))
512
599
if (working.has_changes()):
513
600
raise errors.UncommittedChanges(working)
601
if working.get_shelf_manager().last_shelf() is not None:
602
raise errors.ShelvedChanges(working)
515
604
if working.user_url != working.branch.user_url:
516
raise errors.BzrCommandError("You cannot remove the working tree"
517
" from a lightweight checkout")
605
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
606
" from a lightweight checkout"))
519
608
d.destroy_workingtree()
611
class cmd_repair_workingtree(Command):
612
__doc__ = """Reset the working tree state file.
614
This is not meant to be used normally, but more as a way to recover from
615
filesystem corruption, etc. This rebuilds the working inventory back to a
616
'known good' state. Any new modifications (adding a file, renaming, etc)
617
will be lost, though modified files will still be detected as such.
619
Most users will want something more like "brz revert" or "brz update"
620
unless the state file has become corrupted.
622
By default this attempts to recover the current state by looking at the
623
headers of the state file. If the state file is too corrupted to even do
624
that, you can supply --revision to force the state of the tree.
627
takes_options = ['revision', 'directory',
629
help='Reset the tree even if it doesn\'t appear to be'
634
def run(self, revision=None, directory='.', force=False):
635
tree, _ = WorkingTree.open_containing(directory)
636
self.add_cleanup(tree.lock_tree_write().unlock)
640
except errors.BzrError:
641
pass # There seems to be a real error here, so we'll reset
644
raise errors.BzrCommandError(gettext(
645
'The tree does not appear to be corrupt. You probably'
646
' want "brz revert" instead. Use "--force" if you are'
647
' sure you want to reset the working tree.'))
651
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
653
tree.reset_state(revision_ids)
654
except errors.BzrError as e:
655
if revision_ids is None:
656
extra = (gettext(', the header appears corrupt, try passing -r -1'
657
' to set the state to the last commit'))
660
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
522
663
class cmd_revno(Command):
523
664
__doc__ = """Show current revision number.
528
669
_see_also = ['info']
529
670
takes_args = ['location?']
530
671
takes_options = [
531
Option('tree', help='Show revno of working tree'),
672
Option('tree', help='Show revno of working tree.'),
535
def run(self, tree=False, location=u'.'):
677
def run(self, tree=False, location=u'.', revision=None):
678
if revision is not None and tree:
679
raise errors.BzrCommandError(gettext("--tree and --revision can "
680
"not be used together"))
538
684
wt = WorkingTree.open_containing(location)[0]
539
685
self.add_cleanup(wt.lock_read().unlock)
540
686
except (errors.NoWorkingTree, errors.NotLocalUrl):
541
687
raise errors.NoWorkingTree(location)
542
689
revid = wt.last_revision()
544
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
545
except errors.NoSuchRevision:
547
revno = ".".join(str(n) for n in revno_t)
549
691
b = Branch.open_containing(location)[0]
550
692
self.add_cleanup(b.lock_read().unlock)
694
if len(revision) != 1:
695
raise errors.BzrCommandError(gettext(
696
"Revision numbers only make sense for single "
697
"revisions, not ranges"))
698
revid = revision[0].as_revision_id(b)
700
revid = b.last_revision()
702
revno_t = b.revision_id_to_dotted_revno(revid)
703
except errors.NoSuchRevision:
705
revno = ".".join(str(n) for n in revno_t)
552
706
self.cleanup_now()
553
self.outf.write(str(revno) + '\n')
707
self.outf.write(revno + '\n')
556
710
class cmd_revision_info(Command):
791
980
self.outf.write('\n')
983
class cmd_cp(Command):
984
__doc__ = """Copy a file.
987
brz cp OLDNAME NEWNAME
989
brz cp SOURCE... DESTINATION
991
If the last argument is a versioned directory, all the other names
992
are copied into it. Otherwise, there must be exactly two arguments
993
and the file is copied to a new name.
995
Files cannot be copied between branches. Only files can be copied
999
takes_args = ['names*']
1002
encoding_type = 'replace'
1004
def run(self, names_list):
1006
if names_list is None:
1008
if len(names_list) < 2:
1009
raise errors.BzrCommandError(gettext("missing file argument"))
1010
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1011
for file_name in rel_names[0:-1]:
1013
raise errors.BzrCommandError(gettext("can not copy root of branch"))
1014
self.add_cleanup(tree.lock_tree_write().unlock)
1015
into_existing = osutils.isdir(names_list[-1])
1016
if not into_existing:
1018
(src, dst) = rel_names
1020
raise errors.BzrCommandError(gettext('to copy multiple files the'
1021
' destination must be a versioned'
1023
pairs = [(src, dst)]
1025
pairs = [(n, osutils.joinpath([rel_names[-1], osutils.basename(n)]))
1026
for n in rel_names[:-1]]
1028
for src, dst in pairs:
1030
src_kind = tree.stored_kind(src)
1031
except errors.NoSuchFile:
1032
raise errors.BzrCommandError(
1033
gettext('Could not copy %s => %s: %s is not versioned.')
1035
if src_kind is None:
1036
raise errors.BzrCommandError(
1037
gettext('Could not copy %s => %s . %s is not versioned\.'
1039
if src_kind == 'directory':
1040
raise errors.BzrCommandError(
1041
gettext('Could not copy %s => %s . %s is a directory.'
1043
dst_parent = osutils.split(dst)[0]
1044
if dst_parent != '':
1046
dst_parent_kind = tree.stored_kind(dst_parent)
1047
except errors.NoSuchFile:
1048
raise errors.BzrCommandError(
1049
gettext('Could not copy %s => %s: %s is not versioned.')
1050
% (src, dst, dst_parent))
1051
if dst_parent_kind != 'directory':
1052
raise errors.BzrCommandError(
1053
gettext('Could not copy to %s: %s is not a directory.')
1054
% (dst_parent, dst_parent))
1056
tree.copy_one(src, dst)
794
1059
class cmd_mv(Command):
795
1060
__doc__ = """Move or rename a file.
798
bzr mv OLDNAME NEWNAME
1063
brz mv OLDNAME NEWNAME
800
bzr mv SOURCE... DESTINATION
1065
brz mv SOURCE... DESTINATION
802
1067
If the last argument is a versioned directory, all the other names
803
1068
are moved into it. Otherwise, there must be exactly two arguments
826
1091
return self.run_auto(names_list, after, dry_run)
828
raise errors.BzrCommandError('--dry-run requires --auto.')
1093
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
829
1094
if names_list is None:
831
1096
if len(names_list) < 2:
832
raise errors.BzrCommandError("missing file argument")
833
tree, rel_names = tree_files(names_list, canonicalize=False)
1097
raise errors.BzrCommandError(gettext("missing file argument"))
1098
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1099
for file_name in rel_names[0:-1]:
1101
raise errors.BzrCommandError(gettext("can not move root of branch"))
834
1102
self.add_cleanup(tree.lock_tree_write().unlock)
835
1103
self._run(tree, names_list, rel_names, after)
837
1105
def run_auto(self, names_list, after, dry_run):
838
1106
if names_list is not None and len(names_list) > 1:
839
raise errors.BzrCommandError('Only one path may be specified to'
1107
raise errors.BzrCommandError(gettext('Only one path may be specified to'
842
raise errors.BzrCommandError('--after cannot be specified with'
844
work_tree, file_list = tree_files(names_list, default_branch='.')
1110
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1112
work_tree, file_list = WorkingTree.open_containing_paths(
1113
names_list, default_directory='.')
845
1114
self.add_cleanup(work_tree.lock_tree_write().unlock)
846
1115
rename_map.RenameMap.guess_renames(work_tree, dry_run)
1060
1354
considered diverged if the destination branch's most recent commit is one
1061
1355
that has not been merged (directly or indirectly) by the source branch.
1063
If branches have diverged, you can use 'bzr push --overwrite' to replace
1357
If branches have diverged, you can use 'brz push --overwrite' to replace
1064
1358
the other branch completely, discarding its unmerged changes.
1066
1360
If you want to ensure you have the different changes in the other branch,
1067
do a merge (see bzr help merge) from the other branch, and commit that.
1361
do a merge (see brz help merge) from the other branch, and commit that.
1068
1362
After that you will be able to do a push without '--overwrite'.
1070
If there is no default push location set, the first push will set it.
1071
After that, you can omit the location to use the default. To change the
1072
default, use --remember. The value will only be saved if the remote
1073
location can be accessed.
1364
If there is no default push location set, the first push will set it (use
1365
--no-remember to avoid setting it). After that, you can omit the
1366
location to use the default. To change the default, use --remember. The
1367
value will only be saved if the remote location can be accessed.
1369
The --verbose option will display the revisions pushed using the log_format
1370
configuration option. You can use a different format by overriding it with
1371
-Olog_format=<other_format>.
1076
1374
_see_also = ['pull', 'update', 'working-trees']
1093
1391
help='Create a stacked branch that refers to another branch '
1094
1392
'for the commit history. Only the work not present in the '
1095
1393
'referenced branch is included in the branch created.',
1097
1395
Option('strict',
1098
1396
help='Refuse to push if there are uncommitted changes in'
1099
1397
' the working tree, --no-strict disables the check.'),
1399
help="Don't populate the working tree, even for protocols"
1400
" that support it."),
1401
Option('overwrite-tags',
1402
help="Overwrite tags only."),
1101
1404
takes_args = ['location?']
1102
1405
encoding_type = 'replace'
1104
def run(self, location=None, remember=False, overwrite=False,
1407
def run(self, location=None, remember=None, overwrite=False,
1105
1408
create_prefix=False, verbose=False, revision=None,
1106
1409
use_existing_dir=False, directory=None, stacked_on=None,
1107
stacked=False, strict=None):
1108
from bzrlib.push import _show_push_branch
1410
stacked=False, strict=None, no_tree=False,
1411
overwrite_tags=False):
1412
from .push import _show_push_branch
1415
overwrite = ["history", "tags"]
1416
elif overwrite_tags:
1417
overwrite = ["tags"]
1110
1421
if directory is None:
1111
1422
directory = '.'
1112
1423
# Get the source branch
1113
1424
(tree, br_from,
1114
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1425
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1115
1426
# Get the tip's revision_id
1116
1427
revision = _get_one_revision('push', revision)
1117
1428
if revision is not None:
1138
1449
# error by the feedback given to them. RBC 20080227.
1139
1450
stacked_on = parent_url
1140
1451
if not stacked_on:
1141
raise errors.BzrCommandError(
1142
"Could not determine branch to refer to.")
1452
raise errors.BzrCommandError(gettext(
1453
"Could not determine branch to refer to."))
1144
1455
# Get the destination location
1145
1456
if location is None:
1146
1457
stored_loc = br_from.get_push_location()
1147
1458
if stored_loc is None:
1148
raise errors.BzrCommandError(
1149
"No push location known or specified.")
1459
parent_loc = br_from.get_parent()
1461
raise errors.BzrCommandError(gettext(
1462
"No push location known or specified. To push to the "
1463
"parent branch (at %s), use 'brz push :parent'." %
1464
urlutils.unescape_for_display(parent_loc,
1465
self.outf.encoding)))
1467
raise errors.BzrCommandError(gettext(
1468
"No push location known or specified."))
1151
1470
display_url = urlutils.unescape_for_display(stored_loc,
1152
1471
self.outf.encoding)
1153
self.outf.write("Using saved push location: %s\n" % display_url)
1472
note(gettext("Using saved push location: %s") % display_url)
1154
1473
location = stored_loc
1156
1475
_show_push_branch(br_from, revision_id, location, self.outf,
1157
1476
verbose=verbose, overwrite=overwrite, remember=remember,
1158
1477
stacked_on=stacked_on, create_prefix=create_prefix,
1159
use_existing_dir=use_existing_dir)
1478
use_existing_dir=use_existing_dir, no_tree=no_tree)
1162
1481
class cmd_branch(Command):
1197
1518
help="Bind new branch to from location."),
1199
aliases = ['get', 'clone']
1201
1521
def run(self, from_location, to_location=None, revision=None,
1202
1522
hardlink=False, stacked=False, standalone=False, no_tree=False,
1203
use_existing_dir=False, switch=False, bind=False):
1204
from bzrlib import switch as _mod_switch
1205
from bzrlib.tag import _merge_tags_if_possible
1206
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1523
use_existing_dir=False, switch=False, bind=False,
1525
from breezy import switch as _mod_switch
1526
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1528
if not (hardlink or files_from):
1529
# accelerator_tree is usually slower because you have to read N
1530
# files (no readahead, lots of seeks, etc), but allow the user to
1531
# explicitly request it
1532
accelerator_tree = None
1533
if files_from is not None and files_from != from_location:
1534
accelerator_tree = WorkingTree.open(files_from)
1208
1535
revision = _get_one_revision('branch', revision)
1209
1536
self.add_cleanup(br_from.lock_read().unlock)
1210
1537
if revision is not None:
1216
1543
revision_id = br_from.last_revision()
1217
1544
if to_location is None:
1218
to_location = urlutils.derive_to_location(from_location)
1545
to_location = getattr(br_from, "name", None)
1547
to_location = urlutils.derive_to_location(from_location)
1219
1548
to_transport = transport.get_transport(to_location)
1221
1550
to_transport.mkdir('.')
1222
1551
except errors.FileExists:
1223
if not use_existing_dir:
1224
raise errors.BzrCommandError('Target directory "%s" '
1225
'already exists.' % to_location)
1553
to_dir = controldir.ControlDir.open_from_transport(
1555
except errors.NotBranchError:
1556
if not use_existing_dir:
1557
raise errors.BzrCommandError(gettext('Target directory "%s" '
1558
'already exists.') % to_location)
1228
bzrdir.BzrDir.open_from_transport(to_transport)
1563
to_dir.open_branch()
1229
1564
except errors.NotBranchError:
1232
1567
raise errors.AlreadyBranchError(to_location)
1233
1568
except errors.NoSuchFile:
1234
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1569
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1237
# preserve whatever source format we have.
1238
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1239
possible_transports=[to_transport],
1240
accelerator_tree=accelerator_tree,
1241
hardlink=hardlink, stacked=stacked,
1242
force_new_repo=standalone,
1243
create_tree_if_local=not no_tree,
1244
source_branch=br_from)
1245
branch = dir.open_branch()
1246
except errors.NoSuchRevision:
1247
to_transport.delete_tree('.')
1248
msg = "The branch %s has no revision %s." % (from_location,
1250
raise errors.BzrCommandError(msg)
1251
_merge_tags_if_possible(br_from, branch)
1575
# preserve whatever source format we have.
1576
to_dir = br_from.controldir.sprout(
1577
to_transport.base, revision_id,
1578
possible_transports=[to_transport],
1579
accelerator_tree=accelerator_tree, hardlink=hardlink,
1580
stacked=stacked, force_new_repo=standalone,
1581
create_tree_if_local=not no_tree, source_branch=br_from)
1582
branch = to_dir.open_branch(
1583
possible_transports=[
1584
br_from.controldir.root_transport, to_transport])
1585
except errors.NoSuchRevision:
1586
to_transport.delete_tree('.')
1587
msg = gettext("The branch {0} has no revision {1}.").format(
1588
from_location, revision)
1589
raise errors.BzrCommandError(msg)
1592
to_repo = to_dir.open_repository()
1593
except errors.NoRepositoryPresent:
1594
to_repo = to_dir.create_repository()
1595
to_repo.fetch(br_from.repository, revision_id=revision_id)
1596
branch = br_from.sprout(to_dir, revision_id=revision_id)
1597
br_from.tags.merge_to(branch.tags)
1252
1599
# If the source branch is stacked, the new branch may
1253
1600
# be stacked whether we asked for that explicitly or not.
1254
1601
# We therefore need a try/except here and not just 'if stacked:'
1256
note('Created new stacked branch referring to %s.' %
1603
note(gettext('Created new stacked branch referring to %s.') %
1257
1604
branch.get_stacked_on_url())
1258
except (errors.NotStacked, errors.UnstackableBranchFormat,
1259
errors.UnstackableRepositoryFormat), e:
1260
note('Branched %d revision(s).' % branch.revno())
1605
except (errors.NotStacked, _mod_branch.UnstackableBranchFormat,
1606
errors.UnstackableRepositoryFormat) as e:
1607
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1262
1609
# Bind to the parent
1263
1610
parent_branch = Branch.open(from_location)
1264
1611
branch.bind(parent_branch)
1265
note('New branch bound to %s' % from_location)
1612
note(gettext('New branch bound to %s') % from_location)
1267
1614
# Switch to the new branch
1268
1615
wt, _ = WorkingTree.open_containing('.')
1269
_mod_switch.switch(wt.bzrdir, branch)
1270
note('Switched to branch: %s',
1616
_mod_switch.switch(wt.controldir, branch)
1617
note(gettext('Switched to branch: %s'),
1271
1618
urlutils.unescape_for_display(branch.base, 'utf-8'))
1621
class cmd_branches(Command):
1622
__doc__ = """List the branches available at the current location.
1624
This command will print the names of all the branches at the current
1628
takes_args = ['location?']
1630
Option('recursive', short_name='R',
1631
help='Recursively scan for branches rather than '
1632
'just looking in the specified location.')]
1634
def run(self, location=".", recursive=False):
1636
t = transport.get_transport(location)
1637
if not t.listable():
1638
raise errors.BzrCommandError(
1639
"Can't scan this type of location.")
1640
for b in controldir.ControlDir.find_branches(t):
1641
self.outf.write("%s\n" % urlutils.unescape_for_display(
1642
urlutils.relative_url(t.base, b.base),
1643
self.outf.encoding).rstrip("/"))
1645
dir = controldir.ControlDir.open_containing(location)[0]
1647
active_branch = dir.open_branch(name="")
1648
except errors.NotBranchError:
1649
active_branch = None
1651
for name, branch in iter_sibling_branches(dir):
1654
active = (active_branch is not None and
1655
active_branch.base == branch.base)
1656
names[name] = active
1657
# Only mention the current branch explicitly if it's not
1658
# one of the colocated branches
1659
if not any(viewvalues(names)) and active_branch is not None:
1660
self.outf.write("* %s\n" % gettext("(default)"))
1661
for name in sorted(names):
1662
active = names[name]
1667
self.outf.write("%s %s\n" % (
1668
prefix, name.encode(self.outf.encoding)))
1274
1671
class cmd_checkout(Command):
1275
1672
__doc__ = """Create a new checkout of an existing branch.
1378
1773
class cmd_update(Command):
1379
__doc__ = """Update a tree to have the latest code committed to its branch.
1381
This will perform a merge into the working tree, and may generate
1382
conflicts. If you have any local changes, you will still
1383
need to commit them after the update for the update to be complete.
1385
If you want to discard your local changes, you can just do a
1386
'bzr revert' instead of 'bzr commit' after the update.
1388
If the tree's branch is bound to a master branch, it will also update
1774
__doc__ = """Update a working tree to a new revision.
1776
This will perform a merge of the destination revision (the tip of the
1777
branch, or the specified revision) into the working tree, and then make
1778
that revision the basis revision for the working tree.
1780
You can use this to visit an older revision, or to update a working tree
1781
that is out of date from its branch.
1783
If there are any uncommitted changes in the tree, they will be carried
1784
across and remain as uncommitted changes after the update. To discard
1785
these changes, use 'brz revert'. The uncommitted changes may conflict
1786
with the changes brought in by the change in basis revision.
1788
If the tree's branch is bound to a master branch, brz will also update
1389
1789
the branch from the master.
1791
You cannot update just a single file or directory, because each Bazaar
1792
working tree has just a single basis revision. If you want to restore a
1793
file that has been removed locally, use 'brz revert' instead of 'brz
1794
update'. If you want to restore a file to its state in a previous
1795
revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write
1796
out the old content of that file to a new location.
1798
The 'dir' argument, if given, must be the location of the root of a
1799
working tree to update. By default, the working tree that contains the
1800
current working directory is used.
1392
1803
_see_also = ['pull', 'working-trees', 'status-flags']
1393
1804
takes_args = ['dir?']
1394
takes_options = ['revision']
1805
takes_options = ['revision',
1807
help="Show base revision text in conflicts."),
1395
1809
aliases = ['up']
1397
def run(self, dir='.', revision=None):
1811
def run(self, dir=None, revision=None, show_base=None):
1398
1812
if revision is not None and len(revision) != 1:
1399
raise errors.BzrCommandError(
1400
"bzr update --revision takes exactly one revision")
1401
tree = WorkingTree.open_containing(dir)[0]
1813
raise errors.BzrCommandError(gettext(
1814
"brz update --revision takes exactly one revision"))
1816
tree = WorkingTree.open_containing('.')[0]
1818
tree, relpath = WorkingTree.open_containing(dir)
1821
raise errors.BzrCommandError(gettext(
1822
"brz update can only update a whole tree, "
1823
"not a file or subdirectory"))
1402
1824
branch = tree.branch
1403
1825
possible_transports = []
1404
1826
master = branch.get_master_branch(
1440
1862
change_reporter,
1441
1863
possible_transports=possible_transports,
1442
1864
revision=revision_id,
1444
except errors.NoSuchRevision, e:
1445
raise errors.BzrCommandError(
1866
show_base=show_base)
1867
except errors.NoSuchRevision as e:
1868
raise errors.BzrCommandError(gettext(
1446
1869
"branch has no revision %s\n"
1447
"bzr update --revision only works"
1448
" for a revision in the branch history"
1870
"brz update --revision only works"
1871
" for a revision in the branch history")
1449
1872
% (e.revision))
1450
1873
revno = tree.branch.revision_id_to_dotted_revno(
1451
1874
_mod_revision.ensure_null(tree.last_revision()))
1452
note('Updated to revision %s of branch %s' %
1453
('.'.join(map(str, revno)), branch_location))
1875
note(gettext('Updated to revision {0} of branch {1}').format(
1876
'.'.join(map(str, revno)), branch_location))
1454
1877
parent_ids = tree.get_parent_ids()
1455
1878
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1456
note('Your local commits will now show as pending merges with '
1457
"'bzr status', and can be committed with 'bzr commit'.")
1879
note(gettext('Your local commits will now show as pending merges with '
1880
"'brz status', and can be committed with 'brz commit'."))
1458
1881
if conflicts != 0:
1519
1943
RegistryOption.from_kwargs('file-deletion-strategy',
1520
1944
'The file deletion mode to be used.',
1521
1945
title='Deletion Strategy', value_switches=True, enum_switch=False,
1522
safe='Only delete files if they can be'
1523
' safely recovered (default).',
1524
keep='Delete from bzr but leave the working copy.',
1525
force='Delete all the specified files, even if they can not be '
1526
'recovered and even if they are non-empty directories.')]
1946
safe='Backup changed files (default).',
1947
keep='Delete from brz but leave the working copy.',
1948
no_backup='Don\'t backup changed files.'),
1527
1950
aliases = ['rm', 'del']
1528
1951
encoding_type = 'replace'
1530
1953
def run(self, file_list, verbose=False, new=False,
1531
1954
file_deletion_strategy='safe'):
1532
tree, file_list = tree_files(file_list)
1956
tree, file_list = WorkingTree.open_containing_paths(file_list)
1534
1958
if file_list is not None:
1535
1959
file_list = [f for f in file_list]
1730
2170
to_transport.ensure_base()
1731
2171
except errors.NoSuchFile:
1732
2172
if not create_prefix:
1733
raise errors.BzrCommandError("Parent directory of %s"
2173
raise errors.BzrCommandError(gettext("Parent directory of %s"
1734
2174
" does not exist."
1735
2175
"\nYou may supply --create-prefix to create all"
1736
" leading parent directories."
2176
" leading parent directories.")
1738
2178
to_transport.create_prefix()
1741
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2181
a_controldir = controldir.ControlDir.open_from_transport(to_transport)
1742
2182
except errors.NotBranchError:
1743
2183
# really a NotBzrDir error...
1744
create_branch = bzrdir.BzrDir.create_branch_convenience
2184
create_branch = controldir.ControlDir.create_branch_convenience
2186
force_new_tree = False
2188
force_new_tree = None
1745
2189
branch = create_branch(to_transport.base, format=format,
1746
possible_transports=[to_transport])
1747
a_bzrdir = branch.bzrdir
2190
possible_transports=[to_transport],
2191
force_new_tree=force_new_tree)
2192
a_controldir = branch.controldir
1749
from bzrlib.transport.local import LocalTransport
1750
if a_bzrdir.has_branch():
2194
from .transport.local import LocalTransport
2195
if a_controldir.has_branch():
1751
2196
if (isinstance(to_transport, LocalTransport)
1752
and not a_bzrdir.has_workingtree()):
2197
and not a_controldir.has_workingtree()):
1753
2198
raise errors.BranchExistsWithoutWorkingTree(location)
1754
2199
raise errors.AlreadyBranchError(location)
1755
branch = a_bzrdir.create_branch()
1756
a_bzrdir.create_workingtree()
2200
branch = a_controldir.create_branch()
2201
if not no_tree and not a_controldir.has_workingtree():
2202
a_controldir.create_workingtree()
1757
2203
if append_revisions_only:
1759
2205
branch.set_append_revisions_only(True)
1760
2206
except errors.UpgradeRequired:
1761
raise errors.BzrCommandError('This branch format cannot be set'
1762
' to append-revisions-only. Try --default.')
2207
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2208
' to append-revisions-only. Try --default.'))
1763
2209
if not is_quiet():
1764
from bzrlib.info import describe_layout, describe_format
2210
from .info import describe_layout, describe_format
1766
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
2212
tree = a_controldir.open_workingtree(recommend_upgrade=False)
1767
2213
except (errors.NoWorkingTree, errors.NotLocalUrl):
1769
2215
repository = branch.repository
1770
2216
layout = describe_layout(repository, branch, tree).lower()
1771
format = describe_format(a_bzrdir, repository, branch, tree)
1772
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
2217
format = describe_format(a_controldir, repository, branch, tree)
2218
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1773
2220
if repository.is_shared():
1774
2221
#XXX: maybe this can be refactored into transport.path_or_url()
1775
url = repository.bzrdir.root_transport.external_url()
2222
url = repository.controldir.root_transport.external_url()
1777
2224
url = urlutils.local_path_from_url(url)
1778
except errors.InvalidURL:
2225
except urlutils.InvalidURL:
1780
self.outf.write("Using shared repository: %s\n" % url)
2227
self.outf.write(gettext("Using shared repository: %s\n") % url)
1783
2230
class cmd_init_repository(Command):
1825
2272
def run(self, location, format=None, no_trees=False):
1826
2273
if format is None:
1827
format = bzrdir.format_registry.make_bzrdir('default')
2274
format = controldir.format_registry.make_controldir('default')
1829
2276
if location is None:
1832
2279
to_transport = transport.get_transport(location)
1833
to_transport.ensure_base()
1835
newdir = format.initialize_on_transport(to_transport)
1836
repo = newdir.create_repository(shared=True)
1837
repo.set_make_working_trees(not no_trees)
2281
(repo, newdir, require_stacking, repository_policy) = (
2282
format.initialize_on_transport_ex(to_transport,
2283
create_prefix=True, make_working_trees=not no_trees,
2284
shared_repo=True, force_new_repo=True,
2285
use_existing_dir=True,
2286
repo_format_name=format.repository_format.get_format_string()))
1838
2287
if not is_quiet():
1839
from bzrlib.info import show_bzrdir_info
1840
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2288
from .info import show_bzrdir_info
2289
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1843
2292
class cmd_diff(Command):
1863
2319
Shows the difference in the working tree versus the last commit::
1867
2323
Difference between the working tree and revision 1::
1871
2327
Difference between revision 3 and revision 1::
1875
2331
Difference between revision 3 and revision 1 for branch xxx::
1879
To see the changes introduced in revision X::
2335
The changes introduced by revision 2 (equivalent to -r1..2)::
2339
To see the changes introduced by revision X::
1883
2343
Note that in the case of a merge, the -c option shows the changes
1884
2344
compared to the left hand parent. To see the changes against
1885
2345
another parent, use::
1887
bzr diff -r<chosen_parent>..X
1889
The changes introduced by revision 2 (equivalent to -r1..2)::
2347
brz diff -r<chosen_parent>..X
2349
The changes between the current revision and the previous revision
2350
(equivalent to -c-1 and -r-2..-1)
1893
2354
Show just the differences for file NEWS::
1897
2358
Show the differences in working tree xxx for file NEWS::
1901
2362
Show the differences from branch xxx to this working tree:
1905
2366
Show the differences between two branches for file NEWS::
1907
bzr diff --old xxx --new yyy NEWS
1909
Same as 'bzr diff' but prefix paths with old/ and new/::
1911
bzr diff --prefix old/:new/
2368
brz diff --old xxx --new yyy NEWS
2370
Same as 'brz diff' but prefix paths with old/ and new/::
2372
brz diff --prefix old/:new/
2374
Show the differences using a custom diff program with options::
2376
brz diff --using /usr/bin/diff --diff-options -wu
1913
2378
_see_also = ['status']
1914
2379
takes_args = ['file*']
1915
2380
takes_options = [
1916
Option('diff-options', type=str,
2381
Option('diff-options', type=text_type,
1917
2382
help='Pass these options to the external diff program.'),
1918
Option('prefix', type=str,
2383
Option('prefix', type=text_type,
1919
2384
short_name='p',
1920
2385
help='Set prefixes added to old and new filenames, as '
1921
2386
'two values separated by a colon. (eg "old/:new/").'),
1923
2388
help='Branch/tree to compare from.',
1927
2392
help='Branch/tree to compare to.',
1932
2397
Option('using',
1933
2398
help='Use this command to compare files.',
1936
2401
RegistryOption('format',
1937
2403
help='Diff format to use.',
1938
lazy_registry=('bzrlib.diff', 'format_registry'),
1939
value_switches=False, title='Diff format'),
2404
lazy_registry=('breezy.diff', 'format_registry'),
2405
title='Diff format'),
2407
help='How many lines of context to show.',
1941
2411
aliases = ['di', 'dif']
1942
2412
encoding_type = 'exact'
1944
2414
@display_command
1945
2415
def run(self, revision=None, file_list=None, diff_options=None,
1946
prefix=None, old=None, new=None, using=None, format=None):
1947
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
2416
prefix=None, old=None, new=None, using=None, format=None,
2418
from .diff import (get_trees_and_branches_to_diff_locked,
1948
2419
show_diff_trees)
1950
if (prefix is None) or (prefix == '0'):
1951
2422
# diff -p0 format
2425
elif prefix == u'1' or prefix is None:
1955
2426
old_label = 'old/'
1956
2427
new_label = 'new/'
1958
old_label, new_label = prefix.split(":")
2428
elif u':' in prefix:
2429
old_label, new_label = prefix.split(u":")
1960
raise errors.BzrCommandError(
2431
raise errors.BzrCommandError(gettext(
1961
2432
'--prefix expects two values separated by a colon'
1962
' (eg "old/:new/")')
2433
' (eg "old/:new/")'))
1964
2435
if revision and len(revision) > 2:
1965
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1966
' one or two revision specifiers')
2436
raise errors.BzrCommandError(gettext('brz diff --revision takes exactly'
2437
' one or two revision specifiers'))
1968
2439
if using is not None and format is not None:
1969
raise errors.BzrCommandError('--using and --format are mutually '
2440
raise errors.BzrCommandError(gettext(
2441
'{0} and {1} are mutually exclusive').format(
2442
'--using', '--format'))
1972
2444
(old_tree, new_tree,
1973
2445
old_branch, new_branch,
1974
2446
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1975
2447
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1976
return show_diff_trees(old_tree, new_tree, sys.stdout,
2448
# GNU diff on Windows uses ANSI encoding for filenames
2449
path_encoding = osutils.get_diff_header_encoding()
2450
return show_diff_trees(old_tree, new_tree, self.outf,
1977
2451
specific_files=specific_files,
1978
2452
external_diff_options=diff_options,
1979
2453
old_label=old_label, new_label=new_label,
1980
extra_trees=extra_trees, using=using,
2454
extra_trees=extra_trees,
2455
path_encoding=path_encoding,
2456
using=using, context=context,
1981
2457
format_cls=format)
2200
2676
:Other filtering:
2202
The --message option can be used for finding revisions that match a
2203
regular expression in a commit message.
2678
The --match option can be used for finding revisions that match a
2679
regular expression in a commit message, committer, author or bug.
2680
Specifying the option several times will match any of the supplied
2681
expressions. --match-author, --match-bugs, --match-committer and
2682
--match-message can be used to only match a specific field.
2205
2684
:Tips & tricks:
2207
2686
GUI tools and IDEs are often better at exploring history than command
2208
2687
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2209
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2210
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2688
bzr-explorer shell, or the Loggerhead web interface. See the Bazaar
2689
Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2211
2690
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2213
You may find it useful to add the aliases below to ``bazaar.conf``::
2692
You may find it useful to add the aliases below to ``breezy.conf``::
2217
2696
top = log -l10 --line
2218
2697
show = log -v -p
2220
``bzr tip`` will then show the latest revision while ``bzr top``
2699
``brz tip`` will then show the latest revision while ``brz top``
2221
2700
will show the last 10 mainline revisions. To see the details of a
2222
particular revision X, ``bzr show -rX``.
2701
particular revision X, ``brz show -rX``.
2224
2703
If you are interested in looking deeper into a particular merge X,
2225
use ``bzr log -n0 -rX``.
2704
use ``brz log -n0 -rX``.
2227
``bzr log -v`` on a branch with lots of history is currently
2706
``brz log -v`` on a branch with lots of history is currently
2228
2707
very slow. A fix for this issue is currently under development.
2229
2708
With or without that fix, it is recommended that a revision range
2230
2709
be given when using the -v option.
2232
bzr has a generic full-text matching plugin, bzr-search, that can be
2711
brz has a generic full-text matching plugin, brz-search, that can be
2233
2712
used to find revisions matching user names, commit messages, etc.
2234
2713
Among other features, this plugin can find all revisions containing
2235
2714
a list of words but not others.
2278
2757
Option('show-diff',
2279
2758
short_name='p',
2280
2759
help='Show changes made in each revision as a patch.'),
2281
Option('include-merges',
2760
Option('include-merged',
2282
2761
help='Show merged revisions like --levels 0 does.'),
2762
Option('include-merges', hidden=True,
2763
help='Historical alias for --include-merged.'),
2764
Option('omit-merges',
2765
help='Do not report commits with more than one parent.'),
2283
2766
Option('exclude-common-ancestry',
2284
2767
help='Display only the revisions that are not part'
2285
' of both ancestries (require -rX..Y)'
2768
' of both ancestries (require -rX..Y).'
2770
Option('signatures',
2771
help='Show digital signature validity.'),
2774
help='Show revisions whose properties match this '
2777
ListOption('match-message',
2778
help='Show revisions whose message matches this '
2781
ListOption('match-committer',
2782
help='Show revisions whose committer matches this '
2785
ListOption('match-author',
2786
help='Show revisions whose authors match this '
2789
ListOption('match-bugs',
2790
help='Show revisions whose bugs match this '
2288
2794
encoding_type = 'replace'
2655
3192
Patterns prefixed with '!!' act as regular ignore patterns, but have
2656
3193
precedence over the '!' exception patterns.
2658
Note: ignore patterns containing shell wildcards must be quoted from
3197
* Ignore patterns containing shell wildcards must be quoted from
3200
* Ignore patterns starting with "#" act as comments in the ignore file.
3201
To ignore patterns that begin with that character, use the "RE:" prefix.
2662
3204
Ignore the top level Makefile::
2664
bzr ignore ./Makefile
3206
brz ignore ./Makefile
2666
3208
Ignore .class files in all directories...::
2668
bzr ignore "*.class"
3210
brz ignore "*.class"
2670
3212
...but do not ignore "special.class"::
2672
bzr ignore "!special.class"
2674
Ignore .o files under the lib directory::
2676
bzr ignore "lib/**/*.o"
2678
Ignore .o files under the lib directory::
2680
bzr ignore "RE:lib/.*\.o"
3214
brz ignore "!special.class"
3216
Ignore files whose name begins with the "#" character::
3220
Ignore .o files under the lib directory::
3222
brz ignore "lib/**/*.o"
3224
Ignore .o files under the lib directory::
3226
brz ignore "RE:lib/.*\\.o"
2682
3228
Ignore everything but the "debian" toplevel directory::
2684
bzr ignore "RE:(?!debian/).*"
3230
brz ignore "RE:(?!debian/).*"
2686
3232
Ignore everything except the "local" toplevel directory,
2687
but always ignore "*~" autosave files, even under local/::
3233
but always ignore autosave files ending in ~, even under local/::
2690
bzr ignore "!./local"
3236
brz ignore "!./local"
2694
3240
_see_also = ['status', 'ignored', 'patterns']
2695
3241
takes_args = ['name_pattern*']
2696
3242
takes_options = ['directory',
2697
3243
Option('default-rules',
2698
help='Display the default ignore rules that bzr uses.')
3244
help='Display the default ignore rules that brz uses.')
2701
3247
def run(self, name_pattern_list=None, default_rules=None,
2702
3248
directory=u'.'):
2703
from bzrlib import ignores
3249
from breezy import ignores
2704
3250
if default_rules is not None:
2705
3251
# dump the default rules and exit
2706
3252
for pattern in ignores.USER_DEFAULTS:
2707
3253
self.outf.write("%s\n" % pattern)
2709
3255
if not name_pattern_list:
2710
raise errors.BzrCommandError("ignore requires at least one "
2711
"NAME_PATTERN or --default-rules.")
3256
raise errors.BzrCommandError(gettext("ignore requires at least one "
3257
"NAME_PATTERN or --default-rules."))
2712
3258
name_pattern_list = [globbing.normalize_pattern(p)
2713
3259
for p in name_pattern_list]
3261
bad_patterns_count = 0
3262
for p in name_pattern_list:
3263
if not globbing.Globster.is_pattern_valid(p):
3264
bad_patterns_count += 1
3265
bad_patterns += ('\n %s' % p)
3267
msg = (ngettext('Invalid ignore pattern found. %s',
3268
'Invalid ignore patterns found. %s',
3269
bad_patterns_count) % bad_patterns)
3270
ui.ui_factory.show_error(msg)
3271
raise lazy_regex.InvalidPattern('')
2714
3272
for name_pattern in name_pattern_list:
2715
3273
if (name_pattern[0] == '/' or
2716
3274
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2717
raise errors.BzrCommandError(
2718
"NAME_PATTERN should not be an absolute path")
3275
raise errors.BzrCommandError(gettext(
3276
"NAME_PATTERN should not be an absolute path"))
2719
3277
tree, relpath = WorkingTree.open_containing(directory)
2720
3278
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2721
3279
ignored = globbing.Globster(name_pattern_list)
3281
self.add_cleanup(tree.lock_read().unlock)
2724
3282
for entry in tree.list_files():
2726
3284
if id is not None:
2727
3285
filename = entry[0]
2728
3286
if ignored.match(filename):
2729
3287
matches.append(filename)
2731
3288
if len(matches) > 0:
2732
self.outf.write("Warning: the following files are version controlled and"
2733
" match your ignore pattern:\n%s"
3289
self.outf.write(gettext("Warning: the following files are version "
3290
"controlled and match your ignore pattern:\n%s"
2734
3291
"\nThese files will continue to be version controlled"
2735
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3292
" unless you 'brz remove' them.\n") % ("\n".join(matches),))
2738
3295
class cmd_ignored(Command):
2812
3369
================= =========================
2814
3372
takes_args = ['dest', 'branch_or_subdir?']
2815
3373
takes_options = ['directory',
2816
3374
Option('format',
2817
3375
help="Type of file to export to.",
2820
3378
Option('filters', help='Apply content filters to export the '
2821
3379
'convenient form.'),
2824
3382
help="Name of the root directory inside the exported file."),
2825
3383
Option('per-file-timestamps',
2826
3384
help='Set modification time of files to that of the last '
2827
3385
'revision in which it was changed.'),
3386
Option('uncommitted',
3387
help='Export the working tree contents rather than that of the '
2829
3390
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2830
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2831
from bzrlib.export import export
3391
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3393
from .export import export
2833
3395
if branch_or_subdir is None:
2834
tree = WorkingTree.open_containing(directory)[0]
3396
branch_or_subdir = directory
3398
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3400
if tree is not None:
3401
self.add_cleanup(tree.lock_read().unlock)
3405
raise errors.BzrCommandError(
3406
gettext("--uncommitted requires a working tree"))
2838
b, subdir = Branch.open_containing(branch_or_subdir)
2841
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3409
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2843
export(rev_tree, dest, format, root, subdir, filtered=filters,
3411
export(export_tree, dest, format, root, subdir, filtered=filters,
2844
3412
per_file_timestamps=per_file_timestamps)
2845
except errors.NoSuchExportFormat, e:
2846
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3413
except errors.NoSuchExportFormat as e:
3414
raise errors.BzrCommandError(
3415
gettext('Unsupported export format: %s') % e.format)
2849
3418
class cmd_cat(Command):
2887
3456
old_file_id = rev_tree.path2id(relpath)
3458
# TODO: Split out this code to something that generically finds the
3459
# best id for a path across one or more trees; it's like
3460
# find_ids_across_trees but restricted to find just one. -- mbp
2889
3462
if name_from_revision:
2890
3463
# Try in revision if requested
2891
3464
if old_file_id is None:
2892
raise errors.BzrCommandError(
2893
"%r is not present in revision %s" % (
3465
raise errors.BzrCommandError(gettext(
3466
"{0!r} is not present in revision {1}").format(
2894
3467
filename, rev_tree.get_revision_id()))
2896
content = rev_tree.get_file_text(old_file_id)
3469
actual_file_id = old_file_id
2898
3471
cur_file_id = tree.path2id(relpath)
2900
if cur_file_id is not None:
2901
# Then try with the actual file id
2903
content = rev_tree.get_file_text(cur_file_id)
2905
except errors.NoSuchId:
2906
# The actual file id didn't exist at that time
2908
if not found and old_file_id is not None:
2909
# Finally try with the old file id
2910
content = rev_tree.get_file_text(old_file_id)
2913
# Can't be found anywhere
2914
raise errors.BzrCommandError(
2915
"%r is not present in revision %s" % (
3472
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3473
actual_file_id = cur_file_id
3474
elif old_file_id is not None:
3475
actual_file_id = old_file_id
3477
raise errors.BzrCommandError(gettext(
3478
"{0!r} is not present in revision {1}").format(
2916
3479
filename, rev_tree.get_revision_id()))
2918
from bzrlib.filters import (
2919
ContentFilterContext,
2920
filtered_output_bytes,
2922
filters = rev_tree._content_filter_stack(relpath)
2923
chunks = content.splitlines(True)
2924
content = filtered_output_bytes(chunks, filters,
2925
ContentFilterContext(relpath, rev_tree))
2927
self.outf.writelines(content)
3481
from .filter_tree import ContentFilterTree
3482
filter_tree = ContentFilterTree(rev_tree,
3483
rev_tree._content_filter_stack)
3484
content = filter_tree.get_file_text(relpath, actual_file_id)
2930
self.outf.write(content)
3486
content = rev_tree.get_file_text(relpath, actual_file_id)
3488
self.outf.write(content)
2933
3491
class cmd_local_time_offset(Command):
2981
3539
A common mistake is to forget to add a new file or directory before
2982
3540
running the commit command. The --strict option checks for unknown
2983
3541
files and aborts the commit if any are found. More advanced pre-commit
2984
checks can be implemented by defining hooks. See ``bzr help hooks``
3542
checks can be implemented by defining hooks. See ``brz help hooks``
2987
3545
:Things to note:
2989
3547
If you accidentially commit the wrong changes or make a spelling
2990
3548
mistake in the commit message say, you can use the uncommit command
2991
to undo it. See ``bzr help uncommit`` for details.
3549
to undo it. See ``brz help uncommit`` for details.
2993
3551
Hooks can also be configured to run after a commit. This allows you
2994
3552
to trigger updates to external systems like bug trackers. The --fixes
2995
3553
option can be used to record the association between a revision and
2996
one or more bugs. See ``bzr help bugs`` for details.
2998
A selective commit may fail in some cases where the committed
2999
tree would be invalid. Consider::
3004
bzr commit foo -m "committing foo"
3005
bzr mv foo/bar foo/baz
3008
bzr commit foo/bar -m "committing bar but not baz"
3010
In the example above, the last commit will fail by design. This gives
3011
the user the opportunity to decide whether they want to commit the
3012
rename at the same time, separately first, or not at all. (As a general
3013
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3554
one or more bugs. See ``brz help bugs`` for details.
3015
# TODO: Run hooks on tree to-be-committed, and after commit.
3017
# TODO: Strict commit that fails if there are deleted files.
3018
# (what does "deleted files" mean ??)
3020
# TODO: Give better message for -s, --summary, used by tla people
3022
# XXX: verbose currently does nothing
3024
3557
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3025
3558
takes_args = ['selected*']
3026
3559
takes_options = [
3027
ListOption('exclude', type=str, short_name='x',
3560
ListOption('exclude', type=text_type, short_name='x',
3028
3561
help="Do not consider changes made to a given path."),
3029
Option('message', type=unicode,
3562
Option('message', type=text_type,
3030
3563
short_name='m',
3031
3564
help="Description of the new revision."),
3033
3566
Option('unchanged',
3034
3567
help='Commit even if nothing has changed.'),
3035
Option('file', type=str,
3568
Option('file', type=text_type,
3036
3569
short_name='F',
3037
3570
argname='msgfile',
3038
3571
help='Take commit message from this file.'),
3039
3572
Option('strict',
3040
3573
help="Refuse to commit if there are unknown "
3041
3574
"files in the working tree."),
3042
Option('commit-time', type=str,
3575
Option('commit-time', type=text_type,
3043
3576
help="Manually set a commit time using commit date "
3044
3577
"format, e.g. '2009-10-10 08:00:00 +0100'."),
3045
ListOption('fixes', type=str,
3578
ListOption('fixes', type=text_type,
3046
3579
help="Mark a bug as being fixed by this revision "
3047
"(see \"bzr help bugs\")."),
3048
ListOption('author', type=unicode,
3580
"(see \"brz help bugs\")."),
3581
ListOption('author', type=text_type,
3049
3582
help="Set the author's name, if it's different "
3050
3583
"from the committer."),
3051
3584
Option('local',
3057
3590
Option('show-diff', short_name='p',
3058
3591
help='When no message is supplied, show the diff along'
3059
3592
' with the status summary in the message editor.'),
3594
help='When committing to a foreign version control '
3595
'system do not push data that can not be natively '
3061
3598
aliases = ['ci', 'checkin']
3063
3600
def _iter_bug_fix_urls(self, fixes, branch):
3601
default_bugtracker = None
3064
3602
# Configure the properties for bug fixing attributes.
3065
3603
for fixed_bug in fixes:
3066
3604
tokens = fixed_bug.split(':')
3067
if len(tokens) != 2:
3068
raise errors.BzrCommandError(
3605
if len(tokens) == 1:
3606
if default_bugtracker is None:
3607
branch_config = branch.get_config_stack()
3608
default_bugtracker = branch_config.get(
3610
if default_bugtracker is None:
3611
raise errors.BzrCommandError(gettext(
3612
"No tracker specified for bug %s. Use the form "
3613
"'tracker:id' or specify a default bug tracker "
3614
"using the `bugtracker` option.\nSee "
3615
"\"brz help bugs\" for more information on this "
3616
"feature. Commit refused.") % fixed_bug)
3617
tag = default_bugtracker
3619
elif len(tokens) != 2:
3620
raise errors.BzrCommandError(gettext(
3069
3621
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3070
"See \"bzr help bugs\" for more information on this "
3071
"feature.\nCommit refused." % fixed_bug)
3072
tag, bug_id = tokens
3622
"See \"brz help bugs\" for more information on this "
3623
"feature.\nCommit refused.") % fixed_bug)
3625
tag, bug_id = tokens
3074
3627
yield bugtracker.get_bug_url(tag, branch, bug_id)
3075
except errors.UnknownBugTrackerAbbreviation:
3076
raise errors.BzrCommandError(
3077
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3078
except errors.MalformedBugIdentifier, e:
3079
raise errors.BzrCommandError(
3080
"%s\nCommit refused." % (str(e),))
3628
except bugtracker.UnknownBugTrackerAbbreviation:
3629
raise errors.BzrCommandError(gettext(
3630
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3631
except bugtracker.MalformedBugIdentifier as e:
3632
raise errors.BzrCommandError(gettext(
3633
u"%s\nCommit refused.") % (e,))
3082
3635
def run(self, message=None, file=None, verbose=False, selected_list=None,
3083
3636
unchanged=False, strict=False, local=False, fixes=None,
3084
author=None, show_diff=False, exclude=None, commit_time=None):
3085
from bzrlib.errors import (
3637
author=None, show_diff=False, exclude=None, commit_time=None,
3639
from .commit import (
3086
3640
PointlessCommit,
3642
from .errors import (
3087
3643
ConflictsInTree,
3088
3644
StrictCommitFailed
3090
from bzrlib.msgeditor import (
3646
from .msgeditor import (
3091
3647
edit_commit_message_encoded,
3092
3648
generate_commit_message_template,
3093
make_commit_message_template_encoded
3649
make_commit_message_template_encoded,
3096
3653
commit_stamp = offset = None
3097
3654
if commit_time is not None:
3099
3656
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3100
except ValueError, e:
3101
raise errors.BzrCommandError(
3102
"Could not parse --commit-time: " + str(e))
3104
# TODO: Need a blackbox test for invoking the external editor; may be
3105
# slightly problematic to run this cross-platform.
3107
# TODO: do more checks that the commit will succeed before
3108
# spending the user's valuable time typing a commit message.
3657
except ValueError as e:
3658
raise errors.BzrCommandError(gettext(
3659
"Could not parse --commit-time: " + str(e)))
3110
3661
properties = {}
3112
tree, selected_list = tree_files(selected_list)
3663
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3113
3664
if selected_list == ['']:
3114
3665
# workaround - commit of root of tree should be exactly the same
3115
3666
# as just default commit in that tree, and succeed even though
3186
3745
reporter=None, verbose=verbose, revprops=properties,
3187
3746
authors=author, timestamp=commit_stamp,
3188
3747
timezone=offset,
3189
exclude=safe_relpath_files(tree, exclude))
3748
exclude=tree.safe_relpath_files(exclude),
3190
3750
except PointlessCommit:
3191
raise errors.BzrCommandError("No changes to commit."
3192
" Use --unchanged to commit anyhow.")
3751
raise errors.BzrCommandError(gettext("No changes to commit."
3752
" Please 'brz add' the files you want to commit, or use"
3753
" --unchanged to force an empty commit."))
3193
3754
except ConflictsInTree:
3194
raise errors.BzrCommandError('Conflicts detected in working '
3195
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3755
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3756
'tree. Use "brz conflicts" to list, "brz resolve FILE" to'
3197
3758
except StrictCommitFailed:
3198
raise errors.BzrCommandError("Commit refused because there are"
3199
" unknown files in the working tree.")
3200
except errors.BoundBranchOutOfDate, e:
3201
e.extra_help = ("\n"
3759
raise errors.BzrCommandError(gettext("Commit refused because there are"
3760
" unknown files in the working tree."))
3761
except errors.BoundBranchOutOfDate as e:
3762
e.extra_help = (gettext("\n"
3202
3763
'To commit to master branch, run update and then commit.\n'
3203
3764
'You can also pass --local to commit to continue working '
3278
3839
class cmd_upgrade(Command):
3279
__doc__ = """Upgrade branch storage to current format.
3281
The check command or bzr developers may sometimes advise you to run
3282
this command. When the default format has changed you may also be warned
3283
during other operations to upgrade.
3840
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3842
When the default format has changed after a major new release of
3843
Bazaar, you may be informed during certain operations that you
3844
should upgrade. Upgrading to a newer format may improve performance
3845
or make new features available. It may however limit interoperability
3846
with older repositories or with older versions of Bazaar.
3848
If you wish to upgrade to a particular format rather than the
3849
current default, that can be specified using the --format option.
3850
As a consequence, you can use the upgrade command this way to
3851
"downgrade" to an earlier format, though some conversions are
3852
a one way process (e.g. changing from the 1.x default to the
3853
2.x default) so downgrading is not always possible.
3855
A backup.bzr.~#~ directory is created at the start of the conversion
3856
process (where # is a number). By default, this is left there on
3857
completion. If the conversion fails, delete the new .bzr directory
3858
and rename this one back in its place. Use the --clean option to ask
3859
for the backup.bzr directory to be removed on successful conversion.
3860
Alternatively, you can delete it by hand if everything looks good
3863
If the location given is a shared repository, dependent branches
3864
are also converted provided the repository converts successfully.
3865
If the conversion of a branch fails, remaining branches are still
3868
For more information on upgrades, see the Bazaar Upgrade Guide,
3869
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3286
_see_also = ['check']
3872
_see_also = ['check', 'reconcile', 'formats']
3287
3873
takes_args = ['url?']
3288
3874
takes_options = [
3289
RegistryOption('format',
3290
help='Upgrade to a specific format. See "bzr help'
3291
' formats" for details.',
3292
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3293
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3294
value_switches=True, title='Branch format'),
3875
RegistryOption('format',
3876
help='Upgrade to a specific format. See "brz help'
3877
' formats" for details.',
3878
lazy_registry=('breezy.controldir', 'format_registry'),
3879
converter=lambda name: controldir.format_registry.make_controldir(name),
3880
value_switches=True, title='Branch format'),
3882
help='Remove the backup.bzr directory if successful.'),
3884
help="Show what would be done, but don't actually do anything."),
3297
def run(self, url='.', format=None):
3298
from bzrlib.upgrade import upgrade
3299
upgrade(url, format)
3887
def run(self, url='.', format=None, clean=False, dry_run=False):
3888
from .upgrade import upgrade
3889
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3891
if len(exceptions) == 1:
3892
# Compatibility with historical behavior
3302
3898
class cmd_whoami(Command):
3303
__doc__ = """Show or set bzr user id.
3899
__doc__ = """Show or set brz user id.
3306
3902
Show the email of the current user::
3310
3906
Set the current user::
3312
bzr whoami "Frank Chu <fchu@example.com>"
3908
brz whoami "Frank Chu <fchu@example.com>"
3314
takes_options = [ Option('email',
3910
takes_options = [ 'directory',
3315
3912
help='Display email address only.'),
3316
3913
Option('branch',
3317
3914
help='Set identity for the current branch instead of '
3321
3918
encoding_type = 'replace'
3323
3920
@display_command
3324
def run(self, email=False, branch=False, name=None):
3921
def run(self, email=False, branch=False, name=None, directory=None):
3325
3922
if name is None:
3326
# use branch if we're inside one; otherwise global config
3328
c = Branch.open_containing('.')[0].get_config()
3329
except errors.NotBranchError:
3330
c = config.GlobalConfig()
3923
if directory is None:
3924
# use branch if we're inside one; otherwise global config
3926
c = Branch.open_containing(u'.')[0].get_config_stack()
3927
except errors.NotBranchError:
3928
c = _mod_config.GlobalStack()
3930
c = Branch.open(directory).get_config_stack()
3931
identity = c.get('email')
3332
self.outf.write(c.user_email() + '\n')
3933
self.outf.write(_mod_config.extract_email_address(identity)
3334
self.outf.write(c.username() + '\n')
3936
self.outf.write(identity + '\n')
3940
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3337
3943
# display a warning if an email address isn't included in the given name.
3339
config.extract_email_address(name)
3340
except errors.NoEmailInUsername, e:
3945
_mod_config.extract_email_address(name)
3946
except _mod_config.NoEmailInUsername as e:
3341
3947
warning('"%s" does not seem to contain an email address. '
3342
3948
'This is allowed, but not recommended.', name)
3344
3950
# use global config unless --branch given
3346
c = Branch.open_containing('.')[0].get_config()
3952
if directory is None:
3953
c = Branch.open_containing(u'.')[0].get_config_stack()
3955
b = Branch.open(directory)
3956
self.add_cleanup(b.lock_write().unlock)
3957
c = b.get_config_stack()
3348
c = config.GlobalConfig()
3349
c.set_user_option('email', name)
3959
c = _mod_config.GlobalStack()
3960
c.set('email', name)
3352
3963
class cmd_nick(Command):
3353
3964
__doc__ = """Print or set the branch nickname.
3355
If unset, the tree root directory name is used as the nickname.
3356
To print the current nickname, execute with no argument.
3966
If unset, the colocated branch name is used for colocated branches, and
3967
the branch directory name is used for other branches. To print the
3968
current nickname, execute with no argument.
3358
3970
Bound branches use the nickname of its master branch unless it is set
3415
4027
def remove_alias(self, alias_name):
3416
4028
if alias_name is None:
3417
raise errors.BzrCommandError(
3418
'bzr alias --remove expects an alias to remove.')
4029
raise errors.BzrCommandError(gettext(
4030
'brz alias --remove expects an alias to remove.'))
3419
4031
# If alias is not found, print something like:
3420
4032
# unalias: foo: not found
3421
c = config.GlobalConfig()
4033
c = _mod_config.GlobalConfig()
3422
4034
c.unset_alias(alias_name)
3424
4036
@display_command
3425
4037
def print_aliases(self):
3426
4038
"""Print out the defined aliases in a similar format to bash."""
3427
aliases = config.GlobalConfig().get_aliases()
3428
for key, value in sorted(aliases.iteritems()):
3429
self.outf.write('bzr alias %s="%s"\n' % (key, value))
4039
aliases = _mod_config.GlobalConfig().get_aliases()
4040
for key, value in sorted(viewitems(aliases)):
4041
self.outf.write('brz alias %s="%s"\n' % (key, value))
3431
4043
@display_command
3432
4044
def print_alias(self, alias_name):
3433
from bzrlib.commands import get_alias
4045
from .commands import get_alias
3434
4046
alias = get_alias(alias_name)
3435
4047
if alias is None:
3436
self.outf.write("bzr alias: %s: not found\n" % alias_name)
4048
self.outf.write("brz alias: %s: not found\n" % alias_name)
3438
4050
self.outf.write(
3439
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
4051
'brz alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3441
4053
def set_alias(self, alias_name, alias_command):
3442
4054
"""Save the alias in the global config."""
3443
c = config.GlobalConfig()
4055
c = _mod_config.GlobalConfig()
3444
4056
c.set_alias(alias_name, alias_command)
3478
4090
Tests that need working space on disk use a common temporary directory,
3479
4091
typically inside $TMPDIR or /tmp.
3481
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
4093
If you set BRZ_TEST_PDB=1 when running selftest, failing tests will drop
3482
4094
into a pdb postmortem session.
4096
The --coverage=DIRNAME global option produces a report with covered code
3485
4100
Run only tests relating to 'ignore'::
3489
4104
Disable plugins and list tests as they're run::
3491
bzr --no-plugins selftest -v
4106
brz --no-plugins selftest -v
3493
4108
# NB: this is used from the class without creating an instance, which is
3494
4109
# why it does not have a self parameter.
3495
4110
def get_transport_type(typestring):
3496
4111
"""Parse and return a transport specifier."""
3497
4112
if typestring == "sftp":
3498
from bzrlib.tests import stub_sftp
4113
from .tests import stub_sftp
3499
4114
return stub_sftp.SFTPAbsoluteServer
3500
if typestring == "memory":
3501
from bzrlib.tests import test_server
4115
elif typestring == "memory":
4116
from .tests import test_server
3502
4117
return memory.MemoryServer
3503
if typestring == "fakenfs":
3504
from bzrlib.tests import test_server
4118
elif typestring == "fakenfs":
4119
from .tests import test_server
3505
4120
return test_server.FakeNFSServer
3506
4121
msg = "No known transport type %s. Supported types are: sftp\n" %\
3536
4149
help='List the tests instead of running them.'),
3537
4150
RegistryOption('parallel',
3538
4151
help="Run the test suite in parallel.",
3539
lazy_registry=('bzrlib.tests', 'parallel_registry'),
4152
lazy_registry=('breezy.tests', 'parallel_registry'),
3540
4153
value_switches=False,
3542
Option('randomize', type=str, argname="SEED",
4155
Option('randomize', type=text_type, argname="SEED",
3543
4156
help='Randomize the order of tests using the given'
3544
4157
' seed or "now" for the current time.'),
3545
Option('exclude', type=str, argname="PATTERN",
3547
help='Exclude tests that match this regular'
3550
help='Output test progress via subunit.'),
4158
ListOption('exclude', type=text_type, argname="PATTERN",
4160
help='Exclude tests that match this regular'
4163
help='Output test progress via subunit v1.'),
4165
help='Output test progress via subunit v2.'),
3551
4166
Option('strict', help='Fail on missing dependencies or '
3552
4167
'known failures.'),
3553
Option('load-list', type=str, argname='TESTLISTFILE',
4168
Option('load-list', type=text_type, argname='TESTLISTFILE',
3554
4169
help='Load a test id list from a text file.'),
3555
ListOption('debugflag', type=str, short_name='E',
4170
ListOption('debugflag', type=text_type, short_name='E',
3556
4171
help='Turn on a selftest debug flag.'),
3557
ListOption('starting-with', type=str, argname='TESTID',
4172
ListOption('starting-with', type=text_type, argname='TESTID',
3558
4173
param_name='starting_with', short_name='s',
3560
4175
'Load only the tests starting with TESTID.'),
4177
help="By default we disable fsync and fdatasync"
4178
" while running the test suite.")
3562
4180
encoding_type = 'replace'
3568
4186
def run(self, testspecs_list=None, verbose=False, one=False,
3569
4187
transport=None, benchmark=None,
3570
lsprof_timed=None, cache_dir=None,
3571
4189
first=False, list_only=False,
3572
4190
randomize=None, exclude=None, strict=False,
3573
load_list=None, debugflag=None, starting_with=None, subunit=False,
3574
parallel=None, lsprof_tests=False):
3575
from bzrlib.tests import selftest
3576
import bzrlib.benchmarks as benchmarks
3577
from bzrlib.benchmarks import tree_creator
3579
# Make deprecation warnings visible, unless -Werror is set
3580
symbol_versioning.activate_deprecation_warnings(override=False)
3582
if cache_dir is not None:
3583
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
4191
load_list=None, debugflag=None, starting_with=None, subunit1=False,
4192
subunit2=False, parallel=None, lsprof_tests=False, sync=False):
4194
# During selftest, disallow proxying, as it can cause severe
4195
# performance penalties and is only needed for thread
4196
# safety. The selftest command is assumed to not use threads
4197
# too heavily. The call should be as early as possible, as
4198
# error reporting for past duplicate imports won't have useful
4200
lazy_import.disallow_proxying()
3584
4204
if testspecs_list is not None:
3585
4205
pattern = '|'.join(testspecs_list)
3590
from bzrlib.tests import SubUnitBzrRunner
4210
from .tests import SubUnitBzrRunnerv1
3591
4211
except ImportError:
3592
raise errors.BzrCommandError("subunit not available. subunit "
3593
"needs to be installed to use --subunit.")
3594
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
4212
raise errors.BzrCommandError(gettext(
4213
"subunit not available. subunit needs to be installed "
4214
"to use --subunit."))
4215
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv1
3595
4216
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3596
4217
# stdout, which would corrupt the subunit stream.
3597
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4218
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4219
# following code can be deleted when it's sufficiently deployed
4220
# -- vila/mgz 20100514
4221
if (sys.platform == "win32"
4222
and getattr(sys.stdout, 'fileno', None) is not None):
3599
4224
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
4227
from .tests import SubUnitBzrRunnerv2
4229
raise errors.BzrCommandError(gettext(
4230
"subunit not available. subunit "
4231
"needs to be installed to use --subunit2."))
4232
self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv2
3601
4235
self.additional_selftest_args.setdefault(
3602
4236
'suite_decorators', []).append(parallel)
3604
test_suite_factory = benchmarks.test_suite
3605
# Unless user explicitly asks for quiet, be verbose in benchmarks
3606
verbose = not is_quiet()
3607
# TODO: should possibly lock the history file...
3608
benchfile = open(".perf_history", "at", buffering=1)
3609
self.add_cleanup(benchfile.close)
4238
raise errors.BzrCommandError(gettext(
4239
"--benchmark is no longer supported from brz 2.2; "
4240
"use bzr-usertest instead"))
4241
test_suite_factory = None
4243
exclude_pattern = None
3611
test_suite_factory = None
4245
exclude_pattern = '(' + '|'.join(exclude) + ')'
4247
self._disable_fsync()
3613
4248
selftest_kwargs = {"verbose": verbose,
3614
4249
"pattern": pattern,
3615
4250
"stop_on_failure": one,
3617
4252
"test_suite_factory": test_suite_factory,
3618
4253
"lsprof_timed": lsprof_timed,
3619
4254
"lsprof_tests": lsprof_tests,
3620
"bench_history": benchfile,
3621
4255
"matching_tests_first": first,
3622
4256
"list_only": list_only,
3623
4257
"random_seed": randomize,
3624
"exclude_pattern": exclude,
4258
"exclude_pattern": exclude_pattern,
3625
4259
"strict": strict,
3626
4260
"load_list": load_list,
3627
4261
"debug_flags": debugflag,
3628
4262
"starting_with": starting_with
3630
4264
selftest_kwargs.update(self.additional_selftest_args)
3631
result = selftest(**selftest_kwargs)
4266
# Make deprecation warnings visible, unless -Werror is set
4267
cleanup = symbol_versioning.activate_deprecation_warnings(
4270
result = tests.selftest(**selftest_kwargs)
3632
4273
return int(not result)
4275
def _disable_fsync(self):
4276
"""Change the 'os' functionality to not synchronize."""
4277
self._orig_fsync = getattr(os, 'fsync', None)
4278
if self._orig_fsync is not None:
4279
os.fsync = lambda filedes: None
4280
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4281
if self._orig_fdatasync is not None:
4282
os.fdatasync = lambda filedes: None
3635
4285
class cmd_version(Command):
3636
__doc__ = """Show version of bzr."""
4286
__doc__ = """Show version of brz."""
3638
4288
encoding_type = 'replace'
3639
4289
takes_options = [
3689
4339
The source of the merge can be specified either in the form of a branch,
3690
4340
or in the form of a path to a file containing a merge directive generated
3691
with bzr send. If neither is specified, the default is the upstream branch
3692
or the branch most recently merged using --remember.
3694
When merging a branch, by default the tip will be merged. To pick a different
3695
revision, pass --revision. If you specify two values, the first will be used as
3696
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3697
available revisions, like this is commonly referred to as "cherrypicking".
3699
Revision numbers are always relative to the branch being merged.
3701
By default, bzr will try to merge in all new work from the other
3702
branch, automatically determining an appropriate base. If this
3703
fails, you may need to give an explicit base.
4341
with brz send. If neither is specified, the default is the upstream branch
4342
or the branch most recently merged using --remember. The source of the
4343
merge may also be specified in the form of a path to a file in another
4344
branch: in this case, only the modifications to that file are merged into
4345
the current working tree.
4347
When merging from a branch, by default brz will try to merge in all new
4348
work from the other branch, automatically determining an appropriate base
4349
revision. If this fails, you may need to give an explicit base.
4351
To pick a different ending revision, pass "--revision OTHER". brz will
4352
try to merge in all new work up to and including revision OTHER.
4354
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4355
through OTHER, excluding BASE but including OTHER, will be merged. If this
4356
causes some revisions to be skipped, i.e. if the destination branch does
4357
not already contain revision BASE, such a merge is commonly referred to as
4358
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4359
cherrypicks. The changes look like a normal commit, and the history of the
4360
changes from the other branch is not stored in the commit.
4362
Revision numbers are always relative to the source branch.
3705
4364
Merge will do its best to combine the changes in two branches, but there
3706
4365
are some kinds of problems only a human can fix. When it encounters those,
3707
4366
it will mark a conflict. A conflict means that you need to fix something,
3708
before you should commit.
3710
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3712
If there is no default branch set, the first merge will set it. After
3713
that, you can omit the branch to use the default. To change the
3714
default, use --remember. The value will only be saved if the remote
3715
location can be accessed.
4367
before you can commit.
4369
Use brz resolve when you have fixed a problem. See also brz conflicts.
4371
If there is no default branch set, the first merge will set it (use
4372
--no-remember to avoid setting it). After that, you can omit the branch
4373
to use the default. To change the default, use --remember. The value will
4374
only be saved if the remote location can be accessed.
3717
4376
The results of the merge are placed into the destination working
3718
directory, where they can be reviewed (with bzr diff), tested, and then
4377
directory, where they can be reviewed (with brz diff), tested, and then
3719
4378
committed to record the result of the merge.
3721
4380
merge refuses to run if there are any uncommitted changes, unless
3722
--force is given. The --force option can also be used to create a
4381
--force is given. If --force is given, then the changes from the source
4382
will be merged with the current working tree, including any uncommitted
4383
changes in the tree. The --force option can also be used to create a
3723
4384
merge revision which has more than two parents.
3725
4386
If one would like to merge changes from the working tree of the other
3849
4514
self.sanity_check_merger(merger)
3850
4515
if (merger.base_rev_id == merger.other_rev_id and
3851
4516
merger.other_rev_id is not None):
3852
note('Nothing to do.')
4517
# check if location is a nonexistent file (and not a branch) to
4518
# disambiguate the 'Nothing to do'
4519
if merger.interesting_files:
4520
if not merger.other_tree.has_filename(
4521
merger.interesting_files[0]):
4522
note(gettext("merger: ") + str(merger))
4523
raise errors.PathsDoNotExist([location])
4524
note(gettext('Nothing to do.'))
4526
if pull and not preview:
3855
4527
if merger.interesting_files is not None:
3856
raise errors.BzrCommandError('Cannot pull individual files')
4528
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3857
4529
if (merger.base_rev_id == tree.last_revision()):
3858
4530
result = tree.pull(merger.other_branch, False,
3859
4531
merger.other_rev_id)
3860
4532
result.report(self.outf)
3862
4534
if merger.this_basis is None:
3863
raise errors.BzrCommandError(
4535
raise errors.BzrCommandError(gettext(
3864
4536
"This branch has no commits."
3865
" (perhaps you would prefer 'bzr pull')")
4537
" (perhaps you would prefer 'brz pull')"))
3867
4539
return self._do_preview(merger)
3868
4540
elif interactive:
3964
4637
if other_revision_id is None:
3965
4638
other_revision_id = _mod_revision.ensure_null(
3966
4639
other_branch.last_revision())
3967
# Remember where we merge from
3968
if ((remember or tree.branch.get_submit_branch() is None) and
3969
user_location is not None):
4640
# Remember where we merge from. We need to remember if:
4641
# - user specify a location (and we don't merge from the parent
4643
# - user ask to remember or there is no previous location set to merge
4644
# from and user didn't ask to *not* remember
4645
if (user_location is not None
4647
or (remember is None
4648
and tree.branch.get_submit_branch() is None)))):
3970
4649
tree.branch.set_submit_branch(other_branch.base)
3971
_merge_tags_if_possible(other_branch, tree.branch)
3972
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4650
# Merge tags (but don't set them in the master branch yet, the user
4651
# might revert this merge). Commit will propagate them.
4652
other_branch.tags.merge_to(tree.branch.tags, ignore_master=True)
4653
merger = _mod_merge.Merger.from_revision_ids(tree,
3973
4654
other_revision_id, base_revision_id, other_branch, base_branch)
3974
4655
if other_path != '':
3975
4656
allow_pending = False
4137
4819
class cmd_revert(Command):
4138
__doc__ = """Revert files to a previous revision.
4821
Set files in the working tree back to the contents of a previous revision.
4140
4823
Giving a list of files will revert only those files. Otherwise, all files
4141
4824
will be reverted. If the revision is not specified with '--revision', the
4142
last committed revision is used.
4825
working tree basis revision is used. A revert operation affects only the
4826
working tree, not any revision history like the branch and repository or
4827
the working tree basis revision.
4144
4829
To remove only some changes, without reverting to a prior version, use
4145
merge instead. For example, "merge . --revision -2..-3" will remove the
4146
changes introduced by -2, without affecting the changes introduced by -1.
4147
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4830
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4831
will remove the changes introduced by the second last commit (-2), without
4832
affecting the changes introduced by the last commit (-1). To remove
4833
certain changes on a hunk-by-hunk basis, see the shelve command.
4834
To update the branch to a specific revision or the latest revision and
4835
update the working tree accordingly while preserving local changes, see the
4149
By default, any files that have been manually changed will be backed up
4150
first. (Files changed only by merge are not backed up.) Backup files have
4151
'.~#~' appended to their name, where # is a number.
4838
Uncommitted changes to files that are reverted will be discarded.
4839
Howver, by default, any files that have been manually changed will be
4840
backed up first. (Files changed only by merge are not backed up.) Backup
4841
files have '.~#~' appended to their name, where # is a number.
4153
4843
When you provide files, you can use their current pathname or the pathname
4154
4844
from the target revision. So you can use revert to "undelete" a file by
4267
4957
Determine the missing revisions between this and the branch at the
4268
4958
remembered pull location::
4272
4962
Determine the missing revisions between this and another branch::
4274
bzr missing http://server/branch
4964
brz missing http://server/branch
4276
4966
Determine the missing revisions up to a specific revision on the other
4279
bzr missing -r ..-10
4969
brz missing -r ..-10
4281
4971
Determine the missing revisions up to a specific revision on this
4284
bzr missing --my-revision ..-10
4974
brz missing --my-revision ..-10
4287
4977
_see_also = ['merge', 'pull']
4288
4978
takes_args = ['other_branch?']
4289
4979
takes_options = [
4290
4981
Option('reverse', 'Reverse the order of revisions.'),
4291
4982
Option('mine-only',
4292
4983
'Display changes in the local branch only.'),
4293
Option('this' , 'Same as --mine-only.'),
4984
Option('this', 'Same as --mine-only.'),
4294
4985
Option('theirs-only',
4295
4986
'Display changes in the remote branch only.'),
4296
4987
Option('other', 'Same as --theirs-only.'),
4391
5093
if remote_extra and not mine_only:
4392
5094
if printed_local is True:
4393
5095
message("\n\n\n")
4394
message("You are missing %d revision(s):\n" %
5096
message(ngettext("You are missing %d revision:\n",
5097
"You are missing %d revisions:\n",
5098
len(remote_extra)) %
4395
5099
len(remote_extra))
5100
if remote_branch.supports_tags():
5101
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4396
5102
for revision in iter_log_revisions(remote_extra,
4397
5103
remote_branch.repository,
4399
5106
lf.log_revision(revision)
4400
5107
status_code = 1
4402
5109
if mine_only and not local_extra:
4403
5110
# We checked local, and found nothing extra
4404
message('This branch is up to date.\n')
5111
message(gettext('This branch has no new revisions.\n'))
4405
5112
elif theirs_only and not remote_extra:
4406
5113
# We checked remote, and found nothing extra
4407
message('Other branch is up to date.\n')
5114
message(gettext('Other branch has no new revisions.\n'))
4408
5115
elif not (mine_only or theirs_only or local_extra or
4410
5117
# We checked both branches, and neither one had extra
4412
message("Branches are up to date.\n")
5119
message(gettext("Branches are up to date.\n"))
4413
5120
self.cleanup_now()
4414
5121
if not status_code and parent is None and other_branch is not None:
4415
5122
self.add_cleanup(local_branch.lock_write().unlock)
4564
5258
self.add_cleanup(branch.lock_read().unlock)
4565
5259
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4566
5260
self.add_cleanup(tree.lock_read().unlock)
5261
if wt is not None and revision is None:
4568
5262
file_id = wt.path2id(relpath)
4570
5264
file_id = tree.path2id(relpath)
4571
5265
if file_id is None:
4572
5266
raise errors.NotVersionedError(filename)
4573
file_version = tree.inventory[file_id].revision
4574
5267
if wt is not None and revision is None:
4575
5268
# If there is a tree and we're not annotating historical
4576
5269
# versions, annotate the working tree's content.
4577
annotate_file_tree(wt, file_id, self.outf, long, all,
5270
annotate_file_tree(wt, relpath, self.outf, long, all,
5271
show_ids=show_ids, file_id=file_id)
4580
annotate_file(branch, file_version, file_id, long, all, self.outf,
5273
annotate_file_tree(tree, relpath, self.outf, long, all,
5274
show_ids=show_ids, branch=branch, file_id=file_id)
4584
5277
class cmd_re_sign(Command):
4592
5285
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4593
5286
if revision_id_list is not None and revision is not None:
4594
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5287
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4595
5288
if revision_id_list is None and revision is None:
4596
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
5289
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
4597
5290
b = WorkingTree.open_containing(directory)[0].branch
4598
5291
self.add_cleanup(b.lock_write().unlock)
4599
5292
return self._run(b, revision_id_list, revision)
4601
5294
def _run(self, b, revision_id_list, revision):
4602
import bzrlib.gpg as gpg
4603
gpg_strategy = gpg.GPGStrategy(b.get_config())
5296
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4604
5297
if revision_id_list is not None:
4605
5298
b.repository.start_write_group()
4607
5300
for revision_id in revision_id_list:
5301
revision_id = cache_utf8.encode(revision_id)
4608
5302
b.repository.sign_revision(revision_id, gpg_strategy)
4610
5304
b.repository.abort_write_group()
4669
5363
location = b.get_old_bound_location()
4670
5364
except errors.UpgradeRequired:
4671
raise errors.BzrCommandError('No location supplied. '
4672
'This format does not remember old locations.')
5365
raise errors.BzrCommandError(gettext('No location supplied. '
5366
'This format does not remember old locations.'))
4674
5368
if location is None:
4675
5369
if b.get_bound_location() is not None:
4676
raise errors.BzrCommandError('Branch is already bound')
5370
raise errors.BzrCommandError(
5371
gettext('Branch is already bound'))
4678
raise errors.BzrCommandError('No location supplied '
4679
'and no previous location known')
5373
raise errors.BzrCommandError(
5374
gettext('No location supplied'
5375
' and no previous location known'))
4680
5376
b_other = Branch.open(location)
4682
5378
b.bind(b_other)
4683
5379
except errors.DivergedBranches:
4684
raise errors.BzrCommandError('These branches have diverged.'
4685
' Try merging, and then bind again.')
5380
raise errors.BzrCommandError(gettext('These branches have diverged.'
5381
' Try merging, and then bind again.'))
4686
5382
if b.get_config().has_explicit_nickname():
4687
5383
b.nick = b_other.nick
4754
5451
self.add_cleanup(tree.lock_write().unlock)
4756
5453
self.add_cleanup(b.lock_write().unlock)
4757
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5454
return self._run(b, tree, dry_run, verbose, revision, force,
4759
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4760
from bzrlib.log import log_formatter, show_log
4761
from bzrlib.uncommit import uncommit
5457
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5459
from .log import log_formatter, show_log
5460
from .uncommit import uncommit
4763
5462
last_revno, last_rev_id = b.last_revision_info()
4792
5491
end_revision=last_revno)
4795
self.outf.write('Dry-run, pretending to remove'
4796
' the above revisions.\n')
5494
self.outf.write(gettext('Dry-run, pretending to remove'
5495
' the above revisions.\n'))
4798
self.outf.write('The above revision(s) will be removed.\n')
5497
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4801
if not ui.ui_factory.get_boolean('Are you sure'):
4802
self.outf.write('Canceled')
5500
if not ui.ui_factory.confirm_action(
5501
gettext(u'Uncommit these revisions'),
5502
'breezy.builtins.uncommit',
5504
self.outf.write(gettext('Canceled\n'))
4805
5507
mutter('Uncommitting from {%s} to {%s}',
4806
5508
last_rev_id, rev_id)
4807
5509
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4808
revno=revno, local=local)
4809
self.outf.write('You can restore the old tip by running:\n'
4810
' bzr pull . -r revid:%s\n' % last_rev_id)
5510
revno=revno, local=local, keep_tags=keep_tags)
5511
self.outf.write(gettext('You can restore the old tip by running:\n'
5512
' brz pull . -r revid:%s\n') % last_rev_id)
4813
5515
class cmd_break_lock(Command):
4814
__doc__ = """Break a dead lock on a repository, branch or working directory.
5516
__doc__ = """Break a dead lock.
5518
This command breaks a lock on a repository, branch, working directory or
4816
5521
CAUTION: Locks should only be broken when you are sure that the process
4817
5522
holding the lock has been stopped.
4819
You can get information on what locks are open via the 'bzr info
5524
You can get information on what locks are open via the 'brz info
4820
5525
[location]' command.
4824
bzr break-lock bzr+ssh://example.com/bzr/foo
5529
brz break-lock brz+ssh://example.com/brz/foo
5530
brz break-lock --conf ~/.bazaar
4826
5533
takes_args = ['location?']
5536
help='LOCATION is the directory where the config lock is.'),
5538
help='Do not ask for confirmation before breaking the lock.'),
4828
def run(self, location=None, show=False):
5541
def run(self, location=None, config=False, force=False):
4829
5542
if location is None:
4830
5543
location = u'.'
4831
control, relpath = bzrdir.BzrDir.open_containing(location)
4833
control.break_lock()
4834
except NotImplementedError:
5545
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5547
{'breezy.lockdir.break': True})
5549
conf = _mod_config.LockableConfig(file_name=location)
5552
control, relpath = controldir.ControlDir.open_containing(location)
5554
control.break_lock()
5555
except NotImplementedError:
4838
5559
class cmd_wait_until_signalled(Command):
4839
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5560
__doc__ = """Test helper for test_start_and_stop_brz_subprocess_send_signal.
4841
5562
This just prints a line to signal when it is ready, then blocks on stdin.
4859
5580
help='Serve on stdin/out for use from inetd or sshd.'),
4860
5581
RegistryOption('protocol',
4861
5582
help="Protocol to serve.",
4862
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5583
lazy_registry=('breezy.transport', 'transport_server_registry'),
4863
5584
value_switches=True),
5586
help='Listen for connections on nominated address.', type=text_type),
4865
help='Listen for connections on nominated port of the form '
4866
'[hostname:]portnumber. Passing 0 as the port number will '
4867
'result in a dynamically allocated port. The default port '
4868
'depends on the protocol.',
5588
help='Listen for connections on nominated port. Passing 0 as '
5589
'the port number will result in a dynamically allocated '
5590
'port. The default port depends on the protocol.',
4870
5592
custom_help('directory',
4871
5593
help='Serve contents of this directory.'),
4872
5594
Option('allow-writes',
4873
5595
help='By default the server is a readonly server. Supplying '
4874
5596
'--allow-writes enables write access to the contents of '
4875
'the served directory and below. Note that ``bzr serve`` '
5597
'the served directory and below. Note that ``brz serve`` '
4876
5598
'does not perform authentication, so unless some form of '
4877
5599
'external authentication is arranged supplying this '
4878
5600
'option leads to global uncontrolled write access to your '
5603
Option('client-timeout', type=float,
5604
help='Override the default idle client timeout (5min).'),
4883
def get_host_and_port(self, port):
4884
"""Return the host and port to run the smart server on.
4886
If 'port' is None, None will be returned for the host and port.
4888
If 'port' has a colon in it, the string before the colon will be
4889
interpreted as the host.
4891
:param port: A string of the port to run the server on.
4892
:return: A tuple of (host, port), where 'host' is a host name or IP,
4893
and port is an integer TCP/IP port.
4896
if port is not None:
4898
host, port = port.split(':')
4902
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4904
from bzrlib.transport import get_transport, transport_server_registry
5607
def run(self, listen=None, port=None, inet=False, directory=None,
5608
allow_writes=False, protocol=None, client_timeout=None):
5609
from . import transport
4905
5610
if directory is None:
4906
directory = os.getcwd()
5611
directory = osutils.getcwd()
4907
5612
if protocol is None:
4908
protocol = transport_server_registry.get()
4909
host, port = self.get_host_and_port(port)
4910
url = urlutils.local_path_to_url(directory)
5613
protocol = transport.transport_server_registry.get()
5614
url = transport.location_to_url(directory)
4911
5615
if not allow_writes:
4912
5616
url = 'readonly+' + url
4913
transport = get_transport(url)
4914
protocol(transport, host, port, inet)
5617
t = transport.get_transport_from_url(url)
5618
protocol(t, listen, port, inet, client_timeout)
4917
5621
class cmd_join(Command):
4937
5641
def run(self, tree, reference=False):
5642
from breezy.mutabletree import BadReferenceTarget
4938
5643
sub_tree = WorkingTree.open(tree)
4939
5644
parent_dir = osutils.dirname(sub_tree.basedir)
4940
5645
containing_tree = WorkingTree.open_containing(parent_dir)[0]
4941
5646
repo = containing_tree.branch.repository
4942
5647
if not repo.supports_rich_root():
4943
raise errors.BzrCommandError(
5648
raise errors.BzrCommandError(gettext(
4944
5649
"Can't join trees because %s doesn't support rich root data.\n"
4945
"You can use bzr upgrade on the repository."
5650
"You can use brz upgrade on the repository.")
4949
5654
containing_tree.add_reference(sub_tree)
4950
except errors.BadReferenceTarget, e:
5655
except BadReferenceTarget as e:
4951
5656
# XXX: Would be better to just raise a nicely printable
4952
5657
# exception from the real origin. Also below. mbp 20070306
4953
raise errors.BzrCommandError("Cannot join %s. %s" %
5658
raise errors.BzrCommandError(
5659
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4957
5662
containing_tree.subsume(sub_tree)
4958
except errors.BadSubsumeSource, e:
4959
raise errors.BzrCommandError("Cannot join %s. %s" %
5663
except errors.BadSubsumeSource as e:
5664
raise errors.BzrCommandError(
5665
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4963
5668
class cmd_split(Command):
5019
5725
diff='Normal unified diff.',
5020
5726
plain='No patch, just directive.'),
5021
5727
Option('sign', help='GPG-sign the directive.'), 'revision',
5022
Option('mail-to', type=str,
5728
Option('mail-to', type=text_type,
5023
5729
help='Instead of printing the directive, email to this address.'),
5024
Option('message', type=str, short_name='m',
5730
Option('message', type=text_type, short_name='m',
5025
5731
help='Message to use when committing this merge.')
5028
5734
encoding_type = 'exact'
5030
5736
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5031
sign=False, revision=None, mail_to=None, message=None):
5032
from bzrlib.revision import ensure_null, NULL_REVISION
5737
sign=False, revision=None, mail_to=None, message=None,
5739
from .revision import ensure_null, NULL_REVISION
5033
5740
include_patch, include_bundle = {
5034
5741
'plain': (False, False),
5035
5742
'diff': (True, False),
5036
5743
'bundle': (True, True),
5038
branch = Branch.open('.')
5745
branch = Branch.open(directory)
5039
5746
stored_submit_branch = branch.get_submit_branch()
5040
5747
if submit_branch is None:
5041
5748
submit_branch = stored_submit_branch
5172
5886
help='Branch to generate the submission from, '
5173
5887
'rather than the one containing the working directory.',
5174
5888
short_name='f',
5176
5890
Option('output', short_name='o',
5177
5891
help='Write merge directive to this file or directory; '
5178
5892
'use - for stdout.',
5180
5894
Option('strict',
5181
5895
help='Refuse to send if there are uncommitted changes in'
5182
5896
' the working tree, --no-strict disables the check.'),
5183
5897
Option('mail-to', help='Mail the request to this address.',
5187
Option('body', help='Body for the email.', type=unicode),
5901
Option('body', help='Body for the email.', type=text_type),
5188
5902
RegistryOption('format',
5189
5903
help='Use the specified output format.',
5190
lazy_registry=('bzrlib.send', 'format_registry')),
5904
lazy_registry=('breezy.send', 'format_registry')),
5193
5907
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5194
no_patch=False, revision=None, remember=False, output=None,
5908
no_patch=False, revision=None, remember=None, output=None,
5195
5909
format=None, mail_to=None, message=None, body=None,
5196
5910
strict=None, **kwargs):
5197
from bzrlib.send import send
5911
from .send import send
5198
5912
return send(submit_branch, revision, public_branch, remember,
5199
5913
format, no_bundle, no_patch, output,
5200
5914
kwargs.get('from', '.'), mail_to, message, body,
5321
6035
self.add_cleanup(branch.lock_write().unlock)
5323
6037
if tag_name is None:
5324
raise errors.BzrCommandError("No tag specified to delete.")
6038
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5325
6039
branch.tags.delete_tag(tag_name)
5326
self.outf.write('Deleted tag %s.\n' % tag_name)
6040
note(gettext('Deleted tag %s.') % tag_name)
5329
6043
if len(revision) != 1:
5330
raise errors.BzrCommandError(
6044
raise errors.BzrCommandError(gettext(
5331
6045
"Tags can only be placed on a single revision, "
5333
6047
revision_id = revision[0].as_revision_id(branch)
5335
6049
revision_id = branch.last_revision()
5336
6050
if tag_name is None:
5337
6051
tag_name = branch.automatic_tag_name(revision_id)
5338
6052
if tag_name is None:
5339
raise errors.BzrCommandError(
5340
"Please specify a tag name.")
5341
if (not force) and branch.tags.has_tag(tag_name):
6053
raise errors.BzrCommandError(gettext(
6054
"Please specify a tag name."))
6056
existing_target = branch.tags.lookup_tag(tag_name)
6057
except errors.NoSuchTag:
6058
existing_target = None
6059
if not force and existing_target not in (None, revision_id):
5342
6060
raise errors.TagAlreadyExists(tag_name)
5343
branch.tags.set_tag(tag_name, revision_id)
5344
self.outf.write('Created tag %s.\n' % tag_name)
6061
if existing_target == revision_id:
6062
note(gettext('Tag %s already exists for that revision.') % tag_name)
6064
branch.tags.set_tag(tag_name, revision_id)
6065
if existing_target is None:
6066
note(gettext('Created tag %s.') % tag_name)
6068
note(gettext('Updated tag %s.') % tag_name)
5347
6071
class cmd_tags(Command):
5354
6078
takes_options = [
5355
6079
custom_help('directory',
5356
6080
help='Branch whose tags should be displayed.'),
5357
RegistryOption.from_kwargs('sort',
6081
RegistryOption('sort',
5358
6082
'Sort tags by different criteria.', title='Sorting',
5359
alpha='Sort tags lexicographically (default).',
5360
time='Sort tags chronologically.',
6083
lazy_registry=('breezy.tag', 'tag_sort_methods')
5366
6089
@display_command
6090
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6091
from .tag import tag_sort_methods
5373
6092
branch, relpath = Branch.open_containing(directory)
5375
tags = branch.tags.get_tag_dict().items()
6094
tags = list(viewitems(branch.tags.get_tag_dict()))
5379
6098
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]])
6100
# Restrict to the specified range
6101
tags = self._tags_for_range(branch, revision)
6103
sort = tag_sort_methods.get()
5400
6105
if not show_ids:
5401
6106
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
6107
for index, (tag, revid) in enumerate(tags):
5413
6120
for tag, revspec in tags:
5414
6121
self.outf.write('%-20s %s\n' % (tag, revspec))
6123
def _tags_for_range(self, branch, revision):
6125
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6126
revid1, revid2 = rev1.rev_id, rev2.rev_id
6127
# _get_revision_range will always set revid2 if it's not specified.
6128
# If revid1 is None, it means we want to start from the branch
6129
# origin which is always a valid ancestor. If revid1 == revid2, the
6130
# ancestry check is useless.
6131
if revid1 and revid1 != revid2:
6132
# FIXME: We really want to use the same graph than
6133
# branch.iter_merge_sorted_revisions below, but this is not
6134
# easily available -- vila 2011-09-23
6135
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6136
# We don't want to output anything in this case...
6138
# only show revisions between revid1 and revid2 (inclusive)
6139
tagged_revids = branch.tags.get_reverse_tag_dict()
6141
for r in branch.iter_merge_sorted_revisions(
6142
start_revision_id=revid2, stop_revision_id=revid1,
6143
stop_rule='include'):
6144
revid_tags = tagged_revids.get(r[0], None)
6146
found.extend([(tag, r[0]) for tag in revid_tags])
5417
6150
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
6151
__doc__ = """Reconfigure the type of a brz directory.
5420
6153
A target configuration must be specified.
5432
6165
takes_args = ['location?']
5433
6166
takes_options = [
5434
6167
RegistryOption.from_kwargs(
5436
title='Target type',
5437
help='The type to reconfigure the directory to.',
6170
help='The relation between branch and tree.',
5438
6171
value_switches=True, enum_switch=False,
5439
6172
branch='Reconfigure to be an unbound branch with no working tree.',
5440
6173
tree='Reconfigure to be an unbound branch with a working tree.',
5441
6174
checkout='Reconfigure to be a bound branch with a working tree.',
5442
6175
lightweight_checkout='Reconfigure to be a lightweight'
5443
6176
' checkout (with no local history).',
6178
RegistryOption.from_kwargs(
6180
title='Repository type',
6181
help='Location fo the repository.',
6182
value_switches=True, enum_switch=False,
5444
6183
standalone='Reconfigure to be a standalone branch '
5445
6184
'(i.e. stop using shared repository).',
5446
6185
use_shared='Reconfigure to use a shared repository.',
6187
RegistryOption.from_kwargs(
6189
title='Trees in Repository',
6190
help='Whether new branches in the repository have trees.',
6191
value_switches=True, enum_switch=False,
5447
6192
with_trees='Reconfigure repository to create '
5448
6193
'working trees on branches by default.',
5449
6194
with_no_trees='Reconfigure repository to not create '
5450
6195
'working trees on branches by default.'
5452
Option('bind-to', help='Branch to bind checkout to.', type=str),
6197
Option('bind-to', help='Branch to bind checkout to.', type=text_type),
5453
6198
Option('force',
5454
6199
help='Perform reconfiguration even if local changes'
5455
6200
' will be lost.'),
5456
6201
Option('stacked-on',
5457
6202
help='Reconfigure a branch to be stacked on another branch.',
5460
6205
Option('unstacked',
5461
6206
help='Reconfigure a branch to be unstacked. This '
5476
6221
# At the moment you can use --stacked-on and a different
5477
6222
# reconfiguration shape at the same time; there seems no good reason
5479
if target_type is None:
6224
if (tree_type is None and
6225
repository_type is None and
6226
repository_trees is None):
5480
6227
if stacked_on or unstacked:
5483
raise errors.BzrCommandError('No target configuration '
5485
elif target_type == 'branch':
6230
raise errors.BzrCommandError(gettext('No target configuration '
6232
reconfiguration = None
6233
if tree_type == 'branch':
5486
6234
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5487
elif target_type == 'tree':
6235
elif tree_type == 'tree':
5488
6236
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5489
elif target_type == 'checkout':
6237
elif tree_type == 'checkout':
5490
6238
reconfiguration = reconfigure.Reconfigure.to_checkout(
5491
6239
directory, bind_to)
5492
elif target_type == 'lightweight-checkout':
6240
elif tree_type == 'lightweight-checkout':
5493
6241
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5494
6242
directory, bind_to)
5495
elif target_type == 'use-shared':
6244
reconfiguration.apply(force)
6245
reconfiguration = None
6246
if repository_type == 'use-shared':
5496
6247
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5497
elif target_type == 'standalone':
6248
elif repository_type == 'standalone':
5498
6249
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5499
elif target_type == 'with-trees':
6251
reconfiguration.apply(force)
6252
reconfiguration = None
6253
if repository_trees == 'with-trees':
5500
6254
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5501
6255
directory, True)
5502
elif target_type == 'with-no-trees':
6256
elif repository_trees == 'with-no-trees':
5503
6257
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5504
6258
directory, False)
5505
reconfiguration.apply(force)
6260
reconfiguration.apply(force)
6261
reconfiguration = None
5508
6264
class cmd_switch(Command):
5531
6287
takes_args = ['to_location?']
5532
takes_options = [Option('force',
6288
takes_options = ['directory',
5533
6290
help='Switch even if local commits will be lost.'),
5535
6292
Option('create-branch', short_name='b',
5536
6293
help='Create the target branch from this one before'
5537
6294
' switching to it.'),
6296
help='Store and restore uncommitted changes in the'
5540
6300
def run(self, to_location=None, force=False, create_branch=False,
5542
from bzrlib import switch
6301
revision=None, directory=u'.', store=False):
6302
from . import switch
6303
tree_location = directory
5544
6304
revision = _get_one_revision('switch', revision)
5545
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6305
possible_transports = []
6306
control_dir = controldir.ControlDir.open_containing(tree_location,
6307
possible_transports=possible_transports)[0]
5546
6308
if to_location is None:
5547
6309
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
6310
raise errors.BzrCommandError(gettext('You must supply either a'
6311
' revision or a location'))
6312
to_location = tree_location
5552
branch = control_dir.open_branch()
6314
branch = control_dir.open_branch(
6315
possible_transports=possible_transports)
5553
6316
had_explicit_nick = branch.get_config().has_explicit_nickname()
5554
6317
except errors.NotBranchError:
5556
6319
had_explicit_nick = False
5557
6320
if create_branch:
5558
6321
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)
5567
to_branch = branch.bzrdir.sprout(to_location,
5568
possible_transports=[branch.bzrdir.root_transport],
5569
source_branch=branch).open_branch()
6322
raise errors.BzrCommandError(
6323
gettext('cannot create branch without source branch'))
6324
to_location = lookup_new_sibling_branch(control_dir, to_location,
6325
possible_transports=possible_transports)
6326
to_branch = branch.controldir.sprout(to_location,
6327
possible_transports=possible_transports,
6328
source_branch=branch).open_branch()
5572
to_branch = Branch.open(to_location)
6331
to_branch = Branch.open(to_location,
6332
possible_transports=possible_transports)
5573
6333
except errors.NotBranchError:
5574
this_url = self._get_branch_location(control_dir)
5575
to_branch = Branch.open(
5576
urlutils.join(this_url, '..', to_location))
6334
to_branch = open_sibling_branch(control_dir, to_location,
6335
possible_transports=possible_transports)
5577
6336
if revision is not None:
5578
6337
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
6338
switch.switch(control_dir, to_branch, force, revision_id=revision,
6339
store_uncommitted=store)
5580
6340
if had_explicit_nick:
5581
6341
branch = control_dir.open_branch() #get the new branch!
5582
6342
branch.nick = to_branch.nick
5583
note('Switched to branch: %s',
6343
note(gettext('Switched to branch: %s'),
5584
6344
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
6348
class cmd_view(Command):
5691
tree, file_list = tree_files(file_list, apply_view=False)
6435
tree, file_list = WorkingTree.open_containing_paths(file_list,
5692
6437
current_view, view_dict = tree.views.get_view_info()
5693
6438
if name is None:
5694
6439
name = current_view
5697
raise errors.BzrCommandError(
5698
"Both --delete and a file list specified")
6442
raise errors.BzrCommandError(gettext(
6443
"Both --delete and a file list specified"))
5700
raise errors.BzrCommandError(
5701
"Both --delete and --switch specified")
6445
raise errors.BzrCommandError(gettext(
6446
"Both --delete and --switch specified"))
5703
6448
tree.views.set_view_info(None, {})
5704
self.outf.write("Deleted all views.\n")
6449
self.outf.write(gettext("Deleted all views.\n"))
5705
6450
elif name is None:
5706
raise errors.BzrCommandError("No current view to delete")
6451
raise errors.BzrCommandError(gettext("No current view to delete"))
5708
6453
tree.views.delete_view(name)
5709
self.outf.write("Deleted '%s' view.\n" % name)
6454
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5712
raise errors.BzrCommandError(
5713
"Both --switch and a file list specified")
6457
raise errors.BzrCommandError(gettext(
6458
"Both --switch and a file list specified"))
5715
raise errors.BzrCommandError(
5716
"Both --switch and --all specified")
6460
raise errors.BzrCommandError(gettext(
6461
"Both --switch and --all specified"))
5717
6462
elif switch == 'off':
5718
6463
if current_view is None:
5719
raise errors.BzrCommandError("No current view to disable")
6464
raise errors.BzrCommandError(gettext("No current view to disable"))
5720
6465
tree.views.set_view_info(None, view_dict)
5721
self.outf.write("Disabled '%s' view.\n" % (current_view))
6466
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5723
6468
tree.views.set_view_info(switch, view_dict)
5724
6469
view_str = views.view_display_str(tree.views.lookup_view())
5725
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6470
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5728
self.outf.write('Views defined:\n')
6473
self.outf.write(gettext('Views defined:\n'))
5729
6474
for view in sorted(view_dict):
5730
6475
if view == current_view:
5734
6479
view_str = views.view_display_str(view_dict[view])
5735
6480
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5737
self.outf.write('No views defined.\n')
6482
self.outf.write(gettext('No views defined.\n'))
5738
6483
elif file_list:
5739
6484
if name is None:
5740
6485
# No name given and no current view set
5742
6487
elif name == 'off':
5743
raise errors.BzrCommandError(
5744
"Cannot change the 'off' pseudo view")
6488
raise errors.BzrCommandError(gettext(
6489
"Cannot change the 'off' pseudo view"))
5745
6490
tree.views.set_view(name, sorted(file_list))
5746
6491
view_str = views.view_display_str(tree.views.lookup_view())
5747
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6492
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5749
6494
# list the files
5750
6495
if name is None:
5751
6496
# No name given and no current view set
5752
self.outf.write('No current view.\n')
6497
self.outf.write(gettext('No current view.\n'))
5754
6499
view_str = views.view_display_str(tree.views.lookup_view(name))
5755
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6500
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5758
6503
class cmd_hooks(Command):
5786
6531
Remove the branch at repo/trunk::
5788
bzr remove-branch repo/trunk
6533
brz remove-branch repo/trunk
5792
6537
takes_args = ["location?"]
6539
takes_options = ['directory',
6540
Option('force', help='Remove branch even if it is the active branch.')]
5794
6542
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()
6544
def run(self, directory=None, location=None, force=False):
6545
br = open_nearby_branch(near=directory, location=location)
6546
if not force and br.controldir.has_workingtree():
6548
active_branch = br.controldir.open_branch(name="")
6549
except errors.NotBranchError:
6550
active_branch = None
6551
if (active_branch is not None and
6552
br.control_url == active_branch.control_url):
6553
raise errors.BzrCommandError(
6554
gettext("Branch is active. Use --force to remove it."))
6555
br.controldir.destroy_branch(br.name)
5803
6558
class cmd_shelve(Command):
5804
6559
__doc__ = """Temporarily set aside some changes from the current tree.
5824
6579
You can put multiple items on the shelf, and by default, 'unshelve' will
5825
6580
restore the most recently shelved changes.
6582
For complicated changes, it is possible to edit the changes in a separate
6583
editor program to decide what the file remaining in the working copy
6584
should look like. To do this, add the configuration option
6586
change_editor = PROGRAM @new_path @old_path
6588
where @new_path is replaced with the path of the new version of the
6589
file and @old_path is replaced with the path of the old version of
6590
the file. The PROGRAM should save the new file with the desired
6591
contents of the file in the working tree.
5828
6595
takes_args = ['file*']
5830
6597
takes_options = [
5832
6600
Option('all', help='Shelve all changes.'),
5834
6602
RegistryOption('writer', 'Method to use for writing diffs.',
5835
bzrlib.option.diff_writer_registry,
6603
breezy.option.diff_writer_registry,
5836
6604
value_switches=True, enum_switch=False),
5838
6606
Option('list', help='List shelved changes.'),
5839
6607
Option('destroy',
5840
6608
help='Destroy removed changes instead of shelving them.'),
5842
_see_also = ['unshelve']
6610
_see_also = ['unshelve', 'configuration']
5844
6612
def run(self, revision=None, all=False, file_list=None, message=None,
5845
writer=None, list=False, destroy=False):
6613
writer=None, list=False, destroy=False, directory=None):
5847
return self.run_for_list()
5848
from bzrlib.shelf_ui import Shelver
6615
return self.run_for_list(directory=directory)
6616
from .shelf_ui import Shelver
5849
6617
if writer is None:
5850
writer = bzrlib.option.diff_writer_registry.get()
6618
writer = breezy.option.diff_writer_registry.get()
5852
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
6620
shelver = Shelver.from_args(writer(self.outf), revision, all,
6621
file_list, message, destroy=destroy, directory=directory)
5924
6695
takes_options = ['directory',
5925
6696
Option('ignored', help='Delete all ignored files.'),
5926
Option('detritus', help='Delete conflict files, merge'
6697
Option('detritus', help='Delete conflict files, merge and revert'
5927
6698
' backups, and failed selftest dirs.'),
5928
6699
Option('unknown',
5929
help='Delete files unknown to bzr (default).'),
6700
help='Delete files unknown to brz (default).'),
5930
6701
Option('dry-run', help='Show files to delete instead of'
5931
6702
' deleting them.'),
5932
6703
Option('force', help='Do not prompt before deleting.')]
5933
6704
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5934
6705
force=False, directory=u'.'):
5935
from bzrlib.clean_tree import clean_tree
6706
from .clean_tree import clean_tree
5936
6707
if not (unknown or ignored or detritus):
5988
6759
self.outf.write('%s %s\n' % (path, location))
6762
class cmd_export_pot(Command):
6763
__doc__ = """Export command helps and error messages in po format."""
6766
takes_options = [Option('plugin',
6767
help='Export help text from named command '\
6768
'(defaults to all built in commands).',
6770
Option('include-duplicates',
6771
help='Output multiple copies of the same msgid '
6772
'string if it appears more than once.'),
6775
def run(self, plugin=None, include_duplicates=False):
6776
from .export_pot import export_pot
6777
export_pot(self.outf, plugin, include_duplicates)
6780
class cmd_import(Command):
6781
__doc__ = """Import sources from a directory, tarball or zip file
6783
This command will import a directory, tarball or zip file into a bzr
6784
tree, replacing any versioned files already present. If a directory is
6785
specified, it is used as the target. If the directory does not exist, or
6786
is not versioned, it is created.
6788
Tarballs may be gzip or bzip2 compressed. This is autodetected.
6790
If the tarball or zip has a single root directory, that directory is
6791
stripped when extracting the tarball. This is not done for directories.
6794
takes_args = ['source', 'tree?']
6796
def run(self, source, tree=None):
6797
from .upstream_import import do_import
6798
do_import(source, tree)
6801
class cmd_link_tree(Command):
6802
__doc__ = """Hardlink matching files to another tree.
6804
Only files with identical content and execute bit will be linked.
6807
takes_args = ['location']
6809
def run(self, location):
6810
from .transform import link_tree
6811
target_tree = WorkingTree.open_containing(".")[0]
6812
source_tree = WorkingTree.open(location)
6813
target_tree.lock_write()
6815
source_tree.lock_read()
6817
link_tree(target_tree, source_tree)
6819
source_tree.unlock()
6821
target_tree.unlock()
6824
class cmd_fetch_ghosts(Command):
6825
__doc__ = """Attempt to retrieve ghosts from another branch.
6827
If the other branch is not supplied, the last-pulled branch is used.
6831
aliases = ['fetch-missing']
6832
takes_args = ['branch?']
6833
takes_options = [Option('no-fix', help="Skip additional synchonization.")]
6835
def run(self, branch=None, no_fix=False):
6836
from .fetch_ghosts import GhostFetcher
6837
installed, failed = GhostFetcher.from_cmdline(branch).run()
6838
if len(installed) > 0:
6839
self.outf.write("Installed:\n")
6840
for rev in installed:
6841
self.outf.write(rev + "\n")
6843
self.outf.write("Still missing:\n")
6845
self.outf.write(rev + "\n")
6846
if not no_fix and len(installed) > 0:
6847
cmd_reconcile().run(".")
5991
6850
def _register_lazy_builtins():
5992
6851
# register lazy builtins from other modules; called at startup and should
5993
6852
# be only called once.
5994
6853
for (name, aliases, module_name) in [
5995
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5996
('cmd_dpush', [], 'bzrlib.foreign'),
5997
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5998
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5999
('cmd_conflicts', [], 'bzrlib.conflicts'),
6000
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6854
('cmd_bisect', [], 'breezy.bisect'),
6855
('cmd_bundle_info', [], 'breezy.bundle.commands'),
6856
('cmd_config', [], 'breezy.config'),
6857
('cmd_dpush', [], 'breezy.foreign'),
6858
('cmd_version_info', [], 'breezy.cmd_version_info'),
6859
('cmd_resolve', ['resolved'], 'breezy.conflicts'),
6860
('cmd_conflicts', [], 'breezy.conflicts'),
6861
('cmd_ping', [], 'breezy.bzr.smart.ping'),
6862
('cmd_sign_my_commits', [], 'breezy.commit_signature_commands'),
6863
('cmd_verify_signatures', [], 'breezy.commit_signature_commands'),
6864
('cmd_test_script', [], 'breezy.cmd_test_script'),
6002
6866
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
breezy/builtins.py
