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
59
from breezy.bzr import (
62
from breezy.branch import Branch
63
from breezy.conflicts import ConflictList
64
from breezy.transport import memory
65
from breezy.revisionspec import RevisionSpec, RevisionInfo
66
from breezy.smtp_connection import SMTPConnection
67
from breezy.workingtree import WorkingTree
68
from breezy.i18n import gettext, ngettext
63
from bzrlib.commands import (
71
from .commands import (
65
73
builtin_command_registry,
68
from bzrlib.option import (
73
81
_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]))
89
from .trace import mutter, note, warning, is_quiet, get_verbosity_level
92
def _get_branch_location(control_dir, possible_transports=None):
93
"""Return location of branch for this control dir."""
95
target = control_dir.get_branch_reference()
96
except errors.NotBranchError:
97
return control_dir.root_transport.base
98
if target is not None:
100
this_branch = control_dir.open_branch(
101
possible_transports=possible_transports)
102
# This may be a heavy checkout, where we want the master branch
103
master_location = this_branch.get_bound_location()
104
if master_location is not None:
105
return master_location
106
# If not, use a local sibling
107
return this_branch.base
110
def _is_colocated(control_dir, possible_transports=None):
111
"""Check if the branch in control_dir is colocated.
113
:param control_dir: Control directory
114
:return: Tuple with boolean indicating whether the branch is colocated
115
and the full URL to the actual branch
117
# This path is meant to be relative to the existing branch
118
this_url = _get_branch_location(control_dir,
119
possible_transports=possible_transports)
120
# Perhaps the target control dir supports colocated branches?
122
root = controldir.ControlDir.open(this_url,
123
possible_transports=possible_transports)
124
except errors.NotBranchError:
125
return (False, this_url)
128
wt = control_dir.open_workingtree()
129
except (errors.NoWorkingTree, errors.NotLocalUrl):
130
return (False, this_url)
133
root._format.colocated_branches and
134
control_dir.control_url == root.control_url,
138
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
139
"""Lookup the location for a new sibling branch.
141
:param control_dir: Control directory to find sibling branches from
142
:param location: Name of the new branch
143
:return: Full location to the new branch
145
location = directory_service.directories.dereference(location)
146
if '/' not in location and '\\' not in location:
147
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
150
return urlutils.join_segment_parameters(this_url,
151
{"branch": urlutils.escape(location)})
153
return urlutils.join(this_url, '..', urlutils.escape(location))
157
def open_sibling_branch(control_dir, location, possible_transports=None):
158
"""Open a branch, possibly a sibling of another.
160
:param control_dir: Control directory relative to which to lookup the
162
:param location: Location to look up
163
:return: branch to open
166
# Perhaps it's a colocated branch?
167
return control_dir.open_branch(location,
168
possible_transports=possible_transports)
169
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
170
this_url = _get_branch_location(control_dir)
173
this_url, '..', urlutils.escape(location)))
176
def open_nearby_branch(near=None, location=None, possible_transports=None):
177
"""Open a nearby branch.
179
:param near: Optional location of container from which to open branch
180
:param location: Location of the branch
181
:return: Branch instance
187
return Branch.open(location,
188
possible_transports=possible_transports)
189
except errors.NotBranchError:
191
cdir = controldir.ControlDir.open(near,
192
possible_transports=possible_transports)
193
return open_sibling_branch(cdir, location,
194
possible_transports=possible_transports)
197
def iter_sibling_branches(control_dir, possible_transports=None):
198
"""Iterate over the siblings of a branch.
200
:param control_dir: Control directory for which to look up the siblings
201
:return: Iterator over tuples with branch name and branch object
205
reference = control_dir.get_branch_reference()
206
except errors.NotBranchError:
207
# There is no active branch, just return the colocated branches.
208
for name, branch in viewitems(control_dir.get_branches()):
211
if reference is not None:
212
ref_branch = Branch.open(reference,
213
possible_transports=possible_transports)
216
if ref_branch is None or ref_branch.name:
217
if ref_branch is not None:
218
control_dir = ref_branch.controldir
219
for name, branch in viewitems(control_dir.get_branches()):
222
repo = ref_branch.controldir.find_repository()
223
for branch in repo.find_branches(using=True):
224
name = urlutils.relative_url(repo.user_url,
225
branch.user_url).rstrip("/")
88
229
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
294
def _get_view_info_for_change_reporter(tree):
224
295
"""Get the view information from a tree for change reporting."""
342
431
takes_args = ['revision_id?']
343
takes_options = ['revision']
432
takes_options = ['directory', 'revision']
344
433
# cat-revision is more for frontends so should be exact
345
434
encoding = 'strict'
347
436
def print_revision(self, revisions, revid):
348
437
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
438
record = next(stream)
350
439
if record.storage_kind == 'absent':
351
440
raise errors.NoSuchRevision(revisions, revid)
352
441
revtext = record.get_bytes_as('fulltext')
353
442
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
445
def run(self, revision_id=None, revision=None, directory=u'.'):
357
446
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')
447
raise errors.BzrCommandError(gettext('You can only supply one of'
448
' revision_id or --revision'))
360
449
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
450
raise errors.BzrCommandError(gettext('You must supply either'
451
' --revision or a revision_id'))
453
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
455
revisions = b.repository.revisions
366
456
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
457
raise errors.BzrCommandError(gettext('Repository %r does not support '
458
'access to raw revision texts'))
370
460
b.repository.lock_read()
372
462
# TODO: jam 20060112 should cat-revision always output utf-8?
373
463
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
464
revision_id = cache_utf8.encode(revision_id)
376
466
self.print_revision(revisions, revision_id)
377
467
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
468
msg = gettext("The repository {0} contains no revision {1}.").format(
379
469
b.repository.base, revision_id)
380
470
raise errors.BzrCommandError(msg)
381
471
elif revision is not None:
382
472
for rev in revision:
384
474
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
475
gettext('You cannot specify a NULL revision.'))
386
476
rev_id = rev.as_revision_id(b)
387
477
self.print_revision(revisions, rev_id)
491
584
location_list=['.']
493
586
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
587
d = controldir.ControlDir.open(location)
497
590
working = d.open_workingtree()
498
591
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
592
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
593
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
594
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
595
" of a remote path"))
504
597
if (working.has_changes()):
505
598
raise errors.UncommittedChanges(working)
599
if working.get_shelf_manager().last_shelf() is not None:
600
raise errors.ShelvedChanges(working)
507
602
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
603
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
604
" from a lightweight checkout"))
511
606
d.destroy_workingtree()
609
class cmd_repair_workingtree(Command):
610
__doc__ = """Reset the working tree state file.
612
This is not meant to be used normally, but more as a way to recover from
613
filesystem corruption, etc. This rebuilds the working inventory back to a
614
'known good' state. Any new modifications (adding a file, renaming, etc)
615
will be lost, though modified files will still be detected as such.
617
Most users will want something more like "brz revert" or "brz update"
618
unless the state file has become corrupted.
620
By default this attempts to recover the current state by looking at the
621
headers of the state file. If the state file is too corrupted to even do
622
that, you can supply --revision to force the state of the tree.
625
takes_options = ['revision', 'directory',
627
help='Reset the tree even if it doesn\'t appear to be'
632
def run(self, revision=None, directory='.', force=False):
633
tree, _ = WorkingTree.open_containing(directory)
634
self.add_cleanup(tree.lock_tree_write().unlock)
638
except errors.BzrError:
639
pass # There seems to be a real error here, so we'll reset
642
raise errors.BzrCommandError(gettext(
643
'The tree does not appear to be corrupt. You probably'
644
' want "brz revert" instead. Use "--force" if you are'
645
' sure you want to reset the working tree.'))
649
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
651
tree.reset_state(revision_ids)
652
except errors.BzrError as e:
653
if revision_ids is None:
654
extra = (gettext(', the header appears corrupt, try passing -r -1'
655
' to set the state to the last commit'))
658
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
661
class cmd_revno(Command):
515
662
__doc__ = """Show current revision number.
520
667
_see_also = ['info']
521
668
takes_args = ['location?']
522
669
takes_options = [
523
Option('tree', help='Show revno of working tree'),
670
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
675
def run(self, tree=False, location=u'.', revision=None):
676
if revision is not None and tree:
677
raise errors.BzrCommandError(gettext("--tree and --revision can "
678
"not be used together"))
530
682
wt = WorkingTree.open_containing(location)[0]
683
self.add_cleanup(wt.lock_read().unlock)
532
684
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
685
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
687
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
689
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
690
self.add_cleanup(b.lock_read().unlock)
692
if len(revision) != 1:
693
raise errors.BzrCommandError(gettext(
694
"Revision numbers only make sense for single "
695
"revisions, not ranges"))
696
revid = revision[0].as_revision_id(b)
698
revid = b.last_revision()
700
revno_t = b.revision_id_to_dotted_revno(revid)
701
except errors.NoSuchRevision:
703
revno = ".".join(str(n) for n in revno_t)
546
704
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
705
self.outf.write(revno + '\n')
550
708
class cmd_revision_info(Command):
675
836
base_tree = base_branch.basis_tree()
677
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
838
action = breezy.add.AddFromBaseAction(base_tree, base_path,
678
839
to_file=self.outf, should_print=(not is_quiet()))
680
action = bzrlib.add.AddAction(to_file=self.outf,
841
action = breezy.add.AddWithSkipLargeAction(to_file=self.outf,
681
842
should_print=(not is_quiet()))
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
845
self.add_cleanup(base_tree.lock_read().unlock)
686
846
tree, file_list = tree_files_for_add(file_list)
687
847
added, ignored = tree.smart_add(file_list, not
688
848
no_recurse, action=action, save=not dry_run)
689
849
self.cleanup_now()
690
850
if len(ignored) > 0:
692
for glob in sorted(ignored.keys()):
852
for glob in sorted(ignored):
693
853
for path in ignored[glob]:
694
self.outf.write("ignored %s matching \"%s\"\n"
855
gettext("ignored {0} matching \"{1}\"\n").format(
698
859
class cmd_mkdir(Command):
751
937
help='List entries of a particular kind: file, directory, symlink.',
754
940
takes_args = ['file*']
757
943
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
758
944
if kind and kind not in ['file', 'directory', 'symlink']:
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
945
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
761
947
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)
948
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
949
self.add_cleanup(work_tree.lock_read().unlock)
765
950
if revision is not None:
766
951
tree = revision.as_tree(work_tree.branch)
768
953
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
954
self.add_cleanup(tree.lock_read().unlock)
959
self.add_cleanup(tree.lock_read().unlock)
775
960
if file_list is not None:
776
961
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
962
require_versioned=True)
778
963
# find_ids_across_trees may include some paths that don't
779
964
# 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)
965
entries = tree.iter_entries_by_dir(specific_file_ids=file_ids)
783
entries = tree.inventory.entries()
967
entries = tree.iter_entries_by_dir()
786
for path, entry in entries:
969
for path, entry in sorted(entries):
787
970
if kind and kind != entry.kind:
790
975
self.outf.write('%-50s %s\n' % (path, entry.file_id))
828
1013
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
1015
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
1016
if names_list is None:
833
1018
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)
1019
raise errors.BzrCommandError(gettext("missing file argument"))
1020
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1021
for file_name in rel_names[0:-1]:
1023
raise errors.BzrCommandError(gettext("can not move root of branch"))
1024
self.add_cleanup(tree.lock_tree_write().unlock)
838
1025
self._run(tree, names_list, rel_names, after)
840
1027
def run_auto(self, names_list, after, dry_run):
841
1028
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
1029
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)
1032
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1034
work_tree, file_list = WorkingTree.open_containing_paths(
1035
names_list, default_directory='.')
1036
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
1037
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
1039
def _run(self, tree, names_list, rel_names, after):
946
1132
match the remote one, use pull --overwrite. This will work even if the two
947
1133
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.
1135
If there is no default location set, the first pull will set it (use
1136
--no-remember to avoid setting it). After that, you can omit the
1137
location to use the default. To change the default, use --remember. The
1138
value will only be saved if the remote location can be accessed.
1140
The --verbose option will display the revisions pulled using the log_format
1141
configuration option. You can use a different format by overriding it with
1142
-Olog_format=<other_format>.
954
1144
Note: The location can be specified either in the form of a branch,
955
1145
or in the form of a path to a file containing a merge directive generated
959
1149
_see_also = ['push', 'update', 'status-flags', 'send']
960
1150
takes_options = ['remember', 'overwrite', 'revision',
961
1151
custom_help('verbose',
962
1152
help='Show logs of pulled revisions.'),
1153
custom_help('directory',
964
1154
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
1155
'rather than the one containing the working directory.'),
970
1157
help="Perform a local pull in a bound "
971
1158
"branch. Local pulls are not applied to "
972
1159
"the master branch."
1162
help="Show base revision text in conflicts."),
1163
Option('overwrite-tags',
1164
help="Overwrite tags only."),
975
1166
takes_args = ['location?']
976
1167
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1169
def run(self, location=None, remember=None, overwrite=False,
979
1170
revision=None, verbose=False,
980
directory=None, local=False):
1171
directory=None, local=False,
1172
show_base=False, overwrite_tags=False):
1175
overwrite = ["history", "tags"]
1176
elif overwrite_tags:
1177
overwrite = ["tags"]
981
1180
# FIXME: too much stuff is in the command class
982
1181
revision_id = None
983
1182
mergeable = None
1070
1275
considered diverged if the destination branch's most recent commit is one
1071
1276
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
1278
If branches have diverged, you can use 'brz push --overwrite' to replace
1074
1279
the other branch completely, discarding its unmerged changes.
1076
1281
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.
1282
do a merge (see brz help merge) from the other branch, and commit that.
1078
1283
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.
1285
If there is no default push location set, the first push will set it (use
1286
--no-remember to avoid setting it). After that, you can omit the
1287
location to use the default. To change the default, use --remember. The
1288
value will only be saved if the remote location can be accessed.
1290
The --verbose option will display the revisions pushed using the log_format
1291
configuration option. You can use a different format by overriding it with
1292
-Olog_format=<other_format>.
1086
1295
_see_also = ['pull', 'update', 'working-trees']
1106
1312
help='Create a stacked branch that refers to another branch '
1107
1313
'for the commit history. Only the work not present in the '
1108
1314
'referenced branch is included in the branch created.',
1110
1316
Option('strict',
1111
1317
help='Refuse to push if there are uncommitted changes in'
1112
1318
' the working tree, --no-strict disables the check.'),
1320
help="Don't populate the working tree, even for protocols"
1321
" that support it."),
1322
Option('overwrite-tags',
1323
help="Overwrite tags only."),
1114
1325
takes_args = ['location?']
1115
1326
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1328
def run(self, location=None, remember=None, overwrite=False,
1118
1329
create_prefix=False, verbose=False, revision=None,
1119
1330
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1121
from bzrlib.push import _show_push_branch
1331
stacked=False, strict=None, no_tree=False,
1332
overwrite_tags=False):
1333
from .push import _show_push_branch
1336
overwrite = ["history", "tags"]
1337
elif overwrite_tags:
1338
overwrite = ["tags"]
1123
1342
if directory is None:
1124
1343
directory = '.'
1125
1344
# Get the source branch
1126
1345
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1346
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1128
1347
# Get the tip's revision_id
1129
1348
revision = _get_one_revision('push', revision)
1130
1349
if revision is not None:
1151
1370
# error by the feedback given to them. RBC 20080227.
1152
1371
stacked_on = parent_url
1153
1372
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1373
raise errors.BzrCommandError(gettext(
1374
"Could not determine branch to refer to."))
1157
1376
# Get the destination location
1158
1377
if location is None:
1159
1378
stored_loc = br_from.get_push_location()
1160
1379
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1380
parent_loc = br_from.get_parent()
1382
raise errors.BzrCommandError(gettext(
1383
"No push location known or specified. To push to the "
1384
"parent branch (at %s), use 'brz push :parent'." %
1385
urlutils.unescape_for_display(parent_loc,
1386
self.outf.encoding)))
1388
raise errors.BzrCommandError(gettext(
1389
"No push location known or specified."))
1164
1391
display_url = urlutils.unescape_for_display(stored_loc,
1165
1392
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1393
note(gettext("Using saved push location: %s") % display_url)
1167
1394
location = stored_loc
1169
1396
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1397
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1398
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1399
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1402
class cmd_branch(Command):
1214
1445
def run(self, from_location, to_location=None, revision=None,
1215
1446
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(
1447
use_existing_dir=False, switch=False, bind=False,
1449
from breezy import switch as _mod_switch
1450
if self.invoked_as in ['get', 'clone']:
1451
ui.ui_factory.show_user_warning(
1452
'deprecated_command',
1453
deprecated_name=self.invoked_as,
1454
recommended_name='branch',
1455
deprecated_in_version='2.4')
1456
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1458
if not (hardlink or files_from):
1459
# accelerator_tree is usually slower because you have to read N
1460
# files (no readahead, lots of seeks, etc), but allow the user to
1461
# explicitly request it
1462
accelerator_tree = None
1463
if files_from is not None and files_from != from_location:
1464
accelerator_tree = WorkingTree.open(files_from)
1221
1465
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1466
self.add_cleanup(br_from.lock_read().unlock)
1224
1467
if revision is not None:
1225
1468
revision_id = revision.as_revision_id(br_from)
1230
1473
revision_id = br_from.last_revision()
1231
1474
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1475
to_location = getattr(br_from, "name", None)
1477
to_location = urlutils.derive_to_location(from_location)
1233
1478
to_transport = transport.get_transport(to_location)
1235
1480
to_transport.mkdir('.')
1236
1481
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1483
to_dir = controldir.ControlDir.open_from_transport(
1485
except errors.NotBranchError:
1486
if not use_existing_dir:
1487
raise errors.BzrCommandError(gettext('Target directory "%s" '
1488
'already exists.') % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1493
to_dir.open_branch()
1243
1494
except errors.NotBranchError:
1246
1497
raise errors.AlreadyBranchError(to_location)
1247
1498
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1499
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)
1505
# preserve whatever source format we have.
1506
to_dir = br_from.controldir.sprout(
1507
to_transport.base, revision_id,
1508
possible_transports=[to_transport],
1509
accelerator_tree=accelerator_tree, hardlink=hardlink,
1510
stacked=stacked, force_new_repo=standalone,
1511
create_tree_if_local=not no_tree, source_branch=br_from)
1512
branch = to_dir.open_branch(
1513
possible_transports=[
1514
br_from.controldir.root_transport, to_transport])
1515
except errors.NoSuchRevision:
1516
to_transport.delete_tree('.')
1517
msg = gettext("The branch {0} has no revision {1}.").format(
1518
from_location, revision)
1519
raise errors.BzrCommandError(msg)
1522
to_repo = to_dir.open_repository()
1523
except errors.NoRepositoryPresent:
1524
to_repo = to_dir.create_repository()
1525
to_repo.fetch(br_from.repository, revision_id=revision_id)
1526
branch = br_from.sprout(to_dir, revision_id=revision_id)
1527
br_from.tags.merge_to(branch.tags)
1266
1529
# If the source branch is stacked, the new branch may
1267
1530
# be stacked whether we asked for that explicitly or not.
1268
1531
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1533
note(gettext('Created new stacked branch referring to %s.') %
1271
1534
branch.get_stacked_on_url())
1272
1535
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1536
errors.UnstackableRepositoryFormat) as e:
1537
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1539
# Bind to the parent
1277
1540
parent_branch = Branch.open(from_location)
1278
1541
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1542
note(gettext('New branch bound to %s') % from_location)
1281
1544
# Switch to the new branch
1282
1545
wt, _ = WorkingTree.open_containing('.')
1283
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1546
_mod_switch.switch(wt.controldir, branch)
1547
note(gettext('Switched to branch: %s'),
1285
1548
urlutils.unescape_for_display(branch.base, 'utf-8'))
1551
class cmd_branches(Command):
1552
__doc__ = """List the branches available at the current location.
1554
This command will print the names of all the branches at the current
1558
takes_args = ['location?']
1560
Option('recursive', short_name='R',
1561
help='Recursively scan for branches rather than '
1562
'just looking in the specified location.')]
1564
def run(self, location=".", recursive=False):
1566
t = transport.get_transport(location)
1567
if not t.listable():
1568
raise errors.BzrCommandError(
1569
"Can't scan this type of location.")
1570
for b in controldir.ControlDir.find_branches(t):
1571
self.outf.write("%s\n" % urlutils.unescape_for_display(
1572
urlutils.relative_url(t.base, b.base),
1573
self.outf.encoding).rstrip("/"))
1575
dir = controldir.ControlDir.open_containing(location)[0]
1577
active_branch = dir.open_branch(name="")
1578
except errors.NotBranchError:
1579
active_branch = None
1581
for name, branch in iter_sibling_branches(dir):
1584
active = (active_branch is not None and
1585
active_branch.base == branch.base)
1586
names[name] = active
1587
# Only mention the current branch explicitly if it's not
1588
# one of the colocated branches
1589
if not any(viewvalues(names)) and active_branch is not None:
1590
self.outf.write("* %s\n" % gettext("(default)"))
1591
for name in sorted(names):
1592
active = names[name]
1597
self.outf.write("%s %s\n" % (
1598
prefix, name.encode(self.outf.encoding)))
1288
1601
class cmd_checkout(Command):
1289
1602
__doc__ = """Create a new checkout of an existing branch.
1389
1703
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
1704
__doc__ = """Update a working tree to a new revision.
1706
This will perform a merge of the destination revision (the tip of the
1707
branch, or the specified revision) into the working tree, and then make
1708
that revision the basis revision for the working tree.
1710
You can use this to visit an older revision, or to update a working tree
1711
that is out of date from its branch.
1713
If there are any uncommitted changes in the tree, they will be carried
1714
across and remain as uncommitted changes after the update. To discard
1715
these changes, use 'brz revert'. The uncommitted changes may conflict
1716
with the changes brought in by the change in basis revision.
1718
If the tree's branch is bound to a master branch, brz will also update
1400
1719
the branch from the master.
1721
You cannot update just a single file or directory, because each Bazaar
1722
working tree has just a single basis revision. If you want to restore a
1723
file that has been removed locally, use 'brz revert' instead of 'brz
1724
update'. If you want to restore a file to its state in a previous
1725
revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write
1726
out the old content of that file to a new location.
1728
The 'dir' argument, if given, must be the location of the root of a
1729
working tree to update. By default, the working tree that contains the
1730
current working directory is used.
1403
1733
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1734
takes_args = ['dir?']
1405
takes_options = ['revision']
1735
takes_options = ['revision',
1737
help="Show base revision text in conflicts."),
1406
1739
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1741
def run(self, dir=None, revision=None, show_base=None):
1409
1742
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]
1743
raise errors.brzCommandError(gettext(
1744
"brz update --revision takes exactly one revision"))
1746
tree = WorkingTree.open_containing('.')[0]
1748
tree, relpath = WorkingTree.open_containing(dir)
1751
raise errors.BzrCommandError(gettext(
1752
"brz update can only update a whole tree, "
1753
"not a file or subdirectory"))
1413
1754
branch = tree.branch
1414
1755
possible_transports = []
1415
1756
master = branch.get_master_branch(
1416
1757
possible_transports=possible_transports)
1417
1758
if master is not None:
1419
1759
branch_location = master.base
1762
branch_location = tree.branch.base
1421
1763
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1764
self.add_cleanup(tree.unlock)
1424
1765
# get rid of the final '/' and be ready for display
1425
1766
branch_location = urlutils.unescape_for_display(
1451
1792
change_reporter,
1452
1793
possible_transports=possible_transports,
1453
1794
revision=revision_id,
1455
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1796
show_base=show_base)
1797
except errors.NoSuchRevision as e:
1798
raise errors.BzrCommandError(gettext(
1457
1799
"branch has no revision %s\n"
1458
"bzr update --revision only works"
1459
" for a revision in the branch history"
1800
"brz update --revision only works"
1801
" for a revision in the branch history")
1460
1802
% (e.revision))
1461
1803
revno = tree.branch.revision_id_to_dotted_revno(
1462
1804
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1805
note(gettext('Updated to revision {0} of branch {1}').format(
1806
'.'.join(map(str, revno)), branch_location))
1465
1807
parent_ids = tree.get_parent_ids()
1466
1808
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'.")
1809
note(gettext('Your local commits will now show as pending merges with '
1810
"'brz status', and can be committed with 'brz commit'."))
1469
1811
if conflicts != 0:
1530
1873
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1874
'The file deletion mode to be used.',
1532
1875
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.')]
1876
safe='Backup changed files (default).',
1877
keep='Delete from brz but leave the working copy.',
1878
no_backup='Don\'t backup changed files.'),
1538
1880
aliases = ['rm', 'del']
1539
1881
encoding_type = 'replace'
1541
1883
def run(self, file_list, verbose=False, new=False,
1542
1884
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1886
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1888
if file_list is not None:
1546
1889
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1891
self.add_cleanup(tree.lock_write().unlock)
1550
1892
# Heuristics should probably all move into tree.remove_smart or
1742
2100
to_transport.ensure_base()
1743
2101
except errors.NoSuchFile:
1744
2102
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
2103
raise errors.BzrCommandError(gettext("Parent directory of %s"
1746
2104
" does not exist."
1747
2105
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
2106
" leading parent directories.")
1750
2108
to_transport.create_prefix()
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2111
a_controldir = controldir.ControlDir.open_from_transport(to_transport)
1754
2112
except errors.NotBranchError:
1755
2113
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
2114
create_branch = controldir.ControlDir.create_branch_convenience
2116
force_new_tree = False
2118
force_new_tree = None
1757
2119
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
1759
a_bzrdir = branch.bzrdir
2120
possible_transports=[to_transport],
2121
force_new_tree=force_new_tree)
2122
a_controldir = branch.controldir
1761
from bzrlib.transport.local import LocalTransport
1762
if a_bzrdir.has_branch():
2124
from .transport.local import LocalTransport
2125
if a_controldir.has_branch():
1763
2126
if (isinstance(to_transport, LocalTransport)
1764
and not a_bzrdir.has_workingtree()):
2127
and not a_controldir.has_workingtree()):
1765
2128
raise errors.BranchExistsWithoutWorkingTree(location)
1766
2129
raise errors.AlreadyBranchError(location)
1767
branch = a_bzrdir.create_branch()
1768
a_bzrdir.create_workingtree()
2130
branch = a_controldir.create_branch()
2131
if not no_tree and not a_controldir.has_workingtree():
2132
a_controldir.create_workingtree()
1769
2133
if append_revisions_only:
1771
2135
branch.set_append_revisions_only(True)
1772
2136
except errors.UpgradeRequired:
1773
raise errors.BzrCommandError('This branch format cannot be set'
1774
' to append-revisions-only. Try --default.')
2137
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2138
' to append-revisions-only. Try --default.'))
1775
2139
if not is_quiet():
1776
from bzrlib.info import describe_layout, describe_format
2140
from .info import describe_layout, describe_format
1778
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
2142
tree = a_controldir.open_workingtree(recommend_upgrade=False)
1779
2143
except (errors.NoWorkingTree, errors.NotLocalUrl):
1781
2145
repository = branch.repository
1782
2146
layout = describe_layout(repository, branch, tree).lower()
1783
format = describe_format(a_bzrdir, repository, branch, tree)
1784
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
2147
format = describe_format(a_controldir, repository, branch, tree)
2148
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1785
2150
if repository.is_shared():
1786
2151
#XXX: maybe this can be refactored into transport.path_or_url()
1787
url = repository.bzrdir.root_transport.external_url()
2152
url = repository.controldir.root_transport.external_url()
1789
2154
url = urlutils.local_path_from_url(url)
1790
2155
except errors.InvalidURL:
1792
self.outf.write("Using shared repository: %s\n" % url)
2157
self.outf.write(gettext("Using shared repository: %s\n") % url)
1795
2160
class cmd_init_repository(Command):
1837
2202
def run(self, location, format=None, no_trees=False):
1838
2203
if format is None:
1839
format = bzrdir.format_registry.make_bzrdir('default')
2204
format = controldir.format_registry.make_controldir('default')
1841
2206
if location is None:
1844
2209
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)
2211
(repo, newdir, require_stacking, repository_policy) = (
2212
format.initialize_on_transport_ex(to_transport,
2213
create_prefix=True, make_working_trees=not no_trees,
2214
shared_repo=True, force_new_repo=True,
2215
use_existing_dir=True,
2216
repo_format_name=format.repository_format.get_format_string()))
1850
2217
if not is_quiet():
1851
from bzrlib.info import show_bzrdir_info
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2218
from .info import show_bzrdir_info
2219
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1855
2222
class cmd_diff(Command):
1875
2249
Shows the difference in the working tree versus the last commit::
1879
2253
Difference between the working tree and revision 1::
1883
2257
Difference between revision 3 and revision 1::
1887
2261
Difference between revision 3 and revision 1 for branch xxx::
1891
To see the changes introduced in revision X::
2265
The changes introduced by revision 2 (equivalent to -r1..2)::
2269
To see the changes introduced by revision X::
1895
2273
Note that in the case of a merge, the -c option shows the changes
1896
2274
compared to the left hand parent. To see the changes against
1897
2275
another parent, use::
1899
bzr diff -r<chosen_parent>..X
1901
The changes introduced by revision 2 (equivalent to -r1..2)::
2277
brz diff -r<chosen_parent>..X
2279
The changes between the current revision and the previous revision
2280
(equivalent to -c-1 and -r-2..-1)
1905
2284
Show just the differences for file NEWS::
1909
2288
Show the differences in working tree xxx for file NEWS::
1913
2292
Show the differences from branch xxx to this working tree:
1917
2296
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/
2298
brz diff --old xxx --new yyy NEWS
2300
Same as 'brz diff' but prefix paths with old/ and new/::
2302
brz diff --prefix old/:new/
2304
Show the differences using a custom diff program with options::
2306
brz diff --using /usr/bin/diff --diff-options -wu
1925
2308
_see_also = ['status']
1926
2309
takes_args = ['file*']
1933
2316
'two values separated by a colon. (eg "old/:new/").'),
1935
2318
help='Branch/tree to compare from.',
1939
2322
help='Branch/tree to compare to.',
1944
2327
Option('using',
1945
2328
help='Use this command to compare files.',
1948
2331
RegistryOption('format',
1949
2333
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
2334
lazy_registry=('breezy.diff', 'format_registry'),
2335
title='Diff format'),
2337
help='How many lines of context to show.',
1953
2341
aliases = ['di', 'dif']
1954
2342
encoding_type = 'exact'
1956
2344
@display_command
1957
2345
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,
2346
prefix=None, old=None, new=None, using=None, format=None,
2348
from .diff import (get_trees_and_branches_to_diff_locked,
1960
2349
show_diff_trees)
1962
if (prefix is None) or (prefix == '0'):
1963
2352
# diff -p0 format
2355
elif prefix == '1' or prefix is None:
1967
2356
old_label = 'old/'
1968
2357
new_label = 'new/'
1969
2358
elif ':' in prefix:
1970
2359
old_label, new_label = prefix.split(":")
1972
raise errors.BzrCommandError(
2361
raise errors.BzrCommandError(gettext(
1973
2362
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2363
' (eg "old/:new/")'))
1976
2365
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2366
raise errors.BzrCommandError(gettext('brz diff --revision takes exactly'
2367
' one or two revision specifiers'))
1980
2369
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2370
raise errors.BzrCommandError(gettext(
2371
'{0} and {1} are mutually exclusive').format(
2372
'--using', '--format'))
1984
2374
(old_tree, new_tree,
1985
2375
old_branch, new_branch,
1986
2376
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2377
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2378
# GNU diff on Windows uses ANSI encoding for filenames
2379
path_encoding = osutils.get_diff_header_encoding()
1988
2380
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2381
specific_files=specific_files,
1990
2382
external_diff_options=diff_options,
1991
2383
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2384
extra_trees=extra_trees,
2385
path_encoding=path_encoding,
2386
using=using, context=context,
1993
2387
format_cls=format)
2053
2443
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2444
takes_options = ['directory', 'null']
2060
2446
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2447
def run(self, null=False, directory=u'.'):
2448
wt = WorkingTree.open_containing(directory)[0]
2449
self.add_cleanup(wt.lock_read().unlock)
2065
2450
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):
2451
self.add_cleanup(basis.lock_read().unlock)
2452
root_id = wt.get_root_id()
2453
for file_id in wt.all_file_ids():
2454
if basis.has_id(file_id):
2456
if root_id == file_id:
2458
path = wt.id2path(file_id)
2459
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2462
self.outf.write(path + '\0')
2241
2627
top = log -l10 --line
2242
2628
show = log -v -p
2244
``bzr tip`` will then show the latest revision while ``bzr top``
2630
``brz tip`` will then show the latest revision while ``brz top``
2245
2631
will show the last 10 mainline revisions. To see the details of a
2246
particular revision X, ``bzr show -rX``.
2632
particular revision X, ``brz show -rX``.
2248
2634
If you are interested in looking deeper into a particular merge X,
2249
use ``bzr log -n0 -rX``.
2635
use ``brz log -n0 -rX``.
2251
``bzr log -v`` on a branch with lots of history is currently
2637
``brz log -v`` on a branch with lots of history is currently
2252
2638
very slow. A fix for this issue is currently under development.
2253
2639
With or without that fix, it is recommended that a revision range
2254
2640
be given when using the -v option.
2256
bzr has a generic full-text matching plugin, bzr-search, that can be
2642
brz has a generic full-text matching plugin, brz-search, that can be
2257
2643
used to find revisions matching user names, commit messages, etc.
2258
2644
Among other features, this plugin can find all revisions containing
2259
2645
a list of words but not others.
2297
2688
Option('show-diff',
2298
2689
short_name='p',
2299
2690
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2691
Option('include-merged',
2301
2692
help='Show merged revisions like --levels 0 does.'),
2693
Option('include-merges', hidden=True,
2694
help='Historical alias for --include-merged.'),
2695
Option('omit-merges',
2696
help='Do not report commits with more than one parent.'),
2302
2697
Option('exclude-common-ancestry',
2303
2698
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2699
' of both ancestries (require -rX..Y).'
2701
Option('signatures',
2702
help='Show digital signature validity.'),
2705
help='Show revisions whose properties match this '
2708
ListOption('match-message',
2709
help='Show revisions whose message matches this '
2712
ListOption('match-committer',
2713
help='Show revisions whose committer matches this '
2716
ListOption('match-author',
2717
help='Show revisions whose authors match this '
2720
ListOption('match-bugs',
2721
help='Show revisions whose bugs match this '
2307
2725
encoding_type = 'replace'
2528
2976
help='Recurse into subdirectories.'),
2529
2977
Option('from-root',
2530
2978
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2979
Option('unknown', short_name='u',
2980
help='Print unknown files.'),
2532
2981
Option('versioned', help='Print versioned files.',
2533
2982
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.'),
2983
Option('ignored', short_name='i',
2984
help='Print ignored files.'),
2985
Option('kind', short_name='k',
2539
2986
help='List entries of a particular kind: file, directory, symlink.',
2543
2992
@display_command
2544
2993
def run(self, revision=None, verbose=False,
2545
2994
recursive=False, from_root=False,
2546
2995
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2996
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2998
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2999
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
3001
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
3002
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
3003
all = not (unknown or versioned or ignored)
2556
3005
selection = {'I':ignored, '?':unknown, 'V':versioned}
2674
3123
Patterns prefixed with '!!' act as regular ignore patterns, but have
2675
3124
precedence over the '!' exception patterns.
2677
Note: ignore patterns containing shell wildcards must be quoted from
3128
* Ignore patterns containing shell wildcards must be quoted from
3131
* Ignore patterns starting with "#" act as comments in the ignore file.
3132
To ignore patterns that begin with that character, use the "RE:" prefix.
2681
3135
Ignore the top level Makefile::
2683
bzr ignore ./Makefile
3137
brz ignore ./Makefile
2685
3139
Ignore .class files in all directories...::
2687
bzr ignore "*.class"
3141
brz ignore "*.class"
2689
3143
...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"
3145
brz ignore "!special.class"
3147
Ignore files whose name begins with the "#" character::
3151
Ignore .o files under the lib directory::
3153
brz ignore "lib/**/*.o"
3155
Ignore .o files under the lib directory::
3157
brz ignore "RE:lib/.*\.o"
2701
3159
Ignore everything but the "debian" toplevel directory::
2703
bzr ignore "RE:(?!debian/).*"
3161
brz ignore "RE:(?!debian/).*"
2705
3163
Ignore everything except the "local" toplevel directory,
2706
but always ignore "*~" autosave files, even under local/::
3164
but always ignore autosave files ending in ~, even under local/::
2709
bzr ignore "!./local"
3167
brz ignore "!./local"
2713
3171
_see_also = ['status', 'ignored', 'patterns']
2714
3172
takes_args = ['name_pattern*']
3173
takes_options = ['directory',
2716
3174
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
3175
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
3178
def run(self, name_pattern_list=None, default_rules=None,
3180
from breezy import ignores
2722
3181
if default_rules is not None:
2723
3182
# dump the default rules and exit
2724
3183
for pattern in ignores.USER_DEFAULTS:
2725
3184
self.outf.write("%s\n" % pattern)
2727
3186
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3187
raise errors.BzrCommandError(gettext("ignore requires at least one "
3188
"NAME_PATTERN or --default-rules."))
2730
3189
name_pattern_list = [globbing.normalize_pattern(p)
2731
3190
for p in name_pattern_list]
3192
bad_patterns_count = 0
3193
for p in name_pattern_list:
3194
if not globbing.Globster.is_pattern_valid(p):
3195
bad_patterns_count += 1
3196
bad_patterns += ('\n %s' % p)
3198
msg = (ngettext('Invalid ignore pattern found. %s',
3199
'Invalid ignore patterns found. %s',
3200
bad_patterns_count) % bad_patterns)
3201
ui.ui_factory.show_error(msg)
3202
raise errors.InvalidPattern('')
2732
3203
for name_pattern in name_pattern_list:
2733
3204
if (name_pattern[0] == '/' or
2734
3205
(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'.')
3206
raise errors.BzrCommandError(gettext(
3207
"NAME_PATTERN should not be an absolute path"))
3208
tree, relpath = WorkingTree.open_containing(directory)
2738
3209
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3210
ignored = globbing.Globster(name_pattern_list)
3212
self.add_cleanup(tree.lock_read().unlock)
2742
3213
for entry in tree.list_files():
2744
3215
if id is not None:
2745
3216
filename = entry[0]
2746
3217
if ignored.match(filename):
2747
3218
matches.append(filename)
2749
3219
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3220
self.outf.write(gettext("Warning: the following files are version "
3221
"controlled and match your ignore pattern:\n%s"
2752
3222
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3223
" unless you 'brz remove' them.\n") % ("\n".join(matches),))
2756
3226
class cmd_ignored(Command):
2842
3314
Option('per-file-timestamps',
2843
3315
help='Set modification time of files to that of the last '
2844
3316
'revision in which it was changed.'),
3317
Option('uncommitted',
3318
help='Export the working tree contents rather than that of the '
2846
3321
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
3322
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3324
from .export import export
2850
3326
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
3327
branch_or_subdir = directory
3329
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3331
if tree is not None:
3332
self.add_cleanup(tree.lock_read().unlock)
3336
raise errors.BzrCommandError(
3337
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)
3340
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3342
export(export_tree, dest, format, root, subdir, filtered=filters,
2861
3343
per_file_timestamps=per_file_timestamps)
2862
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3344
except errors.NoSuchExportFormat as e:
3345
raise errors.BzrCommandError(
3346
gettext('Unsupported export format: %s') % e.format)
2866
3349
class cmd_cat(Command):
2900
3382
if tree is None:
2901
3383
tree = b.basis_tree()
2902
3384
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3385
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3387
old_file_id = rev_tree.path2id(relpath)
3389
# TODO: Split out this code to something that generically finds the
3390
# best id for a path across one or more trees; it's like
3391
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3393
if name_from_revision:
2909
3394
# Try in revision if requested
2910
3395
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3396
raise errors.BzrCommandError(gettext(
3397
"{0!r} is not present in revision {1}").format(
2913
3398
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3400
actual_file_id = old_file_id
2917
3402
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" % (
3403
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3404
actual_file_id = cur_file_id
3405
elif old_file_id is not None:
3406
actual_file_id = old_file_id
3408
raise errors.BzrCommandError(gettext(
3409
"{0!r} is not present in revision {1}").format(
2935
3410
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)
3412
from .filter_tree import ContentFilterTree
3413
filter_tree = ContentFilterTree(rev_tree,
3414
rev_tree._content_filter_stack)
3415
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3417
content = rev_tree.get_file_text(actual_file_id)
3419
self.outf.write(content)
2952
3422
class cmd_local_time_offset(Command):
3000
3470
A common mistake is to forget to add a new file or directory before
3001
3471
running the commit command. The --strict option checks for unknown
3002
3472
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``
3473
checks can be implemented by defining hooks. See ``brz help hooks``
3006
3476
:Things to note:
3008
3478
If you accidentially commit the wrong changes or make a spelling
3009
3479
mistake in the commit message say, you can use the uncommit command
3010
to undo it. See ``bzr help uncommit`` for details.
3480
to undo it. See ``brz help uncommit`` for details.
3012
3482
Hooks can also be configured to run after a commit. This allows you
3013
3483
to trigger updates to external systems like bug trackers. The --fixes
3014
3484
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.)
3485
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
3488
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3489
takes_args = ['selected*']
3045
3490
takes_options = [
3046
3491
ListOption('exclude', type=str, short_name='x',
3047
3492
help="Do not consider changes made to a given path."),
3048
Option('message', type=unicode,
3493
Option('message', type=text_type,
3049
3494
short_name='m',
3050
3495
help="Description of the new revision."),
3076
3521
Option('show-diff', short_name='p',
3077
3522
help='When no message is supplied, show the diff along'
3078
3523
' with the status summary in the message editor.'),
3525
help='When committing to a foreign version control '
3526
'system do not push data that can not be natively '
3080
3529
aliases = ['ci', 'checkin']
3082
3531
def _iter_bug_fix_urls(self, fixes, branch):
3532
default_bugtracker = None
3083
3533
# Configure the properties for bug fixing attributes.
3084
3534
for fixed_bug in fixes:
3085
3535
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3536
if len(tokens) == 1:
3537
if default_bugtracker is None:
3538
branch_config = branch.get_config_stack()
3539
default_bugtracker = branch_config.get(
3541
if default_bugtracker is None:
3542
raise errors.BzrCommandError(gettext(
3543
"No tracker specified for bug %s. Use the form "
3544
"'tracker:id' or specify a default bug tracker "
3545
"using the `bugtracker` option.\nSee "
3546
"\"brz help bugs\" for more information on this "
3547
"feature. Commit refused.") % fixed_bug)
3548
tag = default_bugtracker
3550
elif len(tokens) != 2:
3551
raise errors.BzrCommandError(gettext(
3088
3552
"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
3553
"See \"brz help bugs\" for more information on this "
3554
"feature.\nCommit refused.") % fixed_bug)
3556
tag, bug_id = tokens
3093
3558
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
3559
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),))
3560
raise errors.BzrCommandError(gettext(
3561
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3562
except errors.MalformedBugIdentifier as e:
3563
raise errors.BzrCommandError(gettext(
3564
"%s\nCommit refused.") % (str(e),))
3101
3566
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3567
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3104
from bzrlib.errors import (
3568
author=None, show_diff=False, exclude=None, commit_time=None,
3570
from .errors import (
3105
3571
PointlessCommit,
3106
3572
ConflictsInTree,
3107
3573
StrictCommitFailed
3109
from bzrlib.msgeditor import (
3575
from .msgeditor import (
3110
3576
edit_commit_message_encoded,
3111
3577
generate_commit_message_template,
3112
make_commit_message_template_encoded
3578
make_commit_message_template_encoded,
3115
3582
commit_stamp = offset = None
3116
3583
if commit_time is not None:
3118
3585
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.
3586
except ValueError as e:
3587
raise errors.BzrCommandError(gettext(
3588
"Could not parse --commit-time: " + str(e)))
3129
3590
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3592
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3593
if selected_list == ['']:
3133
3594
# workaround - commit of root of tree should be exactly the same
3134
3595
# as just default commit in that tree, and succeed even though
3205
3674
reporter=None, verbose=verbose, revprops=properties,
3206
3675
authors=author, timestamp=commit_stamp,
3207
3676
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3677
exclude=tree.safe_relpath_files(exclude),
3209
3679
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3680
raise errors.BzrCommandError(gettext("No changes to commit."
3681
" Please 'brz add' the files you want to commit, or use"
3682
" --unchanged to force an empty commit."))
3212
3683
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3684
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3685
'tree. Use "brz conflicts" to list, "brz resolve FILE" to'
3216
3687
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"
3688
raise errors.BzrCommandError(gettext("Commit refused because there are"
3689
" unknown files in the working tree."))
3690
except errors.BoundBranchOutOfDate as e:
3691
e.extra_help = (gettext("\n"
3221
3692
'To commit to master branch, run update and then commit.\n'
3222
3693
'You can also pass --local to commit to continue working '
3297
3768
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.
3769
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3771
When the default format has changed after a major new release of
3772
Bazaar, you may be informed during certain operations that you
3773
should upgrade. Upgrading to a newer format may improve performance
3774
or make new features available. It may however limit interoperability
3775
with older repositories or with older versions of Bazaar.
3777
If you wish to upgrade to a particular format rather than the
3778
current default, that can be specified using the --format option.
3779
As a consequence, you can use the upgrade command this way to
3780
"downgrade" to an earlier format, though some conversions are
3781
a one way process (e.g. changing from the 1.x default to the
3782
2.x default) so downgrading is not always possible.
3784
A backup.bzr.~#~ directory is created at the start of the conversion
3785
process (where # is a number). By default, this is left there on
3786
completion. If the conversion fails, delete the new .bzr directory
3787
and rename this one back in its place. Use the --clean option to ask
3788
for the backup.bzr directory to be removed on successful conversion.
3789
Alternatively, you can delete it by hand if everything looks good
3792
If the location given is a shared repository, dependent branches
3793
are also converted provided the repository converts successfully.
3794
If the conversion of a branch fails, remaining branches are still
3797
For more information on upgrades, see the Bazaar Upgrade Guide,
3798
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3801
_see_also = ['check', 'reconcile', 'formats']
3306
3802
takes_args = ['url?']
3307
3803
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'),
3804
RegistryOption('format',
3805
help='Upgrade to a specific format. See "brz help'
3806
' formats" for details.',
3807
lazy_registry=('breezy.controldir', 'format_registry'),
3808
converter=lambda name: controldir.format_registry.make_controldir(name),
3809
value_switches=True, title='Branch format'),
3811
help='Remove the backup.bzr directory if successful.'),
3813
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)
3816
def run(self, url='.', format=None, clean=False, dry_run=False):
3817
from .upgrade import upgrade
3818
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3820
if len(exceptions) == 1:
3821
# Compatibility with historical behavior
3321
3827
class cmd_whoami(Command):
3322
__doc__ = """Show or set bzr user id.
3828
__doc__ = """Show or set brz user id.
3325
3831
Show the email of the current user::
3329
3835
Set the current user::
3331
bzr whoami "Frank Chu <fchu@example.com>"
3837
brz whoami "Frank Chu <fchu@example.com>"
3333
takes_options = [ Option('email',
3839
takes_options = [ 'directory',
3334
3841
help='Display email address only.'),
3335
3842
Option('branch',
3336
3843
help='Set identity for the current branch instead of '
3340
3847
encoding_type = 'replace'
3342
3849
@display_command
3343
def run(self, email=False, branch=False, name=None):
3850
def run(self, email=False, branch=False, name=None, directory=None):
3344
3851
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()
3852
if directory is None:
3853
# use branch if we're inside one; otherwise global config
3855
c = Branch.open_containing(u'.')[0].get_config_stack()
3856
except errors.NotBranchError:
3857
c = _mod_config.GlobalStack()
3859
c = Branch.open(directory).get_config_stack()
3860
identity = c.get('email')
3351
self.outf.write(c.user_email() + '\n')
3862
self.outf.write(_mod_config.extract_email_address(identity)
3353
self.outf.write(c.username() + '\n')
3865
self.outf.write(identity + '\n')
3869
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3872
# 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:
3874
_mod_config.extract_email_address(name)
3875
except errors.NoEmailInUsername as e:
3360
3876
warning('"%s" does not seem to contain an email address. '
3361
3877
'This is allowed, but not recommended.', name)
3363
3879
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3881
if directory is None:
3882
c = Branch.open_containing(u'.')[0].get_config_stack()
3884
b = Branch.open(directory)
3885
self.add_cleanup(b.lock_write().unlock)
3886
c = b.get_config_stack()
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3888
c = _mod_config.GlobalStack()
3889
c.set('email', name)
3371
3892
class cmd_nick(Command):
3372
3893
__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.
3895
If unset, the colocated branch name is used for colocated branches, and
3896
the branch directory name is used for other branches. To print the
3897
current nickname, execute with no argument.
3377
3899
Bound branches use the nickname of its master branch unless it is set
3433
3956
def remove_alias(self, alias_name):
3434
3957
if alias_name is None:
3435
raise errors.BzrCommandError(
3436
'bzr alias --remove expects an alias to remove.')
3958
raise errors.BzrCommandError(gettext(
3959
'brz alias --remove expects an alias to remove.'))
3437
3960
# If alias is not found, print something like:
3438
3961
# unalias: foo: not found
3439
c = config.GlobalConfig()
3962
c = _mod_config.GlobalConfig()
3440
3963
c.unset_alias(alias_name)
3442
3965
@display_command
3443
3966
def print_aliases(self):
3444
3967
"""Print out the defined aliases in a similar format to bash."""
3445
aliases = config.GlobalConfig().get_aliases()
3446
for key, value in sorted(aliases.iteritems()):
3447
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3968
aliases = _mod_config.GlobalConfig().get_aliases()
3969
for key, value in sorted(viewitems(aliases)):
3970
self.outf.write('brz alias %s="%s"\n' % (key, value))
3449
3972
@display_command
3450
3973
def print_alias(self, alias_name):
3451
from bzrlib.commands import get_alias
3974
from .commands import get_alias
3452
3975
alias = get_alias(alias_name)
3453
3976
if alias is None:
3454
self.outf.write("bzr alias: %s: not found\n" % alias_name)
3977
self.outf.write("brz alias: %s: not found\n" % alias_name)
3456
3979
self.outf.write(
3457
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3980
'brz alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3459
3982
def set_alias(self, alias_name, alias_command):
3460
3983
"""Save the alias in the global config."""
3461
c = config.GlobalConfig()
3984
c = _mod_config.GlobalConfig()
3462
3985
c.set_alias(alias_name, alias_command)
3496
4019
Tests that need working space on disk use a common temporary directory,
3497
4020
typically inside $TMPDIR or /tmp.
3499
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
4022
If you set BRZ_TEST_PDB=1 when running selftest, failing tests will drop
3500
4023
into a pdb postmortem session.
4025
The --coverage=DIRNAME global option produces a report with covered code
3503
4029
Run only tests relating to 'ignore'::
3507
4033
Disable plugins and list tests as they're run::
3509
bzr --no-plugins selftest -v
4035
brz --no-plugins selftest -v
3511
4037
# NB: this is used from the class without creating an instance, which is
3512
4038
# why it does not have a self parameter.
3513
4039
def get_transport_type(typestring):
3514
4040
"""Parse and return a transport specifier."""
3515
4041
if typestring == "sftp":
3516
from bzrlib.tests import stub_sftp
4042
from .tests import stub_sftp
3517
4043
return stub_sftp.SFTPAbsoluteServer
3518
if typestring == "memory":
3519
from bzrlib.tests import test_server
4044
elif typestring == "memory":
4045
from .tests import test_server
3520
4046
return memory.MemoryServer
3521
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
4047
elif typestring == "fakenfs":
4048
from .tests import test_server
3523
4049
return test_server.FakeNFSServer
3524
4050
msg = "No known transport type %s. Supported types are: sftp\n" %\
3554
4078
help='List the tests instead of running them.'),
3555
4079
RegistryOption('parallel',
3556
4080
help="Run the test suite in parallel.",
3557
lazy_registry=('bzrlib.tests', 'parallel_registry'),
4081
lazy_registry=('breezy.tests', 'parallel_registry'),
3558
4082
value_switches=False,
3560
4084
Option('randomize', type=str, argname="SEED",
3561
4085
help='Randomize the order of tests using the given'
3562
4086
' seed or "now" for the current time.'),
3563
Option('exclude', type=str, argname="PATTERN",
3565
help='Exclude tests that match this regular'
4087
ListOption('exclude', type=str, argname="PATTERN",
4089
help='Exclude tests that match this regular'
3567
4091
Option('subunit',
3568
4092
help='Output test progress via subunit.'),
3569
4093
Option('strict', help='Fail on missing dependencies or '
3586
4113
def run(self, testspecs_list=None, verbose=False, one=False,
3587
4114
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
4116
first=False, list_only=False,
3590
4117
randomize=None, exclude=None, strict=False,
3591
4118
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)
4119
parallel=None, lsprof_tests=False,
4122
# During selftest, disallow proxying, as it can cause severe
4123
# performance penalties and is only needed for thread
4124
# safety. The selftest command is assumed to not use threads
4125
# too heavily. The call should be as early as possible, as
4126
# error reporting for past duplicate imports won't have useful
4128
lazy_import.disallow_proxying()
3602
4132
if testspecs_list is not None:
3603
4133
pattern = '|'.join(testspecs_list)
3608
from bzrlib.tests import SubUnitBzrRunner
4138
from .tests import SubUnitBzrRunner
3609
4139
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
4140
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4141
"needs to be installed to use --subunit."))
3612
4142
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
4143
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
4144
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4145
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4146
# following code can be deleted when it's sufficiently deployed
4147
# -- vila/mgz 20100514
4148
if (sys.platform == "win32"
4149
and getattr(sys.stdout, 'fileno', None) is not None):
3617
4151
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
4153
self.additional_selftest_args.setdefault(
3620
4154
'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)
4156
raise errors.BzrCommandError(gettext(
4157
"--benchmark is no longer supported from brz 2.2; "
4158
"use bzr-usertest instead"))
4159
test_suite_factory = None
4161
exclude_pattern = None
3629
test_suite_factory = None
4163
exclude_pattern = '(' + '|'.join(exclude) + ')'
4165
self._disable_fsync()
3631
4166
selftest_kwargs = {"verbose": verbose,
3632
4167
"pattern": pattern,
3633
4168
"stop_on_failure": one,
3635
4170
"test_suite_factory": test_suite_factory,
3636
4171
"lsprof_timed": lsprof_timed,
3637
4172
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
4173
"matching_tests_first": first,
3640
4174
"list_only": list_only,
3641
4175
"random_seed": randomize,
3642
"exclude_pattern": exclude,
4176
"exclude_pattern": exclude_pattern,
3643
4177
"strict": strict,
3644
4178
"load_list": load_list,
3645
4179
"debug_flags": debugflag,
3646
4180
"starting_with": starting_with
3648
4182
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
4184
# Make deprecation warnings visible, unless -Werror is set
4185
cleanup = symbol_versioning.activate_deprecation_warnings(
4188
result = tests.selftest(**selftest_kwargs)
3650
4191
return int(not result)
4193
def _disable_fsync(self):
4194
"""Change the 'os' functionality to not synchronize."""
4195
self._orig_fsync = getattr(os, 'fsync', None)
4196
if self._orig_fsync is not None:
4197
os.fsync = lambda filedes: None
4198
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4199
if self._orig_fdatasync is not None:
4200
os.fdatasync = lambda filedes: None
3653
4203
class cmd_version(Command):
3654
__doc__ = """Show version of bzr."""
4204
__doc__ = """Show version of brz."""
3656
4206
encoding_type = 'replace'
3657
4207
takes_options = [
3709
4257
The source of the merge can be specified either in the form of a branch,
3710
4258
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.
4259
with brz send. If neither is specified, the default is the upstream branch
4260
or the branch most recently merged using --remember. The source of the
4261
merge may also be specified in the form of a path to a file in another
4262
branch: in this case, only the modifications to that file are merged into
4263
the current working tree.
4265
When merging from a branch, by default brz will try to merge in all new
4266
work from the other branch, automatically determining an appropriate base
4267
revision. If this fails, you may need to give an explicit base.
4269
To pick a different ending revision, pass "--revision OTHER". brz will
4270
try to merge in all new work up to and including revision OTHER.
4272
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4273
through OTHER, excluding BASE but including OTHER, will be merged. If this
4274
causes some revisions to be skipped, i.e. if the destination branch does
4275
not already contain revision BASE, such a merge is commonly referred to as
4276
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4277
cherrypicks. The changes look like a normal commit, and the history of the
4278
changes from the other branch is not stored in the commit.
4280
Revision numbers are always relative to the source branch.
3725
4282
Merge will do its best to combine the changes in two branches, but there
3726
4283
are some kinds of problems only a human can fix. When it encounters those,
3727
4284
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.
4285
before you can commit.
4287
Use brz resolve when you have fixed a problem. See also brz conflicts.
4289
If there is no default branch set, the first merge will set it (use
4290
--no-remember to avoid setting it). After that, you can omit the branch
4291
to use the default. To change the default, use --remember. The value will
4292
only be saved if the remote location can be accessed.
3737
4294
The results of the merge are placed into the destination working
3738
directory, where they can be reviewed (with bzr diff), tested, and then
4295
directory, where they can be reviewed (with brz diff), tested, and then
3739
4296
committed to record the result of the merge.
3741
4298
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
4299
--force is given. If --force is given, then the changes from the source
4300
will be merged with the current working tree, including any uncommitted
4301
changes in the tree. The --force option can also be used to create a
3743
4302
merge revision which has more than two parents.
3745
4304
If one would like to merge changes from the working tree of the other
3873
4432
self.sanity_check_merger(merger)
3874
4433
if (merger.base_rev_id == merger.other_rev_id and
3875
4434
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4435
# check if location is a nonexistent file (and not a branch) to
4436
# disambiguate the 'Nothing to do'
4437
if merger.interesting_files:
4438
if not merger.other_tree.has_filename(
4439
merger.interesting_files[0]):
4440
note(gettext("merger: ") + str(merger))
4441
raise errors.PathsDoNotExist([location])
4442
note(gettext('Nothing to do.'))
4444
if pull and not preview:
3879
4445
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4446
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4447
if (merger.base_rev_id == tree.last_revision()):
3882
4448
result = tree.pull(merger.other_branch, False,
3883
4449
merger.other_rev_id)
3884
4450
result.report(self.outf)
3886
4452
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4453
raise errors.BzrCommandError(gettext(
3888
4454
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4455
" (perhaps you would prefer 'brz pull')"))
3891
4457
return self._do_preview(merger)
3892
4458
elif interactive:
3988
4555
if other_revision_id is None:
3989
4556
other_revision_id = _mod_revision.ensure_null(
3990
4557
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):
4558
# Remember where we merge from. We need to remember if:
4559
# - user specify a location (and we don't merge from the parent
4561
# - user ask to remember or there is no previous location set to merge
4562
# from and user didn't ask to *not* remember
4563
if (user_location is not None
4565
or (remember is None
4566
and tree.branch.get_submit_branch() is None)))):
3994
4567
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4568
# Merge tags (but don't set them in the master branch yet, the user
4569
# might revert this merge). Commit will propagate them.
4570
other_branch.tags.merge_to(tree.branch.tags, ignore_master=True)
3996
4571
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4572
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4573
if other_path != '':
4162
4737
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4739
Set files in the working tree back to the contents of a previous revision.
4165
4741
Giving a list of files will revert only those files. Otherwise, all files
4166
4742
will be reverted. If the revision is not specified with '--revision', the
4167
last committed revision is used.
4743
working tree basis revision is used. A revert operation affects only the
4744
working tree, not any revision history like the branch and repository or
4745
the working tree basis revision.
4169
4747
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.
4748
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4749
will remove the changes introduced by the second last commit (-2), without
4750
affecting the changes introduced by the last commit (-1). To remove
4751
certain changes on a hunk-by-hunk basis, see the shelve command.
4752
To update the branch to a specific revision or the latest revision and
4753
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.
4756
Uncommitted changes to files that are reverted will be discarded.
4757
Howver, by default, any files that have been manually changed will be
4758
backed up first. (Files changed only by merge are not backed up.) Backup
4759
files have '.~#~' appended to their name, where # is a number.
4178
4761
When you provide files, you can use their current pathname or the pathname
4179
4762
from the target revision. So you can use revert to "undelete" a file by
4419
5011
if remote_extra and not mine_only:
4420
5012
if printed_local is True:
4421
5013
message("\n\n\n")
4422
message("You are missing %d revision(s):\n" %
5014
message(ngettext("You are missing %d revision:\n",
5015
"You are missing %d revisions:\n",
5016
len(remote_extra)) %
4423
5017
len(remote_extra))
5018
if remote_branch.supports_tags():
5019
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4424
5020
for revision in iter_log_revisions(remote_extra,
4425
5021
remote_branch.repository,
4427
5024
lf.log_revision(revision)
4428
5025
status_code = 1
4430
5027
if mine_only and not local_extra:
4431
5028
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
5029
message(gettext('This branch has no new revisions.\n'))
4433
5030
elif theirs_only and not remote_extra:
4434
5031
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
5032
message(gettext('Other branch has no new revisions.\n'))
4436
5033
elif not (mine_only or theirs_only or local_extra or
4438
5035
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
5037
message(gettext("Branches are up to date.\n"))
4441
5038
self.cleanup_now()
4442
5039
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)
5040
self.add_cleanup(local_branch.lock_write().unlock)
4445
5041
# handle race conditions - a parent might be set while we run.
4446
5042
if local_branch.get_parent() is None:
4447
5043
local_branch.set_parent(remote_branch.base)
4578
5158
Option('long', help='Show commit date in annotations.'),
4582
5163
encoding_type = 'exact'
4584
5165
@display_command
4585
5166
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5167
show_ids=False, directory=None):
5168
from .annotate import (
4588
5171
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5172
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
5173
if wt is not None:
4592
self.add_cleanup(wt.unlock)
5174
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5176
self.add_cleanup(branch.lock_read().unlock)
4596
5177
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
5178
self.add_cleanup(tree.lock_read().unlock)
5179
if wt is not None and revision is None:
4600
5180
file_id = wt.path2id(relpath)
4602
5182
file_id = tree.path2id(relpath)
4603
5183
if file_id is None:
4604
5184
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
5185
if wt is not None and revision is None:
4607
5186
# If there is a tree and we're not annotating historical
4608
5187
# versions, annotate the working tree's content.
4609
5188
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
5189
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5191
annotate_file_tree(tree, file_id, self.outf, long, all,
5192
show_ids=show_ids, branch=branch)
4616
5195
class cmd_re_sign(Command):
4620
5199
hidden = True # is this right ?
4621
5200
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5201
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
5203
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5204
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')
5205
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5206
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)
5207
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5208
b = WorkingTree.open_containing(directory)[0].branch
5209
self.add_cleanup(b.lock_write().unlock)
4632
5210
return self._run(b, revision_id_list, revision)
4634
5212
def _run(self, b, revision_id_list, revision):
4635
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5214
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4637
5215
if revision_id_list is not None:
4638
5216
b.repository.start_write_group()
4694
5272
_see_also = ['checkouts', 'unbind']
4695
5273
takes_args = ['location?']
5274
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5276
def run(self, location=None, directory=u'.'):
5277
b, relpath = Branch.open_containing(directory)
4700
5278
if location is None:
4702
5280
location = b.get_old_bound_location()
4703
5281
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5282
raise errors.BzrCommandError(gettext('No location supplied. '
5283
'This format does not remember old locations.'))
4707
5285
if location is None:
4708
5286
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5287
raise errors.BzrCommandError(
5288
gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5290
raise errors.BzrCommandError(
5291
gettext('No location supplied'
5292
' and no previous location known'))
4713
5293
b_other = Branch.open(location)
4715
5295
b.bind(b_other)
4716
5296
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5297
raise errors.BzrCommandError(gettext('These branches have diverged.'
5298
' Try merging, and then bind again.'))
4719
5299
if b.get_config().has_explicit_nickname():
4720
5300
b.nick = b_other.nick
4784
5365
b = control.open_branch()
4786
5367
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5368
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)
5370
self.add_cleanup(b.lock_write().unlock)
5371
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
5374
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5376
from .log import log_formatter, show_log
5377
from .uncommit import uncommit
4798
5379
last_revno, last_rev_id = b.last_revision_info()
4827
5408
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5411
self.outf.write(gettext('Dry-run, pretending to remove'
5412
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5414
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')
5417
if not ui.ui_factory.confirm_action(
5418
gettext(u'Uncommit these revisions'),
5419
'breezy.builtins.uncommit',
5421
self.outf.write(gettext('Canceled\n'))
4840
5424
mutter('Uncommitting from {%s} to {%s}',
4841
5425
last_rev_id, rev_id)
4842
5426
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)
5427
revno=revno, local=local, keep_tags=keep_tags)
5428
self.outf.write(gettext('You can restore the old tip by running:\n'
5429
' brz pull . -r revid:%s\n') % last_rev_id)
4848
5432
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5433
__doc__ = """Break a dead lock.
5435
This command breaks a lock on a repository, branch, working directory or
4851
5438
CAUTION: Locks should only be broken when you are sure that the process
4852
5439
holding the lock has been stopped.
4854
You can get information on what locks are open via the 'bzr info
5441
You can get information on what locks are open via the 'brz info
4855
5442
[location]' command.
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
5446
brz break-lock brz+ssh://example.com/brz/foo
5447
brz break-lock --conf ~/.bazaar
4861
5450
takes_args = ['location?']
5453
help='LOCATION is the directory where the config lock is.'),
5455
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5458
def run(self, location=None, config=False, force=False):
4864
5459
if location is None:
4865
5460
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5462
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5464
{'breezy.lockdir.break': True})
5466
conf = _mod_config.LockableConfig(file_name=location)
5469
control, relpath = controldir.ControlDir.open_containing(location)
5471
control.break_lock()
5472
except NotImplementedError:
4873
5476
class cmd_wait_until_signalled(Command):
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5477
__doc__ = """Test helper for test_start_and_stop_brz_subprocess_send_signal.
4876
5479
This just prints a line to signal when it is ready, then blocks on stdin.
4894
5497
help='Serve on stdin/out for use from inetd or sshd.'),
4895
5498
RegistryOption('protocol',
4896
5499
help="Protocol to serve.",
4897
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5500
lazy_registry=('breezy.transport', 'transport_server_registry'),
4898
5501
value_switches=True),
5503
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.',
5505
help='Listen for connections on nominated port. Passing 0 as '
5506
'the port number will result in a dynamically allocated '
5507
'port. The default port depends on the protocol.',
5509
custom_help('directory',
5510
help='Serve contents of this directory.'),
4908
5511
Option('allow-writes',
4909
5512
help='By default the server is a readonly server. Supplying '
4910
5513
'--allow-writes enables write access to the contents of '
4911
'the served directory and below. Note that ``bzr serve`` '
5514
'the served directory and below. Note that ``brz serve`` '
4912
5515
'does not perform authentication, so unless some form of '
4913
5516
'external authentication is arranged supplying this '
4914
5517
'option leads to global uncontrolled write access to your '
5520
Option('client-timeout', type=float,
5521
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
5524
def run(self, listen=None, port=None, inet=False, directory=None,
5525
allow_writes=False, protocol=None, client_timeout=None):
5526
from . import transport
4941
5527
if directory is None:
4942
directory = os.getcwd()
5528
directory = osutils.getcwd()
4943
5529
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)
5530
protocol = transport.transport_server_registry.get()
5531
url = transport.location_to_url(directory)
4947
5532
if not allow_writes:
4948
5533
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5534
t = transport.get_transport_from_url(url)
5535
protocol(t, listen, port, inet, client_timeout)
4953
5538
class cmd_join(Command):
4976
5561
containing_tree = WorkingTree.open_containing(parent_dir)[0]
4977
5562
repo = containing_tree.branch.repository
4978
5563
if not repo.supports_rich_root():
4979
raise errors.BzrCommandError(
5564
raise errors.BzrCommandError(gettext(
4980
5565
"Can't join trees because %s doesn't support rich root data.\n"
4981
"You can use bzr upgrade on the repository."
5566
"You can use brz upgrade on the repository.")
4985
5570
containing_tree.add_reference(sub_tree)
4986
except errors.BadReferenceTarget, e:
5571
except errors.BadReferenceTarget as e:
4987
5572
# XXX: Would be better to just raise a nicely printable
4988
5573
# exception from the real origin. Also below. mbp 20070306
4989
raise errors.BzrCommandError("Cannot join %s. %s" %
5574
raise errors.BzrCommandError(
5575
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4993
5578
containing_tree.subsume(sub_tree)
4994
except errors.BadSubsumeSource, e:
4995
raise errors.BzrCommandError("Cannot join %s. %s" %
5579
except errors.BadSubsumeSource as e:
5580
raise errors.BzrCommandError(
5581
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4999
5584
class cmd_split(Command):
5208
5802
help='Branch to generate the submission from, '
5209
5803
'rather than the one containing the working directory.',
5210
5804
short_name='f',
5212
5806
Option('output', short_name='o',
5213
5807
help='Write merge directive to this file or directory; '
5214
5808
'use - for stdout.',
5216
5810
Option('strict',
5217
5811
help='Refuse to send if there are uncommitted changes in'
5218
5812
' the working tree, --no-strict disables the check.'),
5219
5813
Option('mail-to', help='Mail the request to this address.',
5223
Option('body', help='Body for the email.', type=unicode),
5817
Option('body', help='Body for the email.', type=text_type),
5224
5818
RegistryOption('format',
5225
5819
help='Use the specified output format.',
5226
lazy_registry=('bzrlib.send', 'format_registry')),
5820
lazy_registry=('breezy.send', 'format_registry')),
5229
5823
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
no_patch=False, revision=None, remember=False, output=None,
5824
no_patch=False, revision=None, remember=None, output=None,
5231
5825
format=None, mail_to=None, message=None, body=None,
5232
5826
strict=None, **kwargs):
5233
from bzrlib.send import send
5827
from .send import send
5234
5828
return send(submit_branch, revision, public_branch, remember,
5235
5829
format, no_bundle, no_patch, output,
5236
5830
kwargs.get('from', '.'), mail_to, message, body,
5359
5950
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5951
self.add_cleanup(branch.lock_write().unlock)
5363
5953
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5954
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5955
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5956
note(gettext('Deleted tag %s.') % tag_name)
5369
5959
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5960
raise errors.BzrCommandError(gettext(
5371
5961
"Tags can only be placed on a single revision, "
5373
5963
revision_id = revision[0].as_revision_id(branch)
5375
5965
revision_id = branch.last_revision()
5376
5966
if tag_name is None:
5377
5967
tag_name = branch.automatic_tag_name(revision_id)
5378
5968
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):
5969
raise errors.BzrCommandError(gettext(
5970
"Please specify a tag name."))
5972
existing_target = branch.tags.lookup_tag(tag_name)
5973
except errors.NoSuchTag:
5974
existing_target = None
5975
if not force and existing_target not in (None, revision_id):
5382
5976
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5977
if existing_target == revision_id:
5978
note(gettext('Tag %s already exists for that revision.') % tag_name)
5980
branch.tags.set_tag(tag_name, revision_id)
5981
if existing_target is None:
5982
note(gettext('Created tag %s.') % tag_name)
5984
note(gettext('Updated tag %s.') % tag_name)
5387
5987
class cmd_tags(Command):
5393
5993
_see_also = ['tag']
5394
5994
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5995
custom_help('directory',
5996
help='Branch whose tags should be displayed.'),
5997
RegistryOption('sort',
5401
5998
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5999
lazy_registry=('breezy.tag', 'tag_sort_methods')
5409
6005
@display_command
6006
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6007
from .tag import tag_sort_methods
5416
6008
branch, relpath = Branch.open_containing(directory)
5418
tags = branch.tags.get_tag_dict().items()
6010
tags = list(viewitems(branch.tags.get_tag_dict()))
5423
self.add_cleanup(branch.unlock)
6014
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]])
6016
# Restrict to the specified range
6017
tags = self._tags_for_range(branch, revision)
6019
sort = tag_sort_methods.get()
5444
6021
if not show_ids:
5445
6022
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
6023
for index, (tag, revid) in enumerate(tags):
5457
6036
for tag, revspec in tags:
5458
6037
self.outf.write('%-20s %s\n' % (tag, revspec))
6039
def _tags_for_range(self, branch, revision):
6041
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6042
revid1, revid2 = rev1.rev_id, rev2.rev_id
6043
# _get_revision_range will always set revid2 if it's not specified.
6044
# If revid1 is None, it means we want to start from the branch
6045
# origin which is always a valid ancestor. If revid1 == revid2, the
6046
# ancestry check is useless.
6047
if revid1 and revid1 != revid2:
6048
# FIXME: We really want to use the same graph than
6049
# branch.iter_merge_sorted_revisions below, but this is not
6050
# easily available -- vila 2011-09-23
6051
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6052
# We don't want to output anything in this case...
6054
# only show revisions between revid1 and revid2 (inclusive)
6055
tagged_revids = branch.tags.get_reverse_tag_dict()
6057
for r in branch.iter_merge_sorted_revisions(
6058
start_revision_id=revid2, stop_revision_id=revid1,
6059
stop_rule='include'):
6060
revid_tags = tagged_revids.get(r[0], None)
6062
found.extend([(tag, r[0]) for tag in revid_tags])
5461
6066
class cmd_reconfigure(Command):
5462
__doc__ = """Reconfigure the type of a bzr directory.
6067
__doc__ = """Reconfigure the type of a brz directory.
5464
6069
A target configuration must be specified.
5476
6081
takes_args = ['location?']
5477
6082
takes_options = [
5478
6083
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6086
help='The relation between branch and tree.',
5482
6087
value_switches=True, enum_switch=False,
5483
6088
branch='Reconfigure to be an unbound branch with no working tree.',
5484
6089
tree='Reconfigure to be an unbound branch with a working tree.',
5485
6090
checkout='Reconfigure to be a bound branch with a working tree.',
5486
6091
lightweight_checkout='Reconfigure to be a lightweight'
5487
6092
' checkout (with no local history).',
6094
RegistryOption.from_kwargs(
6096
title='Repository type',
6097
help='Location fo the repository.',
6098
value_switches=True, enum_switch=False,
5488
6099
standalone='Reconfigure to be a standalone branch '
5489
6100
'(i.e. stop using shared repository).',
5490
6101
use_shared='Reconfigure to use a shared repository.',
6103
RegistryOption.from_kwargs(
6105
title='Trees in Repository',
6106
help='Whether new branches in the repository have trees.',
6107
value_switches=True, enum_switch=False,
5491
6108
with_trees='Reconfigure repository to create '
5492
6109
'working trees on branches by default.',
5493
6110
with_no_trees='Reconfigure repository to not create '
5520
6137
# At the moment you can use --stacked-on and a different
5521
6138
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
6140
if (tree_type is None and
6141
repository_type is None and
6142
repository_trees is None):
5524
6143
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6146
raise errors.BzrCommandError(gettext('No target configuration '
6148
reconfiguration = None
6149
if tree_type == 'branch':
5530
6150
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
6151
elif tree_type == 'tree':
5532
6152
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
6153
elif tree_type == 'checkout':
5534
6154
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
6155
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
6156
elif tree_type == 'lightweight-checkout':
5537
6157
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
6158
directory, bind_to)
5539
elif target_type == 'use-shared':
6160
reconfiguration.apply(force)
6161
reconfiguration = None
6162
if repository_type == 'use-shared':
5540
6163
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
6164
elif repository_type == 'standalone':
5542
6165
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
6167
reconfiguration.apply(force)
6168
reconfiguration = None
6169
if repository_trees == 'with-trees':
5544
6170
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6171
directory, True)
5546
elif target_type == 'with-no-trees':
6172
elif repository_trees == 'with-no-trees':
5547
6173
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6174
directory, False)
5549
reconfiguration.apply(force)
6176
reconfiguration.apply(force)
6177
reconfiguration = None
5552
6180
class cmd_switch(Command):
5575
6203
takes_args = ['to_location?']
5576
takes_options = [Option('force',
6204
takes_options = ['directory',
5577
6206
help='Switch even if local commits will be lost.'),
5579
6208
Option('create-branch', short_name='b',
5580
6209
help='Create the target branch from this one before'
5581
6210
' switching to it.'),
6212
help='Store and restore uncommitted changes in the'
5584
6216
def run(self, to_location=None, force=False, create_branch=False,
5586
from bzrlib import switch
6217
revision=None, directory=u'.', store=False):
6218
from . import switch
6219
tree_location = directory
5588
6220
revision = _get_one_revision('switch', revision)
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6221
possible_transports = []
6222
control_dir = controldir.ControlDir.open_containing(tree_location,
6223
possible_transports=possible_transports)[0]
5590
6224
if to_location is None:
5591
6225
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6226
raise errors.BzrCommandError(gettext('You must supply either a'
6227
' revision or a location'))
6228
to_location = tree_location
5596
branch = control_dir.open_branch()
6230
branch = control_dir.open_branch(
6231
possible_transports=possible_transports)
5597
6232
had_explicit_nick = branch.get_config().has_explicit_nickname()
5598
6233
except errors.NotBranchError:
5600
6235
had_explicit_nick = False
5601
6236
if create_branch:
5602
6237
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)
5611
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
6238
raise errors.BzrCommandError(
6239
gettext('cannot create branch without source branch'))
6240
to_location = lookup_new_sibling_branch(control_dir, to_location,
6241
possible_transports=possible_transports)
6242
to_branch = branch.controldir.sprout(to_location,
6243
possible_transports=possible_transports,
6244
source_branch=branch).open_branch()
5616
to_branch = Branch.open(to_location)
6247
to_branch = Branch.open(to_location,
6248
possible_transports=possible_transports)
5617
6249
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
6250
to_branch = open_sibling_branch(control_dir, to_location,
6251
possible_transports=possible_transports)
5621
6252
if revision is not None:
5622
6253
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
6254
switch.switch(control_dir, to_branch, force, revision_id=revision,
6255
store_uncommitted=store)
5624
6256
if had_explicit_nick:
5625
6257
branch = control_dir.open_branch() #get the new branch!
5626
6258
branch.nick = to_branch.nick
5627
note('Switched to branch: %s',
6259
note(gettext('Switched to branch: %s'),
5628
6260
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
6264
class cmd_view(Command):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6351
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6353
current_view, view_dict = tree.views.get_view_info()
5737
6354
if name is None:
5738
6355
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6358
raise errors.BzrCommandError(gettext(
6359
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6361
raise errors.BzrCommandError(gettext(
6362
"Both --delete and --switch specified"))
5747
6364
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6365
self.outf.write(gettext("Deleted all views.\n"))
5749
6366
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6367
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6369
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6370
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6373
raise errors.BzrCommandError(gettext(
6374
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6376
raise errors.BzrCommandError(gettext(
6377
"Both --switch and --all specified"))
5761
6378
elif switch == 'off':
5762
6379
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6380
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6381
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6382
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6384
tree.views.set_view_info(switch, view_dict)
5768
6385
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6386
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6389
self.outf.write(gettext('Views defined:\n'))
5773
6390
for view in sorted(view_dict):
5774
6391
if view == current_view:
5778
6395
view_str = views.view_display_str(view_dict[view])
5779
6396
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6398
self.outf.write(gettext('No views defined.\n'))
5782
6399
elif file_list:
5783
6400
if name is None:
5784
6401
# No name given and no current view set
5786
6403
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6404
raise errors.BzrCommandError(gettext(
6405
"Cannot change the 'off' pseudo view"))
5789
6406
tree.views.set_view(name, sorted(file_list))
5790
6407
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6408
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6410
# list the files
5794
6411
if name is None:
5795
6412
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6413
self.outf.write(gettext('No current view.\n'))
5798
6415
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6416
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6419
class cmd_hooks(Command):
5830
6447
Remove the branch at repo/trunk::
5832
bzr remove-branch repo/trunk
6449
brz remove-branch repo/trunk
5836
6453
takes_args = ["location?"]
6455
takes_options = ['directory',
6456
Option('force', help='Remove branch even if it is the active branch.')]
5838
6458
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()
6460
def run(self, directory=None, location=None, force=False):
6461
br = open_nearby_branch(near=directory, location=location)
6462
if not force and br.controldir.has_workingtree():
6464
active_branch = br.controldir.open_branch(name="")
6465
except errors.NotBranchError:
6466
active_branch = None
6467
if (active_branch is not None and
6468
br.control_url == active_branch.control_url):
6469
raise errors.BzrCommandError(
6470
gettext("Branch is active. Use --force to remove it."))
6471
br.controldir.destroy_branch(br.name)
5847
6474
class cmd_shelve(Command):
5848
6475
__doc__ = """Temporarily set aside some changes from the current tree.
5868
6495
You can put multiple items on the shelf, and by default, 'unshelve' will
5869
6496
restore the most recently shelved changes.
6498
For complicated changes, it is possible to edit the changes in a separate
6499
editor program to decide what the file remaining in the working copy
6500
should look like. To do this, add the configuration option
6502
change_editor = PROGRAM @new_path @old_path
6504
where @new_path is replaced with the path of the new version of the
6505
file and @old_path is replaced with the path of the old version of
6506
the file. The PROGRAM should save the new file with the desired
6507
contents of the file in the working tree.
5872
6511
takes_args = ['file*']
5874
6513
takes_options = [
5876
6516
Option('all', help='Shelve all changes.'),
5878
6518
RegistryOption('writer', 'Method to use for writing diffs.',
5879
bzrlib.option.diff_writer_registry,
6519
breezy.option.diff_writer_registry,
5880
6520
value_switches=True, enum_switch=False),
5882
6522
Option('list', help='List shelved changes.'),
5883
6523
Option('destroy',
5884
6524
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6526
_see_also = ['unshelve', 'configuration']
5888
6528
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6529
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
5892
from bzrlib.shelf_ui import Shelver
6531
return self.run_for_list(directory=directory)
6532
from .shelf_ui import Shelver
5893
6533
if writer is None:
5894
writer = bzrlib.option.diff_writer_registry.get()
6534
writer = breezy.option.diff_writer_registry.get()
5896
6536
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6537
file_list, message, destroy=destroy, directory=directory)
5967
6609
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'
6611
takes_options = ['directory',
6612
Option('ignored', help='Delete all ignored files.'),
6613
Option('detritus', help='Delete conflict files, merge and revert'
5971
6614
' backups, and failed selftest dirs.'),
5972
6615
Option('unknown',
5973
help='Delete files unknown to bzr (default).'),
6616
help='Delete files unknown to brz (default).'),
5974
6617
Option('dry-run', help='Show files to delete instead of'
5975
6618
' deleting them.'),
5976
6619
Option('force', help='Do not prompt before deleting.')]
5977
6620
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5979
from bzrlib.clean_tree import clean_tree
6621
force=False, directory=u'.'):
6622
from .clean_tree import clean_tree
5980
6623
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6627
clean_tree(directory, unknown=unknown, ignored=ignored,
6628
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6631
class cmd_reference(Command):
6032
6675
self.outf.write('%s %s\n' % (path, location))
6678
class cmd_export_pot(Command):
6679
__doc__ = """Export command helps and error messages in po format."""
6682
takes_options = [Option('plugin',
6683
help='Export help text from named command '\
6684
'(defaults to all built in commands).',
6686
Option('include-duplicates',
6687
help='Output multiple copies of the same msgid '
6688
'string if it appears more than once.'),
6691
def run(self, plugin=None, include_duplicates=False):
6692
from .export_pot import export_pot
6693
export_pot(self.outf, plugin, include_duplicates)
6696
class cmd_import(Command):
6697
__doc__ = """Import sources from a directory, tarball or zip file
6699
This command will import a directory, tarball or zip file into a bzr
6700
tree, replacing any versioned files already present. If a directory is
6701
specified, it is used as the target. If the directory does not exist, or
6702
is not versioned, it is created.
6704
Tarballs may be gzip or bzip2 compressed. This is autodetected.
6706
If the tarball or zip has a single root directory, that directory is
6707
stripped when extracting the tarball. This is not done for directories.
6710
takes_args = ['source', 'tree?']
6712
def run(self, source, tree=None):
6713
from .upstream_import import do_import
6714
do_import(source, tree)
6717
class cmd_fetch_ghosts(Command):
6718
__doc__ = """Attempt to retrieve ghosts from another branch.
6720
If the other branch is not supplied, the last-pulled branch is used.
6724
aliases = ['fetch-missing']
6725
takes_args = ['branch?']
6726
takes_options = [Option('no-fix', help="Skip additional synchonization.")]
6728
def run(self, branch=None, no_fix=False):
6729
from .fetch_ghosts import GhostFetcher
6730
installed, failed = GhostFetcher.from_cmdline(branch).run()
6731
if len(installed) > 0:
6732
self.outf.write("Installed:\n")
6733
for rev in installed:
6734
self.outf.write(rev + "\n")
6736
self.outf.write("Still missing:\n")
6738
self.outf.write(rev + "\n")
6739
if not no_fix and len(installed) > 0:
6740
cmd_reconcile().run(".")
6035
6743
def _register_lazy_builtins():
6036
6744
# register lazy builtins from other modules; called at startup and should
6037
6745
# be only called once.
6038
6746
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'),
6747
('cmd_bisect', [], 'breezy.bisect'),
6748
('cmd_bundle_info', [], 'breezy.bundle.commands'),
6749
('cmd_config', [], 'breezy.config'),
6750
('cmd_dpush', [], 'breezy.foreign'),
6751
('cmd_version_info', [], 'breezy.cmd_version_info'),
6752
('cmd_resolve', ['resolved'], 'breezy.conflicts'),
6753
('cmd_conflicts', [], 'breezy.conflicts'),
6754
('cmd_ping', [], 'breezy.smart.ping'),
6755
('cmd_sign_my_commits', [], 'breezy.commit_signature_commands'),
6756
('cmd_verify_signatures', [], 'breezy.commit_signature_commands'),
6757
('cmd_test_script', [], 'breezy.cmd_test_script'),
6046
6759
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
breezy/builtins.py
