55
from bzrlib.branch import Branch
56
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
from bzrlib.smtp_connection import SMTPConnection
60
from bzrlib.workingtree import WorkingTree
60
from breezy.branch import Branch
61
from breezy.conflicts import ConflictList
62
from breezy.transport import memory
63
from breezy.revisionspec import RevisionSpec, RevisionInfo
64
from breezy.smtp_connection import SMTPConnection
65
from breezy.workingtree import WorkingTree
66
from breezy.i18n import gettext, ngettext
63
from bzrlib.commands import (
69
from .commands import (
65
71
builtin_command_registry,
68
from bzrlib.option import (
73
79
_parse_revision_str,
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
85
from .trace import mutter, note, warning, is_quiet, get_verbosity_level
88
def _get_branch_location(control_dir, possible_transports=None):
89
"""Return location of branch for this control dir."""
91
target = control_dir.get_branch_reference()
92
except errors.NotBranchError:
93
return control_dir.root_transport.base
94
if target is not None:
96
this_branch = control_dir.open_branch(
97
possible_transports=possible_transports)
98
# This may be a heavy checkout, where we want the master branch
99
master_location = this_branch.get_bound_location()
100
if master_location is not None:
101
return master_location
102
# If not, use a local sibling
103
return this_branch.base
106
def _is_colocated(control_dir, possible_transports=None):
107
"""Check if the branch in control_dir is colocated.
109
:param control_dir: Control directory
110
:return: Tuple with boolean indicating whether the branch is colocated
111
and the full URL to the actual branch
113
# This path is meant to be relative to the existing branch
114
this_url = _get_branch_location(control_dir,
115
possible_transports=possible_transports)
116
# Perhaps the target control dir supports colocated branches?
118
root = controldir.ControlDir.open(this_url,
119
possible_transports=possible_transports)
120
except errors.NotBranchError:
121
return (False, this_url)
124
wt = control_dir.open_workingtree()
125
except (errors.NoWorkingTree, errors.NotLocalUrl):
126
return (False, this_url)
129
root._format.colocated_branches and
130
control_dir.control_url == root.control_url,
134
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
135
"""Lookup the location for a new sibling branch.
137
:param control_dir: Control directory to find sibling branches from
138
:param location: Name of the new branch
139
:return: Full location to the new branch
141
location = directory_service.directories.dereference(location)
142
if '/' not in location and '\\' not in location:
143
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
146
return urlutils.join_segment_parameters(this_url,
147
{"branch": urlutils.escape(location)})
149
return urlutils.join(this_url, '..', urlutils.escape(location))
153
def open_sibling_branch(control_dir, location, possible_transports=None):
154
"""Open a branch, possibly a sibling of another.
156
:param control_dir: Control directory relative to which to lookup the
158
:param location: Location to look up
159
:return: branch to open
162
# Perhaps it's a colocated branch?
163
return control_dir.open_branch(location,
164
possible_transports=possible_transports)
165
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
166
this_url = _get_branch_location(control_dir)
169
this_url, '..', urlutils.escape(location)))
172
def open_nearby_branch(near=None, location=None, possible_transports=None):
173
"""Open a nearby branch.
175
:param near: Optional location of container from which to open branch
176
:param location: Location of the branch
177
:return: Branch instance
183
return Branch.open(location,
184
possible_transports=possible_transports)
185
except errors.NotBranchError:
187
cdir = controldir.ControlDir.open(near,
188
possible_transports=possible_transports)
189
return open_sibling_branch(cdir, location,
190
possible_transports=possible_transports)
193
def iter_sibling_branches(control_dir, possible_transports=None):
194
"""Iterate over the siblings of a branch.
196
:param control_dir: Control directory for which to look up the siblings
197
:return: Iterator over tuples with branch name and branch object
201
reference = control_dir.get_branch_reference()
202
except errors.NotBranchError:
203
# There is no active branch, just return the colocated branches.
204
for name, branch in control_dir.get_branches().iteritems():
207
if reference is not None:
208
ref_branch = Branch.open(reference,
209
possible_transports=possible_transports)
212
if ref_branch is None or ref_branch.name:
213
if ref_branch is not None:
214
control_dir = ref_branch.bzrdir
215
for name, branch in control_dir.get_branches().iteritems():
218
repo = ref_branch.bzrdir.find_repository()
219
for branch in repo.find_branches(using=True):
220
name = urlutils.relative_url(repo.user_url,
221
branch.user_url).rstrip("/")
88
225
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
290
def _get_view_info_for_change_reporter(tree):
224
291
"""Get the view information from a tree for change reporting."""
342
427
takes_args = ['revision_id?']
343
takes_options = ['revision']
428
takes_options = ['directory', 'revision']
344
429
# cat-revision is more for frontends so should be exact
345
430
encoding = 'strict'
347
432
def print_revision(self, revisions, revid):
348
433
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
434
record = next(stream)
350
435
if record.storage_kind == 'absent':
351
436
raise errors.NoSuchRevision(revisions, revid)
352
437
revtext = record.get_bytes_as('fulltext')
353
438
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
441
def run(self, revision_id=None, revision=None, directory=u'.'):
357
442
if revision_id is not None and revision is not None:
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
443
raise errors.BzrCommandError(gettext('You can only supply one of'
444
' revision_id or --revision'))
360
445
if revision_id is None and revision is None:
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
446
raise errors.BzrCommandError(gettext('You must supply either'
447
' --revision or a revision_id'))
449
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
451
revisions = b.repository.revisions
366
452
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
453
raise errors.BzrCommandError(gettext('Repository %r does not support '
454
'access to raw revision texts'))
370
456
b.repository.lock_read()
372
458
# TODO: jam 20060112 should cat-revision always output utf-8?
373
459
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
460
revision_id = cache_utf8.encode(revision_id)
376
462
self.print_revision(revisions, revision_id)
377
463
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
464
msg = gettext("The repository {0} contains no revision {1}.").format(
379
465
b.repository.base, revision_id)
380
466
raise errors.BzrCommandError(msg)
381
467
elif revision is not None:
382
468
for rev in revision:
384
470
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
471
gettext('You cannot specify a NULL revision.'))
386
472
rev_id = rev.as_revision_id(b)
387
473
self.print_revision(revisions, rev_id)
491
580
location_list=['.']
493
582
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
583
d = controldir.ControlDir.open(location)
497
586
working = d.open_workingtree()
498
587
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
588
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
589
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
590
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
591
" of a remote path"))
504
593
if (working.has_changes()):
505
594
raise errors.UncommittedChanges(working)
595
if working.get_shelf_manager().last_shelf() is not None:
596
raise errors.ShelvedChanges(working)
507
598
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
599
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
600
" from a lightweight checkout"))
511
602
d.destroy_workingtree()
605
class cmd_repair_workingtree(Command):
606
__doc__ = """Reset the working tree state file.
608
This is not meant to be used normally, but more as a way to recover from
609
filesystem corruption, etc. This rebuilds the working inventory back to a
610
'known good' state. Any new modifications (adding a file, renaming, etc)
611
will be lost, though modified files will still be detected as such.
613
Most users will want something more like "brz revert" or "brz update"
614
unless the state file has become corrupted.
616
By default this attempts to recover the current state by looking at the
617
headers of the state file. If the state file is too corrupted to even do
618
that, you can supply --revision to force the state of the tree.
621
takes_options = ['revision', 'directory',
623
help='Reset the tree even if it doesn\'t appear to be'
628
def run(self, revision=None, directory='.', force=False):
629
tree, _ = WorkingTree.open_containing(directory)
630
self.add_cleanup(tree.lock_tree_write().unlock)
634
except errors.BzrError:
635
pass # There seems to be a real error here, so we'll reset
638
raise errors.BzrCommandError(gettext(
639
'The tree does not appear to be corrupt. You probably'
640
' want "brz revert" instead. Use "--force" if you are'
641
' sure you want to reset the working tree.'))
645
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
647
tree.reset_state(revision_ids)
648
except errors.BzrError as e:
649
if revision_ids is None:
650
extra = (gettext(', the header appears corrupt, try passing -r -1'
651
' to set the state to the last commit'))
654
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
657
class cmd_revno(Command):
515
658
__doc__ = """Show current revision number.
520
663
_see_also = ['info']
521
664
takes_args = ['location?']
522
665
takes_options = [
523
Option('tree', help='Show revno of working tree'),
666
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
671
def run(self, tree=False, location=u'.', revision=None):
672
if revision is not None and tree:
673
raise errors.BzrCommandError(gettext("--tree and --revision can "
674
"not be used together"))
530
678
wt = WorkingTree.open_containing(location)[0]
679
self.add_cleanup(wt.lock_read().unlock)
532
680
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
681
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
683
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
542
685
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
686
self.add_cleanup(b.lock_read().unlock)
688
if len(revision) != 1:
689
raise errors.BzrCommandError(gettext(
690
"Revision numbers only make sense for single "
691
"revisions, not ranges"))
692
revid = revision[0].as_revision_id(b)
694
revid = b.last_revision()
696
revno_t = b.revision_id_to_dotted_revno(revid)
697
except errors.NoSuchRevision:
699
revno = ".".join(str(n) for n in revno_t)
546
700
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
701
self.outf.write(revno + '\n')
550
704
class cmd_revision_info(Command):
751
933
help='List entries of a particular kind: file, directory, symlink.',
754
936
takes_args = ['file*']
757
939
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
758
940
if kind and kind not in ['file', 'directory', 'symlink']:
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
941
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
761
943
revision = _get_one_revision('inventory', revision)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
944
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
945
self.add_cleanup(work_tree.lock_read().unlock)
765
946
if revision is not None:
766
947
tree = revision.as_tree(work_tree.branch)
768
949
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
950
self.add_cleanup(tree.lock_read().unlock)
955
self.add_cleanup(tree.lock_read().unlock)
775
956
if file_list is not None:
776
957
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
958
require_versioned=True)
778
959
# find_ids_across_trees may include some paths that don't
779
960
# exist in 'tree'.
780
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
781
for file_id in file_ids if file_id in tree)
961
entries = tree.iter_entries_by_dir(specific_file_ids=file_ids)
783
entries = tree.inventory.entries()
963
entries = tree.iter_entries_by_dir()
786
for path, entry in entries:
965
for path, entry in sorted(entries):
787
966
if kind and kind != entry.kind:
790
971
self.outf.write('%-50s %s\n' % (path, entry.file_id))
828
1009
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
1011
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
1012
if names_list is None:
833
1014
if len(names_list) < 2:
834
raise errors.BzrCommandError("missing file argument")
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
1015
raise errors.BzrCommandError(gettext("missing file argument"))
1016
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1017
for file_name in rel_names[0:-1]:
1019
raise errors.BzrCommandError(gettext("can not move root of branch"))
1020
self.add_cleanup(tree.lock_tree_write().unlock)
838
1021
self._run(tree, names_list, rel_names, after)
840
1023
def run_auto(self, names_list, after, dry_run):
841
1024
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
1025
raise errors.BzrCommandError(gettext('Only one path may be specified to'
845
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
1028
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1030
work_tree, file_list = WorkingTree.open_containing_paths(
1031
names_list, default_directory='.')
1032
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
1033
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
1035
def _run(self, tree, names_list, rel_names, after):
946
1128
match the remote one, use pull --overwrite. This will work even if the two
947
1129
branches have diverged.
949
If there is no default location set, the first pull will set it. After
950
that, you can omit the location to use the default. To change the
951
default, use --remember. The value will only be saved if the remote
952
location can be accessed.
1131
If there is no default location set, the first pull will set it (use
1132
--no-remember to avoid setting it). After that, you can omit the
1133
location to use the default. To change the default, use --remember. The
1134
value will only be saved if the remote location can be accessed.
1136
The --verbose option will display the revisions pulled using the log_format
1137
configuration option. You can use a different format by overriding it with
1138
-Olog_format=<other_format>.
954
1140
Note: The location can be specified either in the form of a branch,
955
1141
or in the form of a path to a file containing a merge directive generated
959
1145
_see_also = ['push', 'update', 'status-flags', 'send']
960
1146
takes_options = ['remember', 'overwrite', 'revision',
961
1147
custom_help('verbose',
962
1148
help='Show logs of pulled revisions.'),
1149
custom_help('directory',
964
1150
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
1151
'rather than the one containing the working directory.'),
970
1153
help="Perform a local pull in a bound "
971
1154
"branch. Local pulls are not applied to "
972
1155
"the master branch."
1158
help="Show base revision text in conflicts."),
1159
Option('overwrite-tags',
1160
help="Overwrite tags only."),
975
1162
takes_args = ['location?']
976
1163
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1165
def run(self, location=None, remember=None, overwrite=False,
979
1166
revision=None, verbose=False,
980
directory=None, local=False):
1167
directory=None, local=False,
1168
show_base=False, overwrite_tags=False):
1171
overwrite = ["history", "tags"]
1172
elif overwrite_tags:
1173
overwrite = ["tags"]
981
1176
# FIXME: too much stuff is in the command class
982
1177
revision_id = None
983
1178
mergeable = None
1070
1271
considered diverged if the destination branch's most recent commit is one
1071
1272
that has not been merged (directly or indirectly) by the source branch.
1073
If branches have diverged, you can use 'bzr push --overwrite' to replace
1274
If branches have diverged, you can use 'brz push --overwrite' to replace
1074
1275
the other branch completely, discarding its unmerged changes.
1076
1277
If you want to ensure you have the different changes in the other branch,
1077
do a merge (see bzr help merge) from the other branch, and commit that.
1278
do a merge (see brz help merge) from the other branch, and commit that.
1078
1279
After that you will be able to do a push without '--overwrite'.
1080
If there is no default push location set, the first push will set it.
1081
After that, you can omit the location to use the default. To change the
1082
default, use --remember. The value will only be saved if the remote
1083
location can be accessed.
1281
If there is no default push location set, the first push will set it (use
1282
--no-remember to avoid setting it). After that, you can omit the
1283
location to use the default. To change the default, use --remember. The
1284
value will only be saved if the remote location can be accessed.
1286
The --verbose option will display the revisions pushed using the log_format
1287
configuration option. You can use a different format by overriding it with
1288
-Olog_format=<other_format>.
1086
1291
_see_also = ['pull', 'update', 'working-trees']
1106
1308
help='Create a stacked branch that refers to another branch '
1107
1309
'for the commit history. Only the work not present in the '
1108
1310
'referenced branch is included in the branch created.',
1110
1312
Option('strict',
1111
1313
help='Refuse to push if there are uncommitted changes in'
1112
1314
' the working tree, --no-strict disables the check.'),
1316
help="Don't populate the working tree, even for protocols"
1317
" that support it."),
1318
Option('overwrite-tags',
1319
help="Overwrite tags only."),
1114
1321
takes_args = ['location?']
1115
1322
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1324
def run(self, location=None, remember=None, overwrite=False,
1118
1325
create_prefix=False, verbose=False, revision=None,
1119
1326
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1121
from bzrlib.push import _show_push_branch
1327
stacked=False, strict=None, no_tree=False,
1328
overwrite_tags=False):
1329
from .push import _show_push_branch
1332
overwrite = ["history", "tags"]
1333
elif overwrite_tags:
1334
overwrite = ["tags"]
1123
1338
if directory is None:
1124
1339
directory = '.'
1125
1340
# Get the source branch
1126
1341
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1342
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1128
1343
# Get the tip's revision_id
1129
1344
revision = _get_one_revision('push', revision)
1130
1345
if revision is not None:
1151
1366
# error by the feedback given to them. RBC 20080227.
1152
1367
stacked_on = parent_url
1153
1368
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1369
raise errors.BzrCommandError(gettext(
1370
"Could not determine branch to refer to."))
1157
1372
# Get the destination location
1158
1373
if location is None:
1159
1374
stored_loc = br_from.get_push_location()
1160
1375
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1376
parent_loc = br_from.get_parent()
1378
raise errors.BzrCommandError(gettext(
1379
"No push location known or specified. To push to the "
1380
"parent branch (at %s), use 'brz push :parent'." %
1381
urlutils.unescape_for_display(parent_loc,
1382
self.outf.encoding)))
1384
raise errors.BzrCommandError(gettext(
1385
"No push location known or specified."))
1164
1387
display_url = urlutils.unescape_for_display(stored_loc,
1165
1388
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1389
note(gettext("Using saved push location: %s") % display_url)
1167
1390
location = stored_loc
1169
1392
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1393
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1394
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1395
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1398
class cmd_branch(Command):
1214
1441
def run(self, from_location, to_location=None, revision=None,
1215
1442
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1217
from bzrlib import switch as _mod_switch
1218
from bzrlib.tag import _merge_tags_if_possible
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1443
use_existing_dir=False, switch=False, bind=False,
1445
from breezy import switch as _mod_switch
1446
if self.invoked_as in ['get', 'clone']:
1447
ui.ui_factory.show_user_warning(
1448
'deprecated_command',
1449
deprecated_name=self.invoked_as,
1450
recommended_name='branch',
1451
deprecated_in_version='2.4')
1452
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1454
if not (hardlink or files_from):
1455
# accelerator_tree is usually slower because you have to read N
1456
# files (no readahead, lots of seeks, etc), but allow the user to
1457
# explicitly request it
1458
accelerator_tree = None
1459
if files_from is not None and files_from != from_location:
1460
accelerator_tree = WorkingTree.open(files_from)
1221
1461
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1462
self.add_cleanup(br_from.lock_read().unlock)
1224
1463
if revision is not None:
1225
1464
revision_id = revision.as_revision_id(br_from)
1230
1469
revision_id = br_from.last_revision()
1231
1470
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1471
to_location = getattr(br_from, "name", None)
1473
to_location = urlutils.derive_to_location(from_location)
1233
1474
to_transport = transport.get_transport(to_location)
1235
1476
to_transport.mkdir('.')
1236
1477
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1479
to_dir = controldir.ControlDir.open_from_transport(
1481
except errors.NotBranchError:
1482
if not use_existing_dir:
1483
raise errors.BzrCommandError(gettext('Target directory "%s" '
1484
'already exists.') % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1489
to_dir.open_branch()
1243
1490
except errors.NotBranchError:
1246
1493
raise errors.AlreadyBranchError(to_location)
1247
1494
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1495
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1264
raise errors.BzrCommandError(msg)
1265
_merge_tags_if_possible(br_from, branch)
1501
# preserve whatever source format we have.
1502
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1503
possible_transports=[to_transport],
1504
accelerator_tree=accelerator_tree,
1505
hardlink=hardlink, stacked=stacked,
1506
force_new_repo=standalone,
1507
create_tree_if_local=not no_tree,
1508
source_branch=br_from)
1509
branch = to_dir.open_branch(
1510
possible_transports=[
1511
br_from.bzrdir.root_transport, to_transport])
1512
except errors.NoSuchRevision:
1513
to_transport.delete_tree('.')
1514
msg = gettext("The branch {0} has no revision {1}.").format(
1515
from_location, revision)
1516
raise errors.BzrCommandError(msg)
1519
to_repo = to_dir.open_repository()
1520
except errors.NoRepositoryPresent:
1521
to_repo = to_dir.create_repository()
1522
to_repo.fetch(br_from.repository, revision_id=revision_id)
1523
branch = br_from.sprout(to_dir, revision_id=revision_id)
1524
br_from.tags.merge_to(branch.tags)
1266
1526
# If the source branch is stacked, the new branch may
1267
1527
# be stacked whether we asked for that explicitly or not.
1268
1528
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1530
note(gettext('Created new stacked branch referring to %s.') %
1271
1531
branch.get_stacked_on_url())
1272
1532
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1533
errors.UnstackableRepositoryFormat) as e:
1534
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1536
# Bind to the parent
1277
1537
parent_branch = Branch.open(from_location)
1278
1538
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1539
note(gettext('New branch bound to %s') % from_location)
1281
1541
# Switch to the new branch
1282
1542
wt, _ = WorkingTree.open_containing('.')
1283
1543
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1544
note(gettext('Switched to branch: %s'),
1285
1545
urlutils.unescape_for_display(branch.base, 'utf-8'))
1548
class cmd_branches(Command):
1549
__doc__ = """List the branches available at the current location.
1551
This command will print the names of all the branches at the current
1555
takes_args = ['location?']
1557
Option('recursive', short_name='R',
1558
help='Recursively scan for branches rather than '
1559
'just looking in the specified location.')]
1561
def run(self, location=".", recursive=False):
1563
t = transport.get_transport(location)
1564
if not t.listable():
1565
raise errors.BzrCommandError(
1566
"Can't scan this type of location.")
1567
for b in controldir.ControlDir.find_branches(t):
1568
self.outf.write("%s\n" % urlutils.unescape_for_display(
1569
urlutils.relative_url(t.base, b.base),
1570
self.outf.encoding).rstrip("/"))
1572
dir = controldir.ControlDir.open_containing(location)[0]
1574
active_branch = dir.open_branch(name="")
1575
except errors.NotBranchError:
1576
active_branch = None
1578
for name, branch in iter_sibling_branches(dir):
1581
active = (active_branch is not None and
1582
active_branch.base == branch.base)
1583
names[name] = active
1584
# Only mention the current branch explicitly if it's not
1585
# one of the colocated branches
1586
if not any(names.values()) and active_branch is not None:
1587
self.outf.write("* %s\n" % gettext("(default)"))
1588
for name in sorted(names.keys()):
1589
active = names[name]
1594
self.outf.write("%s %s\n" % (
1595
prefix, name.encode(self.outf.encoding)))
1288
1598
class cmd_checkout(Command):
1289
1599
__doc__ = """Create a new checkout of an existing branch.
1389
1700
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1392
This will perform a merge into the working tree, and may generate
1393
conflicts. If you have any local changes, you will still
1394
need to commit them after the update for the update to be complete.
1396
If you want to discard your local changes, you can just do a
1397
'bzr revert' instead of 'bzr commit' after the update.
1399
If the tree's branch is bound to a master branch, it will also update
1701
__doc__ = """Update a working tree to a new revision.
1703
This will perform a merge of the destination revision (the tip of the
1704
branch, or the specified revision) into the working tree, and then make
1705
that revision the basis revision for the working tree.
1707
You can use this to visit an older revision, or to update a working tree
1708
that is out of date from its branch.
1710
If there are any uncommitted changes in the tree, they will be carried
1711
across and remain as uncommitted changes after the update. To discard
1712
these changes, use 'brz revert'. The uncommitted changes may conflict
1713
with the changes brought in by the change in basis revision.
1715
If the tree's branch is bound to a master branch, brz will also update
1400
1716
the branch from the master.
1718
You cannot update just a single file or directory, because each Bazaar
1719
working tree has just a single basis revision. If you want to restore a
1720
file that has been removed locally, use 'brz revert' instead of 'brz
1721
update'. If you want to restore a file to its state in a previous
1722
revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write
1723
out the old content of that file to a new location.
1725
The 'dir' argument, if given, must be the location of the root of a
1726
working tree to update. By default, the working tree that contains the
1727
current working directory is used.
1403
1730
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1731
takes_args = ['dir?']
1405
takes_options = ['revision']
1732
takes_options = ['revision',
1734
help="Show base revision text in conflicts."),
1406
1736
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1738
def run(self, dir=None, revision=None, show_base=None):
1409
1739
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1412
tree = WorkingTree.open_containing(dir)[0]
1740
raise errors.brzCommandError(gettext(
1741
"brz update --revision takes exactly one revision"))
1743
tree = WorkingTree.open_containing('.')[0]
1745
tree, relpath = WorkingTree.open_containing(dir)
1748
raise errors.BzrCommandError(gettext(
1749
"brz update can only update a whole tree, "
1750
"not a file or subdirectory"))
1413
1751
branch = tree.branch
1414
1752
possible_transports = []
1415
1753
master = branch.get_master_branch(
1416
1754
possible_transports=possible_transports)
1417
1755
if master is not None:
1419
1756
branch_location = master.base
1759
branch_location = tree.branch.base
1421
1760
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1761
self.add_cleanup(tree.unlock)
1424
1762
# get rid of the final '/' and be ready for display
1425
1763
branch_location = urlutils.unescape_for_display(
1451
1789
change_reporter,
1452
1790
possible_transports=possible_transports,
1453
1791
revision=revision_id,
1455
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1793
show_base=show_base)
1794
except errors.NoSuchRevision as e:
1795
raise errors.BzrCommandError(gettext(
1457
1796
"branch has no revision %s\n"
1458
"bzr update --revision only works"
1459
" for a revision in the branch history"
1797
"brz update --revision only works"
1798
" for a revision in the branch history")
1460
1799
% (e.revision))
1461
1800
revno = tree.branch.revision_id_to_dotted_revno(
1462
1801
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1802
note(gettext('Updated to revision {0} of branch {1}').format(
1803
'.'.join(map(str, revno)), branch_location))
1465
1804
parent_ids = tree.get_parent_ids()
1466
1805
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1806
note(gettext('Your local commits will now show as pending merges with '
1807
"'brz status', and can be committed with 'brz commit'."))
1469
1808
if conflicts != 0:
1530
1870
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1871
'The file deletion mode to be used.',
1532
1872
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1535
keep='Delete from bzr but leave the working copy.',
1536
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1873
safe='Backup changed files (default).',
1874
keep='Delete from brz but leave the working copy.',
1875
no_backup='Don\'t backup changed files.'),
1538
1877
aliases = ['rm', 'del']
1539
1878
encoding_type = 'replace'
1541
1880
def run(self, file_list, verbose=False, new=False,
1542
1881
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1883
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1885
if file_list is not None:
1546
1886
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1888
self.add_cleanup(tree.lock_write().unlock)
1550
1889
# Heuristics should probably all move into tree.remove_smart or
1742
2097
to_transport.ensure_base()
1743
2098
except errors.NoSuchFile:
1744
2099
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
2100
raise errors.BzrCommandError(gettext("Parent directory of %s"
1746
2101
" does not exist."
1747
2102
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
2103
" leading parent directories.")
1750
2105
to_transport.create_prefix()
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2108
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1754
2109
except errors.NotBranchError:
1755
2110
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
2111
create_branch = controldir.ControlDir.create_branch_convenience
2113
force_new_tree = False
2115
force_new_tree = None
1757
2116
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
2117
possible_transports=[to_transport],
2118
force_new_tree=force_new_tree)
1759
2119
a_bzrdir = branch.bzrdir
1761
from bzrlib.transport.local import LocalTransport
2121
from .transport.local import LocalTransport
1762
2122
if a_bzrdir.has_branch():
1763
2123
if (isinstance(to_transport, LocalTransport)
1764
2124
and not a_bzrdir.has_workingtree()):
1765
2125
raise errors.BranchExistsWithoutWorkingTree(location)
1766
2126
raise errors.AlreadyBranchError(location)
1767
2127
branch = a_bzrdir.create_branch()
1768
a_bzrdir.create_workingtree()
2128
if not no_tree and not a_bzrdir.has_workingtree():
2129
a_bzrdir.create_workingtree()
1769
2130
if append_revisions_only:
1771
2132
branch.set_append_revisions_only(True)
1772
2133
except errors.UpgradeRequired:
1773
raise errors.BzrCommandError('This branch format cannot be set'
1774
' to append-revisions-only. Try --default.')
2134
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2135
' to append-revisions-only. Try --default.'))
1775
2136
if not is_quiet():
1776
from bzrlib.info import describe_layout, describe_format
2137
from .info import describe_layout, describe_format
1778
2139
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
1779
2140
except (errors.NoWorkingTree, errors.NotLocalUrl):
1837
2199
def run(self, location, format=None, no_trees=False):
1838
2200
if format is None:
1839
format = bzrdir.format_registry.make_bzrdir('default')
2201
format = controldir.format_registry.make_bzrdir('default')
1841
2203
if location is None:
1844
2206
to_transport = transport.get_transport(location)
1845
to_transport.ensure_base()
1847
newdir = format.initialize_on_transport(to_transport)
1848
repo = newdir.create_repository(shared=True)
1849
repo.set_make_working_trees(not no_trees)
2208
(repo, newdir, require_stacking, repository_policy) = (
2209
format.initialize_on_transport_ex(to_transport,
2210
create_prefix=True, make_working_trees=not no_trees,
2211
shared_repo=True, force_new_repo=True,
2212
use_existing_dir=True,
2213
repo_format_name=format.repository_format.get_format_string()))
1850
2214
if not is_quiet():
1851
from bzrlib.info import show_bzrdir_info
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2215
from .info import show_bzrdir_info
2216
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1855
2219
class cmd_diff(Command):
1875
2246
Shows the difference in the working tree versus the last commit::
1879
2250
Difference between the working tree and revision 1::
1883
2254
Difference between revision 3 and revision 1::
1887
2258
Difference between revision 3 and revision 1 for branch xxx::
1891
To see the changes introduced in revision X::
2262
The changes introduced by revision 2 (equivalent to -r1..2)::
2266
To see the changes introduced by revision X::
1895
2270
Note that in the case of a merge, the -c option shows the changes
1896
2271
compared to the left hand parent. To see the changes against
1897
2272
another parent, use::
1899
bzr diff -r<chosen_parent>..X
1901
The changes introduced by revision 2 (equivalent to -r1..2)::
2274
brz diff -r<chosen_parent>..X
2276
The changes between the current revision and the previous revision
2277
(equivalent to -c-1 and -r-2..-1)
1905
2281
Show just the differences for file NEWS::
1909
2285
Show the differences in working tree xxx for file NEWS::
1913
2289
Show the differences from branch xxx to this working tree:
1917
2293
Show the differences between two branches for file NEWS::
1919
bzr diff --old xxx --new yyy NEWS
1921
Same as 'bzr diff' but prefix paths with old/ and new/::
1923
bzr diff --prefix old/:new/
2295
brz diff --old xxx --new yyy NEWS
2297
Same as 'brz diff' but prefix paths with old/ and new/::
2299
brz diff --prefix old/:new/
2301
Show the differences using a custom diff program with options::
2303
brz diff --using /usr/bin/diff --diff-options -wu
1925
2305
_see_also = ['status']
1926
2306
takes_args = ['file*']
1933
2313
'two values separated by a colon. (eg "old/:new/").'),
1935
2315
help='Branch/tree to compare from.',
1939
2319
help='Branch/tree to compare to.',
1944
2324
Option('using',
1945
2325
help='Use this command to compare files.',
1948
2328
RegistryOption('format',
1949
2330
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
2331
lazy_registry=('breezy.diff', 'format_registry'),
2332
title='Diff format'),
2334
help='How many lines of context to show.',
1953
2338
aliases = ['di', 'dif']
1954
2339
encoding_type = 'exact'
1956
2341
@display_command
1957
2342
def run(self, revision=None, file_list=None, diff_options=None,
1958
prefix=None, old=None, new=None, using=None, format=None):
1959
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
2343
prefix=None, old=None, new=None, using=None, format=None,
2345
from .diff import (get_trees_and_branches_to_diff_locked,
1960
2346
show_diff_trees)
1962
2348
if (prefix is None) or (prefix == '0'):
1969
2355
elif ':' in prefix:
1970
2356
old_label, new_label = prefix.split(":")
1972
raise errors.BzrCommandError(
2358
raise errors.BzrCommandError(gettext(
1973
2359
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2360
' (eg "old/:new/")'))
1976
2362
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2363
raise errors.BzrCommandError(gettext('brz diff --revision takes exactly'
2364
' one or two revision specifiers'))
1980
2366
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2367
raise errors.BzrCommandError(gettext(
2368
'{0} and {1} are mutually exclusive').format(
2369
'--using', '--format'))
1984
2371
(old_tree, new_tree,
1985
2372
old_branch, new_branch,
1986
2373
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2374
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2375
# GNU diff on Windows uses ANSI encoding for filenames
2376
path_encoding = osutils.get_diff_header_encoding()
1988
2377
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2378
specific_files=specific_files,
1990
2379
external_diff_options=diff_options,
1991
2380
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2381
extra_trees=extra_trees,
2382
path_encoding=path_encoding,
2383
using=using, context=context,
1993
2384
format_cls=format)
2053
2440
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2441
takes_options = ['directory', 'null']
2060
2443
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2444
def run(self, null=False, directory=u'.'):
2445
wt = WorkingTree.open_containing(directory)[0]
2446
self.add_cleanup(wt.lock_read().unlock)
2065
2447
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2068
basis_inv = basis.inventory
2071
if file_id in basis_inv:
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2448
self.add_cleanup(basis.lock_read().unlock)
2449
root_id = wt.get_root_id()
2450
for file_id in wt.all_file_ids():
2451
if basis.has_id(file_id):
2453
if root_id == file_id:
2455
path = wt.id2path(file_id)
2456
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2459
self.outf.write(path + '\0')
2241
2624
top = log -l10 --line
2242
2625
show = log -v -p
2244
``bzr tip`` will then show the latest revision while ``bzr top``
2627
``brz tip`` will then show the latest revision while ``brz top``
2245
2628
will show the last 10 mainline revisions. To see the details of a
2246
particular revision X, ``bzr show -rX``.
2629
particular revision X, ``brz show -rX``.
2248
2631
If you are interested in looking deeper into a particular merge X,
2249
use ``bzr log -n0 -rX``.
2632
use ``brz log -n0 -rX``.
2251
``bzr log -v`` on a branch with lots of history is currently
2634
``brz log -v`` on a branch with lots of history is currently
2252
2635
very slow. A fix for this issue is currently under development.
2253
2636
With or without that fix, it is recommended that a revision range
2254
2637
be given when using the -v option.
2256
bzr has a generic full-text matching plugin, bzr-search, that can be
2639
brz has a generic full-text matching plugin, brz-search, that can be
2257
2640
used to find revisions matching user names, commit messages, etc.
2258
2641
Among other features, this plugin can find all revisions containing
2259
2642
a list of words but not others.
2297
2685
Option('show-diff',
2298
2686
short_name='p',
2299
2687
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2688
Option('include-merged',
2301
2689
help='Show merged revisions like --levels 0 does.'),
2690
Option('include-merges', hidden=True,
2691
help='Historical alias for --include-merged.'),
2692
Option('omit-merges',
2693
help='Do not report commits with more than one parent.'),
2302
2694
Option('exclude-common-ancestry',
2303
2695
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2696
' of both ancestries (require -rX..Y).'
2698
Option('signatures',
2699
help='Show digital signature validity.'),
2702
help='Show revisions whose properties match this '
2705
ListOption('match-message',
2706
help='Show revisions whose message matches this '
2709
ListOption('match-committer',
2710
help='Show revisions whose committer matches this '
2713
ListOption('match-author',
2714
help='Show revisions whose authors match this '
2717
ListOption('match-bugs',
2718
help='Show revisions whose bugs match this '
2307
2722
encoding_type = 'replace'
2528
2973
help='Recurse into subdirectories.'),
2529
2974
Option('from-root',
2530
2975
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2976
Option('unknown', short_name='u',
2977
help='Print unknown files.'),
2532
2978
Option('versioned', help='Print versioned files.',
2533
2979
short_name='V'),
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2980
Option('ignored', short_name='i',
2981
help='Print ignored files.'),
2982
Option('kind', short_name='k',
2539
2983
help='List entries of a particular kind: file, directory, symlink.',
2543
2989
@display_command
2544
2990
def run(self, revision=None, verbose=False,
2545
2991
recursive=False, from_root=False,
2546
2992
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2993
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2995
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2996
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
2998
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2999
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
3000
all = not (unknown or versioned or ignored)
2556
3002
selection = {'I':ignored, '?':unknown, 'V':versioned}
2674
3120
Patterns prefixed with '!!' act as regular ignore patterns, but have
2675
3121
precedence over the '!' exception patterns.
2677
Note: ignore patterns containing shell wildcards must be quoted from
3125
* Ignore patterns containing shell wildcards must be quoted from
3128
* Ignore patterns starting with "#" act as comments in the ignore file.
3129
To ignore patterns that begin with that character, use the "RE:" prefix.
2681
3132
Ignore the top level Makefile::
2683
bzr ignore ./Makefile
3134
brz ignore ./Makefile
2685
3136
Ignore .class files in all directories...::
2687
bzr ignore "*.class"
3138
brz ignore "*.class"
2689
3140
...but do not ignore "special.class"::
2691
bzr ignore "!special.class"
2693
Ignore .o files under the lib directory::
2695
bzr ignore "lib/**/*.o"
2697
Ignore .o files under the lib directory::
2699
bzr ignore "RE:lib/.*\.o"
3142
brz ignore "!special.class"
3144
Ignore files whose name begins with the "#" character::
3148
Ignore .o files under the lib directory::
3150
brz ignore "lib/**/*.o"
3152
Ignore .o files under the lib directory::
3154
brz ignore "RE:lib/.*\.o"
2701
3156
Ignore everything but the "debian" toplevel directory::
2703
bzr ignore "RE:(?!debian/).*"
3158
brz ignore "RE:(?!debian/).*"
2705
3160
Ignore everything except the "local" toplevel directory,
2706
but always ignore "*~" autosave files, even under local/::
3161
but always ignore autosave files ending in ~, even under local/::
2709
bzr ignore "!./local"
3164
brz ignore "!./local"
2713
3168
_see_also = ['status', 'ignored', 'patterns']
2714
3169
takes_args = ['name_pattern*']
3170
takes_options = ['directory',
2716
3171
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
3172
help='Display the default ignore rules that brz uses.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2721
from bzrlib import ignores
3175
def run(self, name_pattern_list=None, default_rules=None,
3177
from breezy import ignores
2722
3178
if default_rules is not None:
2723
3179
# dump the default rules and exit
2724
3180
for pattern in ignores.USER_DEFAULTS:
2725
3181
self.outf.write("%s\n" % pattern)
2727
3183
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3184
raise errors.BzrCommandError(gettext("ignore requires at least one "
3185
"NAME_PATTERN or --default-rules."))
2730
3186
name_pattern_list = [globbing.normalize_pattern(p)
2731
3187
for p in name_pattern_list]
3189
bad_patterns_count = 0
3190
for p in name_pattern_list:
3191
if not globbing.Globster.is_pattern_valid(p):
3192
bad_patterns_count += 1
3193
bad_patterns += ('\n %s' % p)
3195
msg = (ngettext('Invalid ignore pattern found. %s',
3196
'Invalid ignore patterns found. %s',
3197
bad_patterns_count) % bad_patterns)
3198
ui.ui_factory.show_error(msg)
3199
raise errors.InvalidPattern('')
2732
3200
for name_pattern in name_pattern_list:
2733
3201
if (name_pattern[0] == '/' or
2734
3202
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
raise errors.BzrCommandError(
2736
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
3203
raise errors.BzrCommandError(gettext(
3204
"NAME_PATTERN should not be an absolute path"))
3205
tree, relpath = WorkingTree.open_containing(directory)
2738
3206
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3207
ignored = globbing.Globster(name_pattern_list)
3209
self.add_cleanup(tree.lock_read().unlock)
2742
3210
for entry in tree.list_files():
2744
3212
if id is not None:
2745
3213
filename = entry[0]
2746
3214
if ignored.match(filename):
2747
3215
matches.append(filename)
2749
3216
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3217
self.outf.write(gettext("Warning: the following files are version "
3218
"controlled and match your ignore pattern:\n%s"
2752
3219
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3220
" unless you 'brz remove' them.\n") % ("\n".join(matches),))
2756
3223
class cmd_ignored(Command):
2842
3311
Option('per-file-timestamps',
2843
3312
help='Set modification time of files to that of the last '
2844
3313
'revision in which it was changed.'),
3314
Option('uncommitted',
3315
help='Export the working tree contents rather than that of the '
2846
3318
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2848
from bzrlib.export import export
3319
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3321
from .export import export
2850
3323
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
3324
branch_or_subdir = directory
3326
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3328
if tree is not None:
3329
self.add_cleanup(tree.lock_read().unlock)
3333
raise errors.BzrCommandError(
3334
gettext("--uncommitted requires a working tree"))
2855
b, subdir = Branch.open_containing(branch_or_subdir)
2858
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3337
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3339
export(export_tree, dest, format, root, subdir, filtered=filters,
2861
3340
per_file_timestamps=per_file_timestamps)
2862
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3341
except errors.NoSuchExportFormat as e:
3342
raise errors.BzrCommandError(
3343
gettext('Unsupported export format: %s') % e.format)
2866
3346
class cmd_cat(Command):
2900
3379
if tree is None:
2901
3380
tree = b.basis_tree()
2902
3381
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3382
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3384
old_file_id = rev_tree.path2id(relpath)
3386
# TODO: Split out this code to something that generically finds the
3387
# best id for a path across one or more trees; it's like
3388
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3390
if name_from_revision:
2909
3391
# Try in revision if requested
2910
3392
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3393
raise errors.BzrCommandError(gettext(
3394
"{0!r} is not present in revision {1}").format(
2913
3395
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3397
actual_file_id = old_file_id
2917
3399
cur_file_id = tree.path2id(relpath)
2919
if cur_file_id is not None:
2920
# Then try with the actual file id
2922
content = rev_tree.get_file_text(cur_file_id)
2924
except errors.NoSuchId:
2925
# The actual file id didn't exist at that time
2927
if not found and old_file_id is not None:
2928
# Finally try with the old file id
2929
content = rev_tree.get_file_text(old_file_id)
2932
# Can't be found anywhere
2933
raise errors.BzrCommandError(
2934
"%r is not present in revision %s" % (
3400
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3401
actual_file_id = cur_file_id
3402
elif old_file_id is not None:
3403
actual_file_id = old_file_id
3405
raise errors.BzrCommandError(gettext(
3406
"{0!r} is not present in revision {1}").format(
2935
3407
filename, rev_tree.get_revision_id()))
2937
from bzrlib.filters import (
2938
ContentFilterContext,
2939
filtered_output_bytes,
2941
filters = rev_tree._content_filter_stack(relpath)
2942
chunks = content.splitlines(True)
2943
content = filtered_output_bytes(chunks, filters,
2944
ContentFilterContext(relpath, rev_tree))
2946
self.outf.writelines(content)
3409
from .filter_tree import ContentFilterTree
3410
filter_tree = ContentFilterTree(rev_tree,
3411
rev_tree._content_filter_stack)
3412
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3414
content = rev_tree.get_file_text(actual_file_id)
3416
self.outf.write(content)
2952
3419
class cmd_local_time_offset(Command):
3000
3467
A common mistake is to forget to add a new file or directory before
3001
3468
running the commit command. The --strict option checks for unknown
3002
3469
files and aborts the commit if any are found. More advanced pre-commit
3003
checks can be implemented by defining hooks. See ``bzr help hooks``
3470
checks can be implemented by defining hooks. See ``brz help hooks``
3006
3473
:Things to note:
3008
3475
If you accidentially commit the wrong changes or make a spelling
3009
3476
mistake in the commit message say, you can use the uncommit command
3010
to undo it. See ``bzr help uncommit`` for details.
3477
to undo it. See ``brz help uncommit`` for details.
3012
3479
Hooks can also be configured to run after a commit. This allows you
3013
3480
to trigger updates to external systems like bug trackers. The --fixes
3014
3481
option can be used to record the association between a revision and
3015
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3482
one or more bugs. See ``brz help bugs`` for details.
3034
# TODO: Run hooks on tree to-be-committed, and after commit.
3036
# TODO: Strict commit that fails if there are deleted files.
3037
# (what does "deleted files" mean ??)
3039
# TODO: Give better message for -s, --summary, used by tla people
3041
# XXX: verbose currently does nothing
3043
3485
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3486
takes_args = ['selected*']
3045
3487
takes_options = [
3046
3488
ListOption('exclude', type=str, short_name='x',
3047
3489
help="Do not consider changes made to a given path."),
3048
Option('message', type=unicode,
3490
Option('message', type=text_type,
3049
3491
short_name='m',
3050
3492
help="Description of the new revision."),
3076
3518
Option('show-diff', short_name='p',
3077
3519
help='When no message is supplied, show the diff along'
3078
3520
' with the status summary in the message editor.'),
3522
help='When committing to a foreign version control '
3523
'system do not push data that can not be natively '
3080
3526
aliases = ['ci', 'checkin']
3082
3528
def _iter_bug_fix_urls(self, fixes, branch):
3529
default_bugtracker = None
3083
3530
# Configure the properties for bug fixing attributes.
3084
3531
for fixed_bug in fixes:
3085
3532
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3533
if len(tokens) == 1:
3534
if default_bugtracker is None:
3535
branch_config = branch.get_config_stack()
3536
default_bugtracker = branch_config.get(
3538
if default_bugtracker is None:
3539
raise errors.BzrCommandError(gettext(
3540
"No tracker specified for bug %s. Use the form "
3541
"'tracker:id' or specify a default bug tracker "
3542
"using the `bugtracker` option.\nSee "
3543
"\"brz help bugs\" for more information on this "
3544
"feature. Commit refused.") % fixed_bug)
3545
tag = default_bugtracker
3547
elif len(tokens) != 2:
3548
raise errors.BzrCommandError(gettext(
3088
3549
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3550
"See \"brz help bugs\" for more information on this "
3551
"feature.\nCommit refused.") % fixed_bug)
3553
tag, bug_id = tokens
3093
3555
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
3556
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3097
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3557
raise errors.BzrCommandError(gettext(
3558
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3559
except errors.MalformedBugIdentifier as e:
3560
raise errors.BzrCommandError(gettext(
3561
"%s\nCommit refused.") % (str(e),))
3101
3563
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3564
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3104
from bzrlib.errors import (
3565
author=None, show_diff=False, exclude=None, commit_time=None,
3567
from .errors import (
3105
3568
PointlessCommit,
3106
3569
ConflictsInTree,
3107
3570
StrictCommitFailed
3109
from bzrlib.msgeditor import (
3572
from .msgeditor import (
3110
3573
edit_commit_message_encoded,
3111
3574
generate_commit_message_template,
3112
make_commit_message_template_encoded
3575
make_commit_message_template_encoded,
3115
3579
commit_stamp = offset = None
3116
3580
if commit_time is not None:
3118
3582
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3119
except ValueError, e:
3120
raise errors.BzrCommandError(
3121
"Could not parse --commit-time: " + str(e))
3123
# TODO: Need a blackbox test for invoking the external editor; may be
3124
# slightly problematic to run this cross-platform.
3126
# TODO: do more checks that the commit will succeed before
3127
# spending the user's valuable time typing a commit message.
3583
except ValueError as e:
3584
raise errors.BzrCommandError(gettext(
3585
"Could not parse --commit-time: " + str(e)))
3129
3587
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3589
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3590
if selected_list == ['']:
3133
3591
# workaround - commit of root of tree should be exactly the same
3134
3592
# as just default commit in that tree, and succeed even though
3205
3671
reporter=None, verbose=verbose, revprops=properties,
3206
3672
authors=author, timestamp=commit_stamp,
3207
3673
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3674
exclude=tree.safe_relpath_files(exclude),
3209
3676
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3677
raise errors.BzrCommandError(gettext("No changes to commit."
3678
" Please 'brz add' the files you want to commit, or use"
3679
" --unchanged to force an empty commit."))
3212
3680
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3681
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3682
'tree. Use "brz conflicts" to list, "brz resolve FILE" to'
3216
3684
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3219
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3685
raise errors.BzrCommandError(gettext("Commit refused because there are"
3686
" unknown files in the working tree."))
3687
except errors.BoundBranchOutOfDate as e:
3688
e.extra_help = (gettext("\n"
3221
3689
'To commit to master branch, run update and then commit.\n'
3222
3690
'You can also pass --local to commit to continue working '
3297
3765
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
3300
The check command or bzr developers may sometimes advise you to run
3301
this command. When the default format has changed you may also be warned
3302
during other operations to upgrade.
3766
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3768
When the default format has changed after a major new release of
3769
Bazaar, you may be informed during certain operations that you
3770
should upgrade. Upgrading to a newer format may improve performance
3771
or make new features available. It may however limit interoperability
3772
with older repositories or with older versions of Bazaar.
3774
If you wish to upgrade to a particular format rather than the
3775
current default, that can be specified using the --format option.
3776
As a consequence, you can use the upgrade command this way to
3777
"downgrade" to an earlier format, though some conversions are
3778
a one way process (e.g. changing from the 1.x default to the
3779
2.x default) so downgrading is not always possible.
3781
A backup.bzr.~#~ directory is created at the start of the conversion
3782
process (where # is a number). By default, this is left there on
3783
completion. If the conversion fails, delete the new .bzr directory
3784
and rename this one back in its place. Use the --clean option to ask
3785
for the backup.bzr directory to be removed on successful conversion.
3786
Alternatively, you can delete it by hand if everything looks good
3789
If the location given is a shared repository, dependent branches
3790
are also converted provided the repository converts successfully.
3791
If the conversion of a branch fails, remaining branches are still
3794
For more information on upgrades, see the Bazaar Upgrade Guide,
3795
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3798
_see_also = ['check', 'reconcile', 'formats']
3306
3799
takes_args = ['url?']
3307
3800
takes_options = [
3308
RegistryOption('format',
3309
help='Upgrade to a specific format. See "bzr help'
3310
' formats" for details.',
3311
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3312
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3313
value_switches=True, title='Branch format'),
3801
RegistryOption('format',
3802
help='Upgrade to a specific format. See "brz help'
3803
' formats" for details.',
3804
lazy_registry=('breezy.controldir', 'format_registry'),
3805
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3806
value_switches=True, title='Branch format'),
3808
help='Remove the backup.bzr directory if successful.'),
3810
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3317
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3813
def run(self, url='.', format=None, clean=False, dry_run=False):
3814
from .upgrade import upgrade
3815
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3817
if len(exceptions) == 1:
3818
# Compatibility with historical behavior
3321
3824
class cmd_whoami(Command):
3322
__doc__ = """Show or set bzr user id.
3825
__doc__ = """Show or set brz user id.
3325
3828
Show the email of the current user::
3329
3832
Set the current user::
3331
bzr whoami "Frank Chu <fchu@example.com>"
3834
brz whoami "Frank Chu <fchu@example.com>"
3333
takes_options = [ Option('email',
3836
takes_options = [ 'directory',
3334
3838
help='Display email address only.'),
3335
3839
Option('branch',
3336
3840
help='Set identity for the current branch instead of '
3340
3844
encoding_type = 'replace'
3342
3846
@display_command
3343
def run(self, email=False, branch=False, name=None):
3847
def run(self, email=False, branch=False, name=None, directory=None):
3344
3848
if name is None:
3345
# use branch if we're inside one; otherwise global config
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3849
if directory is None:
3850
# use branch if we're inside one; otherwise global config
3852
c = Branch.open_containing(u'.')[0].get_config_stack()
3853
except errors.NotBranchError:
3854
c = _mod_config.GlobalStack()
3856
c = Branch.open(directory).get_config_stack()
3857
identity = c.get('email')
3351
self.outf.write(c.user_email() + '\n')
3859
self.outf.write(_mod_config.extract_email_address(identity)
3353
self.outf.write(c.username() + '\n')
3862
self.outf.write(identity + '\n')
3866
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3869
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3359
except errors.NoEmailInUsername, e:
3871
_mod_config.extract_email_address(name)
3872
except errors.NoEmailInUsername as e:
3360
3873
warning('"%s" does not seem to contain an email address. '
3361
3874
'This is allowed, but not recommended.', name)
3363
3876
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3878
if directory is None:
3879
c = Branch.open_containing(u'.')[0].get_config_stack()
3881
b = Branch.open(directory)
3882
self.add_cleanup(b.lock_write().unlock)
3883
c = b.get_config_stack()
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3885
c = _mod_config.GlobalStack()
3886
c.set('email', name)
3371
3889
class cmd_nick(Command):
3372
3890
__doc__ = """Print or set the branch nickname.
3374
If unset, the tree root directory name is used as the nickname.
3375
To print the current nickname, execute with no argument.
3892
If unset, the colocated branch name is used for colocated branches, and
3893
the branch directory name is used for other branches. To print the
3894
current nickname, execute with no argument.
3377
3896
Bound branches use the nickname of its master branch unless it is set
3433
3953
def remove_alias(self, alias_name):
3434
3954
if alias_name is None:
3435
raise errors.BzrCommandError(
3436
'bzr alias --remove expects an alias to remove.')
3955
raise errors.BzrCommandError(gettext(
3956
'brz alias --remove expects an alias to remove.'))
3437
3957
# If alias is not found, print something like:
3438
3958
# unalias: foo: not found
3439
c = config.GlobalConfig()
3959
c = _mod_config.GlobalConfig()
3440
3960
c.unset_alias(alias_name)
3442
3962
@display_command
3443
3963
def print_aliases(self):
3444
3964
"""Print out the defined aliases in a similar format to bash."""
3445
aliases = config.GlobalConfig().get_aliases()
3965
aliases = _mod_config.GlobalConfig().get_aliases()
3446
3966
for key, value in sorted(aliases.iteritems()):
3447
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3967
self.outf.write('brz alias %s="%s"\n' % (key, value))
3449
3969
@display_command
3450
3970
def print_alias(self, alias_name):
3451
from bzrlib.commands import get_alias
3971
from .commands import get_alias
3452
3972
alias = get_alias(alias_name)
3453
3973
if alias is None:
3454
self.outf.write("bzr alias: %s: not found\n" % alias_name)
3974
self.outf.write("brz alias: %s: not found\n" % alias_name)
3456
3976
self.outf.write(
3457
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3977
'brz alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3459
3979
def set_alias(self, alias_name, alias_command):
3460
3980
"""Save the alias in the global config."""
3461
c = config.GlobalConfig()
3981
c = _mod_config.GlobalConfig()
3462
3982
c.set_alias(alias_name, alias_command)
3496
4016
Tests that need working space on disk use a common temporary directory,
3497
4017
typically inside $TMPDIR or /tmp.
3499
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
4019
If you set BRZ_TEST_PDB=1 when running selftest, failing tests will drop
3500
4020
into a pdb postmortem session.
4022
The --coverage=DIRNAME global option produces a report with covered code
3503
4026
Run only tests relating to 'ignore'::
3507
4030
Disable plugins and list tests as they're run::
3509
bzr --no-plugins selftest -v
4032
brz --no-plugins selftest -v
3511
4034
# NB: this is used from the class without creating an instance, which is
3512
4035
# why it does not have a self parameter.
3513
4036
def get_transport_type(typestring):
3514
4037
"""Parse and return a transport specifier."""
3515
4038
if typestring == "sftp":
3516
from bzrlib.tests import stub_sftp
4039
from .tests import stub_sftp
3517
4040
return stub_sftp.SFTPAbsoluteServer
3518
if typestring == "memory":
3519
from bzrlib.tests import test_server
4041
elif typestring == "memory":
4042
from .tests import test_server
3520
4043
return memory.MemoryServer
3521
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
4044
elif typestring == "fakenfs":
4045
from .tests import test_server
3523
4046
return test_server.FakeNFSServer
3524
4047
msg = "No known transport type %s. Supported types are: sftp\n" %\
3554
4075
help='List the tests instead of running them.'),
3555
4076
RegistryOption('parallel',
3556
4077
help="Run the test suite in parallel.",
3557
lazy_registry=('bzrlib.tests', 'parallel_registry'),
4078
lazy_registry=('breezy.tests', 'parallel_registry'),
3558
4079
value_switches=False,
3560
4081
Option('randomize', type=str, argname="SEED",
3561
4082
help='Randomize the order of tests using the given'
3562
4083
' seed or "now" for the current time.'),
3563
Option('exclude', type=str, argname="PATTERN",
3565
help='Exclude tests that match this regular'
4084
ListOption('exclude', type=str, argname="PATTERN",
4086
help='Exclude tests that match this regular'
3567
4088
Option('subunit',
3568
4089
help='Output test progress via subunit.'),
3569
4090
Option('strict', help='Fail on missing dependencies or '
3586
4110
def run(self, testspecs_list=None, verbose=False, one=False,
3587
4111
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
4113
first=False, list_only=False,
3590
4114
randomize=None, exclude=None, strict=False,
3591
4115
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
parallel=None, lsprof_tests=False):
3593
from bzrlib.tests import selftest
3594
import bzrlib.benchmarks as benchmarks
3595
from bzrlib.benchmarks import tree_creator
3597
# Make deprecation warnings visible, unless -Werror is set
3598
symbol_versioning.activate_deprecation_warnings(override=False)
3600
if cache_dir is not None:
3601
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
4116
parallel=None, lsprof_tests=False,
4119
# During selftest, disallow proxying, as it can cause severe
4120
# performance penalties and is only needed for thread
4121
# safety. The selftest command is assumed to not use threads
4122
# too heavily. The call should be as early as possible, as
4123
# error reporting for past duplicate imports won't have useful
4125
lazy_import.disallow_proxying()
3602
4129
if testspecs_list is not None:
3603
4130
pattern = '|'.join(testspecs_list)
3608
from bzrlib.tests import SubUnitBzrRunner
4135
from .tests import SubUnitBzrRunner
3609
4136
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
4137
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4138
"needs to be installed to use --subunit."))
3612
4139
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
4140
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
4141
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4142
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4143
# following code can be deleted when it's sufficiently deployed
4144
# -- vila/mgz 20100514
4145
if (sys.platform == "win32"
4146
and getattr(sys.stdout, 'fileno', None) is not None):
3617
4148
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
4150
self.additional_selftest_args.setdefault(
3620
4151
'suite_decorators', []).append(parallel)
3622
test_suite_factory = benchmarks.test_suite
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
verbose = not is_quiet()
3625
# TODO: should possibly lock the history file...
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
4153
raise errors.BzrCommandError(gettext(
4154
"--benchmark is no longer supported from brz 2.2; "
4155
"use bzr-usertest instead"))
4156
test_suite_factory = None
4158
exclude_pattern = None
3629
test_suite_factory = None
4160
exclude_pattern = '(' + '|'.join(exclude) + ')'
4162
self._disable_fsync()
3631
4163
selftest_kwargs = {"verbose": verbose,
3632
4164
"pattern": pattern,
3633
4165
"stop_on_failure": one,
3635
4167
"test_suite_factory": test_suite_factory,
3636
4168
"lsprof_timed": lsprof_timed,
3637
4169
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
4170
"matching_tests_first": first,
3640
4171
"list_only": list_only,
3641
4172
"random_seed": randomize,
3642
"exclude_pattern": exclude,
4173
"exclude_pattern": exclude_pattern,
3643
4174
"strict": strict,
3644
4175
"load_list": load_list,
3645
4176
"debug_flags": debugflag,
3646
4177
"starting_with": starting_with
3648
4179
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
4181
# Make deprecation warnings visible, unless -Werror is set
4182
cleanup = symbol_versioning.activate_deprecation_warnings(
4185
result = tests.selftest(**selftest_kwargs)
3650
4188
return int(not result)
4190
def _disable_fsync(self):
4191
"""Change the 'os' functionality to not synchronize."""
4192
self._orig_fsync = getattr(os, 'fsync', None)
4193
if self._orig_fsync is not None:
4194
os.fsync = lambda filedes: None
4195
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4196
if self._orig_fdatasync is not None:
4197
os.fdatasync = lambda filedes: None
3653
4200
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
4201
__doc__ = """Show version of brz."""
3656
4203
encoding_type = 'replace'
3657
4204
takes_options = [
3709
4254
The source of the merge can be specified either in the form of a branch,
3710
4255
or in the form of a path to a file containing a merge directive generated
3711
with bzr send. If neither is specified, the default is the upstream branch
3712
or the branch most recently merged using --remember.
3714
When merging a branch, by default the tip will be merged. To pick a different
3715
revision, pass --revision. If you specify two values, the first will be used as
3716
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3717
available revisions, like this is commonly referred to as "cherrypicking".
3719
Revision numbers are always relative to the branch being merged.
3721
By default, bzr will try to merge in all new work from the other
3722
branch, automatically determining an appropriate base. If this
3723
fails, you may need to give an explicit base.
4256
with brz send. If neither is specified, the default is the upstream branch
4257
or the branch most recently merged using --remember. The source of the
4258
merge may also be specified in the form of a path to a file in another
4259
branch: in this case, only the modifications to that file are merged into
4260
the current working tree.
4262
When merging from a branch, by default brz will try to merge in all new
4263
work from the other branch, automatically determining an appropriate base
4264
revision. If this fails, you may need to give an explicit base.
4266
To pick a different ending revision, pass "--revision OTHER". brz will
4267
try to merge in all new work up to and including revision OTHER.
4269
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4270
through OTHER, excluding BASE but including OTHER, will be merged. If this
4271
causes some revisions to be skipped, i.e. if the destination branch does
4272
not already contain revision BASE, such a merge is commonly referred to as
4273
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4274
cherrypicks. The changes look like a normal commit, and the history of the
4275
changes from the other branch is not stored in the commit.
4277
Revision numbers are always relative to the source branch.
3725
4279
Merge will do its best to combine the changes in two branches, but there
3726
4280
are some kinds of problems only a human can fix. When it encounters those,
3727
4281
it will mark a conflict. A conflict means that you need to fix something,
3728
before you should commit.
3730
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3732
If there is no default branch set, the first merge will set it. After
3733
that, you can omit the branch to use the default. To change the
3734
default, use --remember. The value will only be saved if the remote
3735
location can be accessed.
4282
before you can commit.
4284
Use brz resolve when you have fixed a problem. See also brz conflicts.
4286
If there is no default branch set, the first merge will set it (use
4287
--no-remember to avoid setting it). After that, you can omit the branch
4288
to use the default. To change the default, use --remember. The value will
4289
only be saved if the remote location can be accessed.
3737
4291
The results of the merge are placed into the destination working
3738
directory, where they can be reviewed (with bzr diff), tested, and then
4292
directory, where they can be reviewed (with brz diff), tested, and then
3739
4293
committed to record the result of the merge.
3741
4295
merge refuses to run if there are any uncommitted changes, unless
3742
--force is given. The --force option can also be used to create a
4296
--force is given. If --force is given, then the changes from the source
4297
will be merged with the current working tree, including any uncommitted
4298
changes in the tree. The --force option can also be used to create a
3743
4299
merge revision which has more than two parents.
3745
4301
If one would like to merge changes from the working tree of the other
3873
4429
self.sanity_check_merger(merger)
3874
4430
if (merger.base_rev_id == merger.other_rev_id and
3875
4431
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4432
# check if location is a nonexistent file (and not a branch) to
4433
# disambiguate the 'Nothing to do'
4434
if merger.interesting_files:
4435
if not merger.other_tree.has_filename(
4436
merger.interesting_files[0]):
4437
note(gettext("merger: ") + str(merger))
4438
raise errors.PathsDoNotExist([location])
4439
note(gettext('Nothing to do.'))
4441
if pull and not preview:
3879
4442
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4443
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4444
if (merger.base_rev_id == tree.last_revision()):
3882
4445
result = tree.pull(merger.other_branch, False,
3883
4446
merger.other_rev_id)
3884
4447
result.report(self.outf)
3886
4449
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4450
raise errors.BzrCommandError(gettext(
3888
4451
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4452
" (perhaps you would prefer 'brz pull')"))
3891
4454
return self._do_preview(merger)
3892
4455
elif interactive:
3988
4552
if other_revision_id is None:
3989
4553
other_revision_id = _mod_revision.ensure_null(
3990
4554
other_branch.last_revision())
3991
# Remember where we merge from
3992
if ((remember or tree.branch.get_submit_branch() is None) and
3993
user_location is not None):
4555
# Remember where we merge from. We need to remember if:
4556
# - user specify a location (and we don't merge from the parent
4558
# - user ask to remember or there is no previous location set to merge
4559
# from and user didn't ask to *not* remember
4560
if (user_location is not None
4562
or (remember is None
4563
and tree.branch.get_submit_branch() is None)))):
3994
4564
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4565
# Merge tags (but don't set them in the master branch yet, the user
4566
# might revert this merge). Commit will propagate them.
4567
other_branch.tags.merge_to(tree.branch.tags, ignore_master=True)
3996
4568
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4569
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4570
if other_path != '':
4162
4734
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4736
Set files in the working tree back to the contents of a previous revision.
4165
4738
Giving a list of files will revert only those files. Otherwise, all files
4166
4739
will be reverted. If the revision is not specified with '--revision', the
4167
last committed revision is used.
4740
working tree basis revision is used. A revert operation affects only the
4741
working tree, not any revision history like the branch and repository or
4742
the working tree basis revision.
4169
4744
To remove only some changes, without reverting to a prior version, use
4170
merge instead. For example, "merge . --revision -2..-3" will remove the
4171
changes introduced by -2, without affecting the changes introduced by -1.
4172
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4745
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4746
will remove the changes introduced by the second last commit (-2), without
4747
affecting the changes introduced by the last commit (-1). To remove
4748
certain changes on a hunk-by-hunk basis, see the shelve command.
4749
To update the branch to a specific revision or the latest revision and
4750
update the working tree accordingly while preserving local changes, see the
4174
By default, any files that have been manually changed will be backed up
4175
first. (Files changed only by merge are not backed up.) Backup files have
4176
'.~#~' appended to their name, where # is a number.
4753
Uncommitted changes to files that are reverted will be discarded.
4754
Howver, by default, any files that have been manually changed will be
4755
backed up first. (Files changed only by merge are not backed up.) Backup
4756
files have '.~#~' appended to their name, where # is a number.
4178
4758
When you provide files, you can use their current pathname or the pathname
4179
4759
from the target revision. So you can use revert to "undelete" a file by
4419
5008
if remote_extra and not mine_only:
4420
5009
if printed_local is True:
4421
5010
message("\n\n\n")
4422
message("You are missing %d revision(s):\n" %
5011
message(ngettext("You are missing %d revision:\n",
5012
"You are missing %d revisions:\n",
5013
len(remote_extra)) %
4423
5014
len(remote_extra))
5015
if remote_branch.supports_tags():
5016
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4424
5017
for revision in iter_log_revisions(remote_extra,
4425
5018
remote_branch.repository,
4427
5021
lf.log_revision(revision)
4428
5022
status_code = 1
4430
5024
if mine_only and not local_extra:
4431
5025
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
5026
message(gettext('This branch has no new revisions.\n'))
4433
5027
elif theirs_only and not remote_extra:
4434
5028
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
5029
message(gettext('Other branch has no new revisions.\n'))
4436
5030
elif not (mine_only or theirs_only or local_extra or
4438
5032
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
5034
message(gettext("Branches are up to date.\n"))
4441
5035
self.cleanup_now()
4442
5036
if not status_code and parent is None and other_branch is not None:
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
5037
self.add_cleanup(local_branch.lock_write().unlock)
4445
5038
# handle race conditions - a parent might be set while we run.
4446
5039
if local_branch.get_parent() is None:
4447
5040
local_branch.set_parent(remote_branch.base)
4578
5155
Option('long', help='Show commit date in annotations.'),
4582
5160
encoding_type = 'exact'
4584
5162
@display_command
4585
5163
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5164
show_ids=False, directory=None):
5165
from .annotate import (
4588
5168
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5169
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
5170
if wt is not None:
4592
self.add_cleanup(wt.unlock)
5171
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5173
self.add_cleanup(branch.lock_read().unlock)
4596
5174
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
5175
self.add_cleanup(tree.lock_read().unlock)
5176
if wt is not None and revision is None:
4600
5177
file_id = wt.path2id(relpath)
4602
5179
file_id = tree.path2id(relpath)
4603
5180
if file_id is None:
4604
5181
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
5182
if wt is not None and revision is None:
4607
5183
# If there is a tree and we're not annotating historical
4608
5184
# versions, annotate the working tree's content.
4609
5185
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
5186
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5188
annotate_file_tree(tree, file_id, self.outf, long, all,
5189
show_ids=show_ids, branch=branch)
4616
5192
class cmd_re_sign(Command):
4620
5196
hidden = True # is this right ?
4621
5197
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5198
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
5200
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5201
if revision_id_list is not None and revision is not None:
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5202
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5203
if revision_id_list is None and revision is None:
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
5204
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5205
b = WorkingTree.open_containing(directory)[0].branch
5206
self.add_cleanup(b.lock_write().unlock)
4632
5207
return self._run(b, revision_id_list, revision)
4634
5209
def _run(self, b, revision_id_list, revision):
4635
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5211
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4637
5212
if revision_id_list is not None:
4638
5213
b.repository.start_write_group()
4694
5269
_see_also = ['checkouts', 'unbind']
4695
5270
takes_args = ['location?']
5271
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5273
def run(self, location=None, directory=u'.'):
5274
b, relpath = Branch.open_containing(directory)
4700
5275
if location is None:
4702
5277
location = b.get_old_bound_location()
4703
5278
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5279
raise errors.BzrCommandError(gettext('No location supplied. '
5280
'This format does not remember old locations.'))
4707
5282
if location is None:
4708
5283
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5284
raise errors.BzrCommandError(
5285
gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5287
raise errors.BzrCommandError(
5288
gettext('No location supplied'
5289
' and no previous location known'))
4713
5290
b_other = Branch.open(location)
4715
5292
b.bind(b_other)
4716
5293
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5294
raise errors.BzrCommandError(gettext('These branches have diverged.'
5295
' Try merging, and then bind again.'))
4719
5296
if b.get_config().has_explicit_nickname():
4720
5297
b.nick = b_other.nick
4784
5362
b = control.open_branch()
4786
5364
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5365
self.add_cleanup(tree.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5367
self.add_cleanup(b.lock_write().unlock)
5368
return self._run(b, tree, dry_run, verbose, revision, force,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4795
from bzrlib.log import log_formatter, show_log
4796
from bzrlib.uncommit import uncommit
5371
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5373
from .log import log_formatter, show_log
5374
from .uncommit import uncommit
4798
5376
last_revno, last_rev_id = b.last_revision_info()
4827
5405
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5408
self.outf.write(gettext('Dry-run, pretending to remove'
5409
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5411
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5414
if not ui.ui_factory.confirm_action(
5415
gettext(u'Uncommit these revisions'),
5416
'breezy.builtins.uncommit',
5418
self.outf.write(gettext('Canceled\n'))
4840
5421
mutter('Uncommitting from {%s} to {%s}',
4841
5422
last_rev_id, rev_id)
4842
5423
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
5424
revno=revno, local=local, keep_tags=keep_tags)
5425
self.outf.write(gettext('You can restore the old tip by running:\n'
5426
' brz pull . -r revid:%s\n') % last_rev_id)
4848
5429
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5430
__doc__ = """Break a dead lock.
5432
This command breaks a lock on a repository, branch, working directory or
4851
5435
CAUTION: Locks should only be broken when you are sure that the process
4852
5436
holding the lock has been stopped.
4854
You can get information on what locks are open via the 'bzr info
5438
You can get information on what locks are open via the 'brz info
4855
5439
[location]' command.
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
5443
brz break-lock brz+ssh://example.com/brz/foo
5444
brz break-lock --conf ~/.bazaar
4861
5447
takes_args = ['location?']
5450
help='LOCATION is the directory where the config lock is.'),
5452
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5455
def run(self, location=None, config=False, force=False):
4864
5456
if location is None:
4865
5457
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5459
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5461
{'breezy.lockdir.break': True})
5463
conf = _mod_config.LockableConfig(file_name=location)
5466
control, relpath = controldir.ControlDir.open_containing(location)
5468
control.break_lock()
5469
except NotImplementedError:
4873
5473
class cmd_wait_until_signalled(Command):
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5474
__doc__ = """Test helper for test_start_and_stop_brz_subprocess_send_signal.
4876
5476
This just prints a line to signal when it is ready, then blocks on stdin.
4894
5494
help='Serve on stdin/out for use from inetd or sshd.'),
4895
5495
RegistryOption('protocol',
4896
5496
help="Protocol to serve.",
4897
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5497
lazy_registry=('breezy.transport', 'transport_server_registry'),
4898
5498
value_switches=True),
5500
help='Listen for connections on nominated address.', type=str),
4900
help='Listen for connections on nominated port of the form '
4901
'[hostname:]portnumber. Passing 0 as the port number will '
4902
'result in a dynamically allocated port. The default port '
4903
'depends on the protocol.',
4906
help='Serve contents of this directory.',
5502
help='Listen for connections on nominated port. Passing 0 as '
5503
'the port number will result in a dynamically allocated '
5504
'port. The default port depends on the protocol.',
5506
custom_help('directory',
5507
help='Serve contents of this directory.'),
4908
5508
Option('allow-writes',
4909
5509
help='By default the server is a readonly server. Supplying '
4910
5510
'--allow-writes enables write access to the contents of '
4911
'the served directory and below. Note that ``bzr serve`` '
5511
'the served directory and below. Note that ``brz serve`` '
4912
5512
'does not perform authentication, so unless some form of '
4913
5513
'external authentication is arranged supplying this '
4914
5514
'option leads to global uncontrolled write access to your '
5517
Option('client-timeout', type=float,
5518
help='Override the default idle client timeout (5min).'),
4919
def get_host_and_port(self, port):
4920
"""Return the host and port to run the smart server on.
4922
If 'port' is None, None will be returned for the host and port.
4924
If 'port' has a colon in it, the string before the colon will be
4925
interpreted as the host.
4927
:param port: A string of the port to run the server on.
4928
:return: A tuple of (host, port), where 'host' is a host name or IP,
4929
and port is an integer TCP/IP port.
4932
if port is not None:
4934
host, port = port.split(':')
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5521
def run(self, listen=None, port=None, inet=False, directory=None,
5522
allow_writes=False, protocol=None, client_timeout=None):
5523
from . import transport
4941
5524
if directory is None:
4942
directory = os.getcwd()
5525
directory = osutils.getcwd()
4943
5526
if protocol is None:
4944
protocol = transport_server_registry.get()
4945
host, port = self.get_host_and_port(port)
4946
url = urlutils.local_path_to_url(directory)
5527
protocol = transport.transport_server_registry.get()
5528
url = transport.location_to_url(directory)
4947
5529
if not allow_writes:
4948
5530
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5531
t = transport.get_transport_from_url(url)
5532
protocol(t, listen, port, inet, client_timeout)
4953
5535
class cmd_join(Command):
4976
5558
containing_tree = WorkingTree.open_containing(parent_dir)[0]
4977
5559
repo = containing_tree.branch.repository
4978
5560
if not repo.supports_rich_root():
4979
raise errors.BzrCommandError(
5561
raise errors.BzrCommandError(gettext(
4980
5562
"Can't join trees because %s doesn't support rich root data.\n"
4981
"You can use bzr upgrade on the repository."
5563
"You can use brz upgrade on the repository.")
4985
5567
containing_tree.add_reference(sub_tree)
4986
except errors.BadReferenceTarget, e:
5568
except errors.BadReferenceTarget as e:
4987
5569
# XXX: Would be better to just raise a nicely printable
4988
5570
# exception from the real origin. Also below. mbp 20070306
4989
raise errors.BzrCommandError("Cannot join %s. %s" %
5571
raise errors.BzrCommandError(
5572
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4993
5575
containing_tree.subsume(sub_tree)
4994
except errors.BadSubsumeSource, e:
4995
raise errors.BzrCommandError("Cannot join %s. %s" %
5576
except errors.BadSubsumeSource as e:
5577
raise errors.BzrCommandError(
5578
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4999
5581
class cmd_split(Command):
5208
5799
help='Branch to generate the submission from, '
5209
5800
'rather than the one containing the working directory.',
5210
5801
short_name='f',
5212
5803
Option('output', short_name='o',
5213
5804
help='Write merge directive to this file or directory; '
5214
5805
'use - for stdout.',
5216
5807
Option('strict',
5217
5808
help='Refuse to send if there are uncommitted changes in'
5218
5809
' the working tree, --no-strict disables the check.'),
5219
5810
Option('mail-to', help='Mail the request to this address.',
5223
Option('body', help='Body for the email.', type=unicode),
5814
Option('body', help='Body for the email.', type=text_type),
5224
5815
RegistryOption('format',
5225
5816
help='Use the specified output format.',
5226
lazy_registry=('bzrlib.send', 'format_registry')),
5817
lazy_registry=('breezy.send', 'format_registry')),
5229
5820
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
no_patch=False, revision=None, remember=False, output=None,
5821
no_patch=False, revision=None, remember=None, output=None,
5231
5822
format=None, mail_to=None, message=None, body=None,
5232
5823
strict=None, **kwargs):
5233
from bzrlib.send import send
5824
from .send import send
5234
5825
return send(submit_branch, revision, public_branch, remember,
5235
5826
format, no_bundle, no_patch, output,
5236
5827
kwargs.get('from', '.'), mail_to, message, body,
5359
5947
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5948
self.add_cleanup(branch.lock_write().unlock)
5363
5950
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5951
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5952
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5953
note(gettext('Deleted tag %s.') % tag_name)
5369
5956
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5957
raise errors.BzrCommandError(gettext(
5371
5958
"Tags can only be placed on a single revision, "
5373
5960
revision_id = revision[0].as_revision_id(branch)
5375
5962
revision_id = branch.last_revision()
5376
5963
if tag_name is None:
5377
5964
tag_name = branch.automatic_tag_name(revision_id)
5378
5965
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5966
raise errors.BzrCommandError(gettext(
5967
"Please specify a tag name."))
5969
existing_target = branch.tags.lookup_tag(tag_name)
5970
except errors.NoSuchTag:
5971
existing_target = None
5972
if not force and existing_target not in (None, revision_id):
5382
5973
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5974
if existing_target == revision_id:
5975
note(gettext('Tag %s already exists for that revision.') % tag_name)
5977
branch.tags.set_tag(tag_name, revision_id)
5978
if existing_target is None:
5979
note(gettext('Created tag %s.') % tag_name)
5981
note(gettext('Updated tag %s.') % tag_name)
5387
5984
class cmd_tags(Command):
5393
5990
_see_also = ['tag']
5394
5991
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5992
custom_help('directory',
5993
help='Branch whose tags should be displayed.'),
5994
RegistryOption('sort',
5401
5995
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5996
lazy_registry=('breezy.tag', 'tag_sort_methods')
5409
6002
@display_command
6003
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6004
from .tag import tag_sort_methods
5416
6005
branch, relpath = Branch.open_containing(directory)
5418
6007
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
6011
self.add_cleanup(branch.lock_read().unlock)
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
5433
elif sort == 'time':
5435
for tag, revid in tags:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
6013
# Restrict to the specified range
6014
tags = self._tags_for_range(branch, revision)
6016
sort = tag_sort_methods.get()
5444
6018
if not show_ids:
5445
6019
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
6020
for index, (tag, revid) in enumerate(tags):
5457
6033
for tag, revspec in tags:
5458
6034
self.outf.write('%-20s %s\n' % (tag, revspec))
6036
def _tags_for_range(self, branch, revision):
6038
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6039
revid1, revid2 = rev1.rev_id, rev2.rev_id
6040
# _get_revision_range will always set revid2 if it's not specified.
6041
# If revid1 is None, it means we want to start from the branch
6042
# origin which is always a valid ancestor. If revid1 == revid2, the
6043
# ancestry check is useless.
6044
if revid1 and revid1 != revid2:
6045
# FIXME: We really want to use the same graph than
6046
# branch.iter_merge_sorted_revisions below, but this is not
6047
# easily available -- vila 2011-09-23
6048
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6049
# We don't want to output anything in this case...
6051
# only show revisions between revid1 and revid2 (inclusive)
6052
tagged_revids = branch.tags.get_reverse_tag_dict()
6054
for r in branch.iter_merge_sorted_revisions(
6055
start_revision_id=revid2, stop_revision_id=revid1,
6056
stop_rule='include'):
6057
revid_tags = tagged_revids.get(r[0], None)
6059
found.extend([(tag, r[0]) for tag in revid_tags])
5461
6063
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
6064
__doc__ = """Reconfigure the type of a brz directory.
5464
6066
A target configuration must be specified.
5476
6078
takes_args = ['location?']
5477
6079
takes_options = [
5478
6080
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6083
help='The relation between branch and tree.',
5482
6084
value_switches=True, enum_switch=False,
5483
6085
branch='Reconfigure to be an unbound branch with no working tree.',
5484
6086
tree='Reconfigure to be an unbound branch with a working tree.',
5485
6087
checkout='Reconfigure to be a bound branch with a working tree.',
5486
6088
lightweight_checkout='Reconfigure to be a lightweight'
5487
6089
' checkout (with no local history).',
6091
RegistryOption.from_kwargs(
6093
title='Repository type',
6094
help='Location fo the repository.',
6095
value_switches=True, enum_switch=False,
5488
6096
standalone='Reconfigure to be a standalone branch '
5489
6097
'(i.e. stop using shared repository).',
5490
6098
use_shared='Reconfigure to use a shared repository.',
6100
RegistryOption.from_kwargs(
6102
title='Trees in Repository',
6103
help='Whether new branches in the repository have trees.',
6104
value_switches=True, enum_switch=False,
5491
6105
with_trees='Reconfigure repository to create '
5492
6106
'working trees on branches by default.',
5493
6107
with_no_trees='Reconfigure repository to not create '
5520
6134
# At the moment you can use --stacked-on and a different
5521
6135
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
6137
if (tree_type is None and
6138
repository_type is None and
6139
repository_trees is None):
5524
6140
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6143
raise errors.BzrCommandError(gettext('No target configuration '
6145
reconfiguration = None
6146
if tree_type == 'branch':
5530
6147
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
6148
elif tree_type == 'tree':
5532
6149
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
6150
elif tree_type == 'checkout':
5534
6151
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
6152
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
6153
elif tree_type == 'lightweight-checkout':
5537
6154
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
6155
directory, bind_to)
5539
elif target_type == 'use-shared':
6157
reconfiguration.apply(force)
6158
reconfiguration = None
6159
if repository_type == 'use-shared':
5540
6160
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
6161
elif repository_type == 'standalone':
5542
6162
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
6164
reconfiguration.apply(force)
6165
reconfiguration = None
6166
if repository_trees == 'with-trees':
5544
6167
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6168
directory, True)
5546
elif target_type == 'with-no-trees':
6169
elif repository_trees == 'with-no-trees':
5547
6170
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6171
directory, False)
5549
reconfiguration.apply(force)
6173
reconfiguration.apply(force)
6174
reconfiguration = None
5552
6177
class cmd_switch(Command):
5575
6200
takes_args = ['to_location?']
5576
takes_options = [Option('force',
6201
takes_options = ['directory',
5577
6203
help='Switch even if local commits will be lost.'),
5579
6205
Option('create-branch', short_name='b',
5580
6206
help='Create the target branch from this one before'
5581
6207
' switching to it.'),
6209
help='Store and restore uncommitted changes in the'
5584
6213
def run(self, to_location=None, force=False, create_branch=False,
5586
from bzrlib import switch
6214
revision=None, directory=u'.', store=False):
6215
from . import switch
6216
tree_location = directory
5588
6217
revision = _get_one_revision('switch', revision)
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6218
possible_transports = []
6219
control_dir = controldir.ControlDir.open_containing(tree_location,
6220
possible_transports=possible_transports)[0]
5590
6221
if to_location is None:
5591
6222
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6223
raise errors.BzrCommandError(gettext('You must supply either a'
6224
' revision or a location'))
6225
to_location = tree_location
5596
branch = control_dir.open_branch()
6227
branch = control_dir.open_branch(
6228
possible_transports=possible_transports)
5597
6229
had_explicit_nick = branch.get_config().has_explicit_nickname()
5598
6230
except errors.NotBranchError:
5600
6232
had_explicit_nick = False
5601
6233
if create_branch:
5602
6234
if branch is None:
5603
raise errors.BzrCommandError('cannot create branch without'
5605
to_location = directory_service.directories.dereference(
5607
if '/' not in to_location and '\\' not in to_location:
5608
# This path is meant to be relative to the existing branch
5609
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
6235
raise errors.BzrCommandError(
6236
gettext('cannot create branch without source branch'))
6237
to_location = lookup_new_sibling_branch(control_dir, to_location,
6238
possible_transports=possible_transports)
5611
6239
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
6240
possible_transports=possible_transports,
6241
source_branch=branch).open_branch()
5616
to_branch = Branch.open(to_location)
6244
to_branch = Branch.open(to_location,
6245
possible_transports=possible_transports)
5617
6246
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
6247
to_branch = open_sibling_branch(control_dir, to_location,
6248
possible_transports=possible_transports)
5621
6249
if revision is not None:
5622
6250
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
6251
switch.switch(control_dir, to_branch, force, revision_id=revision,
6252
store_uncommitted=store)
5624
6253
if had_explicit_nick:
5625
6254
branch = control_dir.open_branch() #get the new branch!
5626
6255
branch.nick = to_branch.nick
5627
note('Switched to branch: %s',
6256
note(gettext('Switched to branch: %s'),
5628
6257
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
def _get_branch_location(self, control_dir):
5631
"""Return location of branch for this control dir."""
5633
this_branch = control_dir.open_branch()
5634
# This may be a heavy checkout, where we want the master branch
5635
master_location = this_branch.get_bound_location()
5636
if master_location is not None:
5637
return master_location
5638
# If not, use a local sibling
5639
return this_branch.base
5640
except errors.NotBranchError:
5641
format = control_dir.find_branch_format()
5642
if getattr(format, 'get_reference', None) is not None:
5643
return format.get_reference(control_dir)
5645
return control_dir.root_transport.base
5648
6261
class cmd_view(Command):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6348
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6350
current_view, view_dict = tree.views.get_view_info()
5737
6351
if name is None:
5738
6352
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6355
raise errors.BzrCommandError(gettext(
6356
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6358
raise errors.BzrCommandError(gettext(
6359
"Both --delete and --switch specified"))
5747
6361
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6362
self.outf.write(gettext("Deleted all views.\n"))
5749
6363
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6364
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6366
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6367
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6370
raise errors.BzrCommandError(gettext(
6371
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6373
raise errors.BzrCommandError(gettext(
6374
"Both --switch and --all specified"))
5761
6375
elif switch == 'off':
5762
6376
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6377
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6378
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6379
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6381
tree.views.set_view_info(switch, view_dict)
5768
6382
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6383
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6386
self.outf.write(gettext('Views defined:\n'))
5773
6387
for view in sorted(view_dict):
5774
6388
if view == current_view:
5778
6392
view_str = views.view_display_str(view_dict[view])
5779
6393
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6395
self.outf.write(gettext('No views defined.\n'))
5782
6396
elif file_list:
5783
6397
if name is None:
5784
6398
# No name given and no current view set
5786
6400
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6401
raise errors.BzrCommandError(gettext(
6402
"Cannot change the 'off' pseudo view"))
5789
6403
tree.views.set_view(name, sorted(file_list))
5790
6404
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6405
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6407
# list the files
5794
6408
if name is None:
5795
6409
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6410
self.outf.write(gettext('No current view.\n'))
5798
6412
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6413
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6416
class cmd_hooks(Command):
5830
6444
Remove the branch at repo/trunk::
5832
bzr remove-branch repo/trunk
6446
brz remove-branch repo/trunk
5836
6450
takes_args = ["location?"]
6452
takes_options = ['directory',
6453
Option('force', help='Remove branch even if it is the active branch.')]
5838
6455
aliases = ["rmbranch"]
5840
def run(self, location=None):
5841
if location is None:
5843
branch = Branch.open_containing(location)[0]
5844
branch.bzrdir.destroy_branch()
6457
def run(self, directory=None, location=None, force=False):
6458
br = open_nearby_branch(near=directory, location=location)
6459
if not force and br.bzrdir.has_workingtree():
6461
active_branch = br.bzrdir.open_branch(name="")
6462
except errors.NotBranchError:
6463
active_branch = None
6464
if (active_branch is not None and
6465
br.control_url == active_branch.control_url):
6466
raise errors.BzrCommandError(
6467
gettext("Branch is active. Use --force to remove it."))
6468
br.bzrdir.destroy_branch(br.name)
5847
6471
class cmd_shelve(Command):
5848
6472
__doc__ = """Temporarily set aside some changes from the current tree.
5868
6492
You can put multiple items on the shelf, and by default, 'unshelve' will
5869
6493
restore the most recently shelved changes.
6495
For complicated changes, it is possible to edit the changes in a separate
6496
editor program to decide what the file remaining in the working copy
6497
should look like. To do this, add the configuration option
6499
change_editor = PROGRAM @new_path @old_path
6501
where @new_path is replaced with the path of the new version of the
6502
file and @old_path is replaced with the path of the old version of
6503
the file. The PROGRAM should save the new file with the desired
6504
contents of the file in the working tree.
5872
6508
takes_args = ['file*']
5874
6510
takes_options = [
5876
6513
Option('all', help='Shelve all changes.'),
5878
6515
RegistryOption('writer', 'Method to use for writing diffs.',
5879
bzrlib.option.diff_writer_registry,
6516
breezy.option.diff_writer_registry,
5880
6517
value_switches=True, enum_switch=False),
5882
6519
Option('list', help='List shelved changes.'),
5883
6520
Option('destroy',
5884
6521
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6523
_see_also = ['unshelve', 'configuration']
5888
6525
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6526
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
5892
from bzrlib.shelf_ui import Shelver
6528
return self.run_for_list(directory=directory)
6529
from .shelf_ui import Shelver
5893
6530
if writer is None:
5894
writer = bzrlib.option.diff_writer_registry.get()
6531
writer = breezy.option.diff_writer_registry.get()
5896
6533
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6534
file_list, message, destroy=destroy, directory=directory)
5967
6606
To check what clean-tree will do, use --dry-run.
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5970
Option('detritus', help='Delete conflict files, merge'
6608
takes_options = ['directory',
6609
Option('ignored', help='Delete all ignored files.'),
6610
Option('detritus', help='Delete conflict files, merge and revert'
5971
6611
' backups, and failed selftest dirs.'),
5972
6612
Option('unknown',
5973
help='Delete files unknown to bzr (default).'),
6613
help='Delete files unknown to brz (default).'),
5974
6614
Option('dry-run', help='Show files to delete instead of'
5975
6615
' deleting them.'),
5976
6616
Option('force', help='Do not prompt before deleting.')]
5977
6617
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5979
from bzrlib.clean_tree import clean_tree
6618
force=False, directory=u'.'):
6619
from .clean_tree import clean_tree
5980
6620
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6624
clean_tree(directory, unknown=unknown, ignored=ignored,
6625
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6628
class cmd_reference(Command):
6032
6672
self.outf.write('%s %s\n' % (path, location))
6675
class cmd_export_pot(Command):
6676
__doc__ = """Export command helps and error messages in po format."""
6679
takes_options = [Option('plugin',
6680
help='Export help text from named command '\
6681
'(defaults to all built in commands).',
6683
Option('include-duplicates',
6684
help='Output multiple copies of the same msgid '
6685
'string if it appears more than once.'),
6688
def run(self, plugin=None, include_duplicates=False):
6689
from .export_pot import export_pot
6690
export_pot(self.outf, plugin, include_duplicates)
6693
class cmd_import(Command):
6694
__doc__ = """Import sources from a directory, tarball or zip file
6696
This command will import a directory, tarball or zip file into a bzr
6697
tree, replacing any versioned files already present. If a directory is
6698
specified, it is used as the target. If the directory does not exist, or
6699
is not versioned, it is created.
6701
Tarballs may be gzip or bzip2 compressed. This is autodetected.
6703
If the tarball or zip has a single root directory, that directory is
6704
stripped when extracting the tarball. This is not done for directories.
6707
takes_args = ['source', 'tree?']
6709
def run(self, source, tree=None):
6710
from .upstream_import import do_import
6711
do_import(source, tree)
6035
6714
def _register_lazy_builtins():
6036
6715
# register lazy builtins from other modules; called at startup and should
6037
6716
# be only called once.
6038
6717
for (name, aliases, module_name) in [
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6718
('cmd_bundle_info', [], 'breezy.bundle.commands'),
6719
('cmd_config', [], 'breezy.config'),
6720
('cmd_dpush', [], 'breezy.foreign'),
6721
('cmd_version_info', [], 'breezy.cmd_version_info'),
6722
('cmd_resolve', ['resolved'], 'breezy.conflicts'),
6723
('cmd_conflicts', [], 'breezy.conflicts'),
6724
('cmd_ping', [], 'breezy.smart.ping'),
6725
('cmd_sign_my_commits', [], 'breezy.commit_signature_commands'),
6726
('cmd_verify_signatures', [], 'breezy.commit_signature_commands'),
6727
('cmd_test_script', [], 'breezy.cmd_test_script'),
6046
6729
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
breezy/builtins.py
