60
from breezy.branch import Branch
61
from breezy.conflicts import ConflictList
62
from breezy.transport import memory
63
from breezy.revisionspec import RevisionSpec, RevisionInfo
64
from breezy.smtp_connection import SMTPConnection
65
from breezy.workingtree import WorkingTree
66
from breezy.i18n import gettext, ngettext
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
69
from .commands import (
63
from bzrlib.commands import (
71
65
builtin_command_registry,
68
from bzrlib.option import (
79
73
_parse_revision_str,
87
from .trace import mutter, note, warning, is_quiet, get_verbosity_level
90
def _get_branch_location(control_dir, possible_transports=None):
91
"""Return location of branch for this control dir."""
93
target = control_dir.get_branch_reference()
94
except errors.NotBranchError:
95
return control_dir.root_transport.base
96
if target is not None:
98
this_branch = control_dir.open_branch(
99
possible_transports=possible_transports)
100
# This may be a heavy checkout, where we want the master branch
101
master_location = this_branch.get_bound_location()
102
if master_location is not None:
103
return master_location
104
# If not, use a local sibling
105
return this_branch.base
108
def _is_colocated(control_dir, possible_transports=None):
109
"""Check if the branch in control_dir is colocated.
111
:param control_dir: Control directory
112
:return: Tuple with boolean indicating whether the branch is colocated
113
and the full URL to the actual branch
115
# This path is meant to be relative to the existing branch
116
this_url = _get_branch_location(control_dir,
117
possible_transports=possible_transports)
118
# Perhaps the target control dir supports colocated branches?
120
root = controldir.ControlDir.open(this_url,
121
possible_transports=possible_transports)
122
except errors.NotBranchError:
123
return (False, this_url)
126
wt = control_dir.open_workingtree()
127
except (errors.NoWorkingTree, errors.NotLocalUrl):
128
return (False, this_url)
131
root._format.colocated_branches and
132
control_dir.control_url == root.control_url,
136
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
137
"""Lookup the location for a new sibling branch.
139
:param control_dir: Control directory to find sibling branches from
140
:param location: Name of the new branch
141
:return: Full location to the new branch
143
location = directory_service.directories.dereference(location)
144
if '/' not in location and '\\' not in location:
145
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
148
return urlutils.join_segment_parameters(this_url,
149
{"branch": urlutils.escape(location)})
151
return urlutils.join(this_url, '..', urlutils.escape(location))
155
def open_sibling_branch(control_dir, location, possible_transports=None):
156
"""Open a branch, possibly a sibling of another.
158
:param control_dir: Control directory relative to which to lookup the
160
:param location: Location to look up
161
:return: branch to open
164
# Perhaps it's a colocated branch?
165
return control_dir.open_branch(location,
166
possible_transports=possible_transports)
167
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
168
this_url = _get_branch_location(control_dir)
171
this_url, '..', urlutils.escape(location)))
174
def open_nearby_branch(near=None, location=None, possible_transports=None):
175
"""Open a nearby branch.
177
:param near: Optional location of container from which to open branch
178
:param location: Location of the branch
179
:return: Branch instance
185
return Branch.open(location,
186
possible_transports=possible_transports)
187
except errors.NotBranchError:
189
cdir = controldir.ControlDir.open(near,
190
possible_transports=possible_transports)
191
return open_sibling_branch(cdir, location,
192
possible_transports=possible_transports)
195
def iter_sibling_branches(control_dir, possible_transports=None):
196
"""Iterate over the siblings of a branch.
198
:param control_dir: Control directory for which to look up the siblings
199
:return: Iterator over tuples with branch name and branch object
203
reference = control_dir.get_branch_reference()
204
except errors.NotBranchError:
205
# There is no active branch, just return the colocated branches.
206
for name, branch in viewitems(control_dir.get_branches()):
209
if reference is not None:
210
ref_branch = Branch.open(reference,
211
possible_transports=possible_transports)
214
if ref_branch is None or ref_branch.name:
215
if ref_branch is not None:
216
control_dir = ref_branch.controldir
217
for name, branch in viewitems(control_dir.get_branches()):
220
repo = ref_branch.controldir.find_repository()
221
for branch in repo.find_branches(using=True):
222
name = urlutils.relative_url(repo.user_url,
223
branch.user_url).rstrip("/")
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
227
88
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)
292
223
def _get_view_info_for_change_reporter(tree):
293
224
"""Get the view information from a tree for change reporting."""
429
342
takes_args = ['revision_id?']
430
takes_options = ['directory', 'revision']
343
takes_options = ['revision']
431
344
# cat-revision is more for frontends so should be exact
432
345
encoding = 'strict'
434
347
def print_revision(self, revisions, revid):
435
348
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
436
record = next(stream)
349
record = stream.next()
437
350
if record.storage_kind == 'absent':
438
351
raise errors.NoSuchRevision(revisions, revid)
439
352
revtext = record.get_bytes_as('fulltext')
440
353
self.outf.write(revtext.decode('utf-8'))
443
def run(self, revision_id=None, revision=None, directory=u'.'):
356
def run(self, revision_id=None, revision=None):
444
357
if revision_id is not None and revision is not None:
445
raise errors.BzrCommandError(gettext('You can only supply one of'
446
' revision_id or --revision'))
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
447
360
if revision_id is None and revision is None:
448
raise errors.BzrCommandError(gettext('You must supply either'
449
' --revision or a revision_id'))
451
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
453
365
revisions = b.repository.revisions
454
366
if revisions is None:
455
raise errors.BzrCommandError(gettext('Repository %r does not support '
456
'access to raw revision texts'))
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
458
370
b.repository.lock_read()
460
372
# TODO: jam 20060112 should cat-revision always output utf-8?
461
373
if revision_id is not None:
462
revision_id = cache_utf8.encode(revision_id)
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
464
376
self.print_revision(revisions, revision_id)
465
377
except errors.NoSuchRevision:
466
msg = gettext("The repository {0} contains no revision {1}.").format(
378
msg = "The repository %s contains no revision %s." % (
467
379
b.repository.base, revision_id)
468
380
raise errors.BzrCommandError(msg)
469
381
elif revision is not None:
470
382
for rev in revision:
472
384
raise errors.BzrCommandError(
473
gettext('You cannot specify a NULL revision.'))
385
'You cannot specify a NULL revision.')
474
386
rev_id = rev.as_revision_id(b)
475
387
self.print_revision(revisions, rev_id)
582
491
location_list=['.']
584
493
for location in location_list:
585
d = controldir.ControlDir.open(location)
494
d = bzrdir.BzrDir.open(location)
588
497
working = d.open_workingtree()
589
498
except errors.NoWorkingTree:
590
raise errors.BzrCommandError(gettext("No working tree to remove"))
499
raise errors.BzrCommandError("No working tree to remove")
591
500
except errors.NotLocalUrl:
592
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
593
" of a remote path"))
501
raise errors.BzrCommandError("You cannot remove the working tree"
595
504
if (working.has_changes()):
596
505
raise errors.UncommittedChanges(working)
597
if working.get_shelf_manager().last_shelf() is not None:
598
raise errors.ShelvedChanges(working)
600
507
if working.user_url != working.branch.user_url:
601
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
602
" from a lightweight checkout"))
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
604
511
d.destroy_workingtree()
607
class cmd_repair_workingtree(Command):
608
__doc__ = """Reset the working tree state file.
610
This is not meant to be used normally, but more as a way to recover from
611
filesystem corruption, etc. This rebuilds the working inventory back to a
612
'known good' state. Any new modifications (adding a file, renaming, etc)
613
will be lost, though modified files will still be detected as such.
615
Most users will want something more like "brz revert" or "brz update"
616
unless the state file has become corrupted.
618
By default this attempts to recover the current state by looking at the
619
headers of the state file. If the state file is too corrupted to even do
620
that, you can supply --revision to force the state of the tree.
623
takes_options = ['revision', 'directory',
625
help='Reset the tree even if it doesn\'t appear to be'
630
def run(self, revision=None, directory='.', force=False):
631
tree, _ = WorkingTree.open_containing(directory)
632
self.add_cleanup(tree.lock_tree_write().unlock)
636
except errors.BzrError:
637
pass # There seems to be a real error here, so we'll reset
640
raise errors.BzrCommandError(gettext(
641
'The tree does not appear to be corrupt. You probably'
642
' want "brz revert" instead. Use "--force" if you are'
643
' sure you want to reset the working tree.'))
647
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
649
tree.reset_state(revision_ids)
650
except errors.BzrError as e:
651
if revision_ids is None:
652
extra = (gettext(', the header appears corrupt, try passing -r -1'
653
' to set the state to the last commit'))
656
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
659
514
class cmd_revno(Command):
660
515
__doc__ = """Show current revision number.
665
520
_see_also = ['info']
666
521
takes_args = ['location?']
667
522
takes_options = [
668
Option('tree', help='Show revno of working tree.'),
523
Option('tree', help='Show revno of working tree'),
673
def run(self, tree=False, location=u'.', revision=None):
674
if revision is not None and tree:
675
raise errors.BzrCommandError(gettext("--tree and --revision can "
676
"not be used together"))
527
def run(self, tree=False, location=u'.'):
680
530
wt = WorkingTree.open_containing(location)[0]
681
self.add_cleanup(wt.lock_read().unlock)
682
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
683
533
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
685
535
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)
687
542
b = Branch.open_containing(location)[0]
688
self.add_cleanup(b.lock_read().unlock)
690
if len(revision) != 1:
691
raise errors.BzrCommandError(gettext(
692
"Revision numbers only make sense for single "
693
"revisions, not ranges"))
694
revid = revision[0].as_revision_id(b)
696
revid = b.last_revision()
698
revno_t = b.revision_id_to_dotted_revno(revid)
699
except errors.NoSuchRevision:
701
revno = ".".join(str(n) for n in revno_t)
544
self.add_cleanup(b.unlock)
702
546
self.cleanup_now()
703
self.outf.write(revno + '\n')
547
self.outf.write(str(revno) + '\n')
706
550
class cmd_revision_info(Command):
834
675
base_tree = base_branch.basis_tree()
836
action = breezy.add.AddFromBaseAction(base_tree, base_path,
677
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
837
678
to_file=self.outf, should_print=(not is_quiet()))
839
action = breezy.add.AddWithSkipLargeAction(to_file=self.outf,
680
action = bzrlib.add.AddAction(to_file=self.outf,
840
681
should_print=(not is_quiet()))
843
self.add_cleanup(base_tree.lock_read().unlock)
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
844
686
tree, file_list = tree_files_for_add(file_list)
845
687
added, ignored = tree.smart_add(file_list, not
846
688
no_recurse, action=action, save=not dry_run)
847
689
self.cleanup_now()
848
690
if len(ignored) > 0:
850
for glob in sorted(ignored):
692
for glob in sorted(ignored.keys()):
851
693
for path in ignored[glob]:
853
gettext("ignored {0} matching \"{1}\"\n").format(
694
self.outf.write("ignored %s matching \"%s\"\n"
857
698
class cmd_mkdir(Command):
935
751
help='List entries of a particular kind: file, directory, symlink.',
938
754
takes_args = ['file*']
941
757
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
942
758
if kind and kind not in ['file', 'directory', 'symlink']:
943
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
945
761
revision = _get_one_revision('inventory', revision)
946
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
947
self.add_cleanup(work_tree.lock_read().unlock)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
948
765
if revision is not None:
949
766
tree = revision.as_tree(work_tree.branch)
951
768
extra_trees = [work_tree]
952
self.add_cleanup(tree.lock_read().unlock)
770
self.add_cleanup(tree.unlock)
957
self.add_cleanup(tree.lock_read().unlock)
958
775
if file_list is not None:
959
776
file_ids = tree.paths2ids(file_list, trees=extra_trees,
960
777
require_versioned=True)
961
778
# find_ids_across_trees may include some paths that don't
962
779
# exist in 'tree'.
963
entries = tree.iter_entries_by_dir(specific_file_ids=file_ids)
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()
783
entries = tree.inventory.entries()
967
for path, entry in sorted(entries):
786
for path, entry in entries:
968
787
if kind and kind != entry.kind:
973
790
self.outf.write('%-50s %s\n' % (path, entry.file_id))
1011
828
return self.run_auto(names_list, after, dry_run)
1013
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
830
raise errors.BzrCommandError('--dry-run requires --auto.')
1014
831
if names_list is None:
1016
833
if len(names_list) < 2:
1017
raise errors.BzrCommandError(gettext("missing file argument"))
1018
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1019
for file_name in rel_names[0:-1]:
1021
raise errors.BzrCommandError(gettext("can not move root of branch"))
1022
self.add_cleanup(tree.lock_tree_write().unlock)
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)
1023
838
self._run(tree, names_list, rel_names, after)
1025
840
def run_auto(self, names_list, after, dry_run):
1026
841
if names_list is not None and len(names_list) > 1:
1027
raise errors.BzrCommandError(gettext('Only one path may be specified to'
842
raise errors.BzrCommandError('Only one path may be specified to'
1030
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1032
work_tree, file_list = WorkingTree.open_containing_paths(
1033
names_list, default_directory='.')
1034
self.add_cleanup(work_tree.lock_tree_write().unlock)
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)
1035
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
1037
852
def _run(self, tree, names_list, rel_names, after):
1130
946
match the remote one, use pull --overwrite. This will work even if the two
1131
947
branches have diverged.
1133
If there is no default location set, the first pull will set it (use
1134
--no-remember to avoid setting it). After that, you can omit the
1135
location to use the default. To change the default, use --remember. The
1136
value will only be saved if the remote location can be accessed.
1138
The --verbose option will display the revisions pulled using the log_format
1139
configuration option. You can use a different format by overriding it with
1140
-Olog_format=<other_format>.
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.
1142
954
Note: The location can be specified either in the form of a branch,
1143
955
or in the form of a path to a file containing a merge directive generated
1147
959
_see_also = ['push', 'update', 'status-flags', 'send']
1148
960
takes_options = ['remember', 'overwrite', 'revision',
1149
961
custom_help('verbose',
1150
962
help='Show logs of pulled revisions.'),
1151
custom_help('directory',
1152
964
help='Branch to pull into, '
1153
'rather than the one containing the working directory.'),
965
'rather than the one containing the working directory.',
1155
970
help="Perform a local pull in a bound "
1156
971
"branch. Local pulls are not applied to "
1157
972
"the master branch."
1160
help="Show base revision text in conflicts."),
1161
Option('overwrite-tags',
1162
help="Overwrite tags only."),
1164
975
takes_args = ['location?']
1165
976
encoding_type = 'replace'
1167
def run(self, location=None, remember=None, overwrite=False,
978
def run(self, location=None, remember=False, overwrite=False,
1168
979
revision=None, verbose=False,
1169
directory=None, local=False,
1170
show_base=False, overwrite_tags=False):
1173
overwrite = ["history", "tags"]
1174
elif overwrite_tags:
1175
overwrite = ["tags"]
980
directory=None, local=False):
1178
981
# FIXME: too much stuff is in the command class
1179
982
revision_id = None
1180
983
mergeable = None
1273
1070
considered diverged if the destination branch's most recent commit is one
1274
1071
that has not been merged (directly or indirectly) by the source branch.
1276
If branches have diverged, you can use 'brz push --overwrite' to replace
1073
If branches have diverged, you can use 'bzr push --overwrite' to replace
1277
1074
the other branch completely, discarding its unmerged changes.
1279
1076
If you want to ensure you have the different changes in the other branch,
1280
do a merge (see brz help merge) from the other branch, and commit that.
1077
do a merge (see bzr help merge) from the other branch, and commit that.
1281
1078
After that you will be able to do a push without '--overwrite'.
1283
If there is no default push location set, the first push will set it (use
1284
--no-remember to avoid setting it). After that, you can omit the
1285
location to use the default. To change the default, use --remember. The
1286
value will only be saved if the remote location can be accessed.
1288
The --verbose option will display the revisions pushed using the log_format
1289
configuration option. You can use a different format by overriding it with
1290
-Olog_format=<other_format>.
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.
1293
1086
_see_also = ['pull', 'update', 'working-trees']
1310
1106
help='Create a stacked branch that refers to another branch '
1311
1107
'for the commit history. Only the work not present in the '
1312
1108
'referenced branch is included in the branch created.',
1314
1110
Option('strict',
1315
1111
help='Refuse to push if there are uncommitted changes in'
1316
1112
' the working tree, --no-strict disables the check.'),
1318
help="Don't populate the working tree, even for protocols"
1319
" that support it."),
1320
Option('overwrite-tags',
1321
help="Overwrite tags only."),
1323
1114
takes_args = ['location?']
1324
1115
encoding_type = 'replace'
1326
def run(self, location=None, remember=None, overwrite=False,
1117
def run(self, location=None, remember=False, overwrite=False,
1327
1118
create_prefix=False, verbose=False, revision=None,
1328
1119
use_existing_dir=False, directory=None, stacked_on=None,
1329
stacked=False, strict=None, no_tree=False,
1330
overwrite_tags=False):
1331
from .push import _show_push_branch
1334
overwrite = ["history", "tags"]
1335
elif overwrite_tags:
1336
overwrite = ["tags"]
1120
stacked=False, strict=None):
1121
from bzrlib.push import _show_push_branch
1340
1123
if directory is None:
1341
1124
directory = '.'
1342
1125
# Get the source branch
1343
1126
(tree, br_from,
1344
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1345
1128
# Get the tip's revision_id
1346
1129
revision = _get_one_revision('push', revision)
1347
1130
if revision is not None:
1368
1151
# error by the feedback given to them. RBC 20080227.
1369
1152
stacked_on = parent_url
1370
1153
if not stacked_on:
1371
raise errors.BzrCommandError(gettext(
1372
"Could not determine branch to refer to."))
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1374
1157
# Get the destination location
1375
1158
if location is None:
1376
1159
stored_loc = br_from.get_push_location()
1377
1160
if stored_loc is None:
1378
parent_loc = br_from.get_parent()
1380
raise errors.BzrCommandError(gettext(
1381
"No push location known or specified. To push to the "
1382
"parent branch (at %s), use 'brz push :parent'." %
1383
urlutils.unescape_for_display(parent_loc,
1384
self.outf.encoding)))
1386
raise errors.BzrCommandError(gettext(
1387
"No push location known or specified."))
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1389
1164
display_url = urlutils.unescape_for_display(stored_loc,
1390
1165
self.outf.encoding)
1391
note(gettext("Using saved push location: %s") % display_url)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1392
1167
location = stored_loc
1394
1169
_show_push_branch(br_from, revision_id, location, self.outf,
1395
1170
verbose=verbose, overwrite=overwrite, remember=remember,
1396
1171
stacked_on=stacked_on, create_prefix=create_prefix,
1397
use_existing_dir=use_existing_dir, no_tree=no_tree)
1172
use_existing_dir=use_existing_dir)
1400
1175
class cmd_branch(Command):
1443
1214
def run(self, from_location, to_location=None, revision=None,
1444
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1445
use_existing_dir=False, switch=False, bind=False,
1447
from breezy import switch as _mod_switch
1448
if self.invoked_as in ['get', 'clone']:
1449
ui.ui_factory.show_user_warning(
1450
'deprecated_command',
1451
deprecated_name=self.invoked_as,
1452
recommended_name='branch',
1453
deprecated_in_version='2.4')
1454
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
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(
1456
if not (hardlink or files_from):
1457
# accelerator_tree is usually slower because you have to read N
1458
# files (no readahead, lots of seeks, etc), but allow the user to
1459
# explicitly request it
1460
accelerator_tree = None
1461
if files_from is not None and files_from != from_location:
1462
accelerator_tree = WorkingTree.open(files_from)
1463
1221
revision = _get_one_revision('branch', revision)
1464
self.add_cleanup(br_from.lock_read().unlock)
1223
self.add_cleanup(br_from.unlock)
1465
1224
if revision is not None:
1466
1225
revision_id = revision.as_revision_id(br_from)
1471
1230
revision_id = br_from.last_revision()
1472
1231
if to_location is None:
1473
to_location = getattr(br_from, "name", None)
1475
to_location = urlutils.derive_to_location(from_location)
1232
to_location = urlutils.derive_to_location(from_location)
1476
1233
to_transport = transport.get_transport(to_location)
1478
1235
to_transport.mkdir('.')
1479
1236
except errors.FileExists:
1481
to_dir = controldir.ControlDir.open_from_transport(
1483
except errors.NotBranchError:
1484
if not use_existing_dir:
1485
raise errors.BzrCommandError(gettext('Target directory "%s" '
1486
'already exists.') % to_location)
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1491
to_dir.open_branch()
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1492
1243
except errors.NotBranchError:
1495
1246
raise errors.AlreadyBranchError(to_location)
1496
1247
except errors.NoSuchFile:
1497
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1503
# preserve whatever source format we have.
1504
to_dir = br_from.controldir.sprout(
1505
to_transport.base, revision_id,
1506
possible_transports=[to_transport],
1507
accelerator_tree=accelerator_tree, hardlink=hardlink,
1508
stacked=stacked, force_new_repo=standalone,
1509
create_tree_if_local=not no_tree, source_branch=br_from)
1510
branch = to_dir.open_branch(
1511
possible_transports=[
1512
br_from.controldir.root_transport, to_transport])
1513
except errors.NoSuchRevision:
1514
to_transport.delete_tree('.')
1515
msg = gettext("The branch {0} has no revision {1}.").format(
1516
from_location, revision)
1517
raise errors.BzrCommandError(msg)
1520
to_repo = to_dir.open_repository()
1521
except errors.NoRepositoryPresent:
1522
to_repo = to_dir.create_repository()
1523
to_repo.fetch(br_from.repository, revision_id=revision_id)
1524
branch = br_from.sprout(to_dir, revision_id=revision_id)
1525
br_from.tags.merge_to(branch.tags)
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1264
raise errors.BzrCommandError(msg)
1265
_merge_tags_if_possible(br_from, branch)
1527
1266
# If the source branch is stacked, the new branch may
1528
1267
# be stacked whether we asked for that explicitly or not.
1529
1268
# We therefore need a try/except here and not just 'if stacked:'
1531
note(gettext('Created new stacked branch referring to %s.') %
1270
note('Created new stacked branch referring to %s.' %
1532
1271
branch.get_stacked_on_url())
1533
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1534
errors.UnstackableRepositoryFormat) as e:
1535
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1273
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1537
1276
# Bind to the parent
1538
1277
parent_branch = Branch.open(from_location)
1539
1278
branch.bind(parent_branch)
1540
note(gettext('New branch bound to %s') % from_location)
1279
note('New branch bound to %s' % from_location)
1542
1281
# Switch to the new branch
1543
1282
wt, _ = WorkingTree.open_containing('.')
1544
_mod_switch.switch(wt.controldir, branch)
1545
note(gettext('Switched to branch: %s'),
1283
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1546
1285
urlutils.unescape_for_display(branch.base, 'utf-8'))
1549
class cmd_branches(Command):
1550
__doc__ = """List the branches available at the current location.
1552
This command will print the names of all the branches at the current
1556
takes_args = ['location?']
1558
Option('recursive', short_name='R',
1559
help='Recursively scan for branches rather than '
1560
'just looking in the specified location.')]
1562
def run(self, location=".", recursive=False):
1564
t = transport.get_transport(location)
1565
if not t.listable():
1566
raise errors.BzrCommandError(
1567
"Can't scan this type of location.")
1568
for b in controldir.ControlDir.find_branches(t):
1569
self.outf.write("%s\n" % urlutils.unescape_for_display(
1570
urlutils.relative_url(t.base, b.base),
1571
self.outf.encoding).rstrip("/"))
1573
dir = controldir.ControlDir.open_containing(location)[0]
1575
active_branch = dir.open_branch(name="")
1576
except errors.NotBranchError:
1577
active_branch = None
1579
for name, branch in iter_sibling_branches(dir):
1582
active = (active_branch is not None and
1583
active_branch.base == branch.base)
1584
names[name] = active
1585
# Only mention the current branch explicitly if it's not
1586
# one of the colocated branches
1587
if not any(viewvalues(names)) and active_branch is not None:
1588
self.outf.write("* %s\n" % gettext("(default)"))
1589
for name in sorted(names):
1590
active = names[name]
1595
self.outf.write("%s %s\n" % (
1596
prefix, name.encode(self.outf.encoding)))
1599
1288
class cmd_checkout(Command):
1600
1289
__doc__ = """Create a new checkout of an existing branch.
1701
1389
class cmd_update(Command):
1702
__doc__ = """Update a working tree to a new revision.
1704
This will perform a merge of the destination revision (the tip of the
1705
branch, or the specified revision) into the working tree, and then make
1706
that revision the basis revision for the working tree.
1708
You can use this to visit an older revision, or to update a working tree
1709
that is out of date from its branch.
1711
If there are any uncommitted changes in the tree, they will be carried
1712
across and remain as uncommitted changes after the update. To discard
1713
these changes, use 'brz revert'. The uncommitted changes may conflict
1714
with the changes brought in by the change in basis revision.
1716
If the tree's branch is bound to a master branch, brz will also update
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1392
This will perform a merge into the working tree, and may generate
1393
conflicts. If you have any local changes, you will still
1394
need to commit them after the update for the update to be complete.
1396
If you want to discard your local changes, you can just do a
1397
'bzr revert' instead of 'bzr commit' after the update.
1399
If the tree's branch is bound to a master branch, it will also update
1717
1400
the branch from the master.
1719
You cannot update just a single file or directory, because each Bazaar
1720
working tree has just a single basis revision. If you want to restore a
1721
file that has been removed locally, use 'brz revert' instead of 'brz
1722
update'. If you want to restore a file to its state in a previous
1723
revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write
1724
out the old content of that file to a new location.
1726
The 'dir' argument, if given, must be the location of the root of a
1727
working tree to update. By default, the working tree that contains the
1728
current working directory is used.
1731
1403
_see_also = ['pull', 'working-trees', 'status-flags']
1732
1404
takes_args = ['dir?']
1733
takes_options = ['revision',
1735
help="Show base revision text in conflicts."),
1405
takes_options = ['revision']
1737
1406
aliases = ['up']
1739
def run(self, dir=None, revision=None, show_base=None):
1408
def run(self, dir='.', revision=None):
1740
1409
if revision is not None and len(revision) != 1:
1741
raise errors.brzCommandError(gettext(
1742
"brz update --revision takes exactly one revision"))
1744
tree = WorkingTree.open_containing('.')[0]
1746
tree, relpath = WorkingTree.open_containing(dir)
1749
raise errors.BzrCommandError(gettext(
1750
"brz update can only update a whole tree, "
1751
"not a file or subdirectory"))
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1412
tree = WorkingTree.open_containing(dir)[0]
1752
1413
branch = tree.branch
1753
1414
possible_transports = []
1754
1415
master = branch.get_master_branch(
1755
1416
possible_transports=possible_transports)
1756
1417
if master is not None:
1757
1419
branch_location = master.base
1421
tree.lock_tree_write()
1760
1422
branch_location = tree.branch.base
1761
tree.lock_tree_write()
1762
1423
self.add_cleanup(tree.unlock)
1763
1424
# get rid of the final '/' and be ready for display
1764
1425
branch_location = urlutils.unescape_for_display(
1790
1451
change_reporter,
1791
1452
possible_transports=possible_transports,
1792
1453
revision=revision_id,
1794
show_base=show_base)
1795
except errors.NoSuchRevision as e:
1796
raise errors.BzrCommandError(gettext(
1455
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1797
1457
"branch has no revision %s\n"
1798
"brz update --revision only works"
1799
" for a revision in the branch history")
1458
"bzr update --revision only works"
1459
" for a revision in the branch history"
1800
1460
% (e.revision))
1801
1461
revno = tree.branch.revision_id_to_dotted_revno(
1802
1462
_mod_revision.ensure_null(tree.last_revision()))
1803
note(gettext('Updated to revision {0} of branch {1}').format(
1804
'.'.join(map(str, revno)), branch_location))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1805
1465
parent_ids = tree.get_parent_ids()
1806
1466
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1807
note(gettext('Your local commits will now show as pending merges with '
1808
"'brz status', and can be committed with 'brz commit'."))
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1809
1469
if conflicts != 0:
1871
1530
RegistryOption.from_kwargs('file-deletion-strategy',
1872
1531
'The file deletion mode to be used.',
1873
1532
title='Deletion Strategy', value_switches=True, enum_switch=False,
1874
safe='Backup changed files (default).',
1875
keep='Delete from brz but leave the working copy.',
1876
no_backup='Don\'t backup changed files.'),
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.')]
1878
1538
aliases = ['rm', 'del']
1879
1539
encoding_type = 'replace'
1881
1541
def run(self, file_list, verbose=False, new=False,
1882
1542
file_deletion_strategy='safe'):
1884
tree, file_list = WorkingTree.open_containing_paths(file_list)
1543
tree, file_list = tree_files(file_list)
1886
1545
if file_list is not None:
1887
1546
file_list = [f for f in file_list]
1889
self.add_cleanup(tree.lock_write().unlock)
1549
self.add_cleanup(tree.unlock)
1890
1550
# Heuristics should probably all move into tree.remove_smart or
2098
1742
to_transport.ensure_base()
2099
1743
except errors.NoSuchFile:
2100
1744
if not create_prefix:
2101
raise errors.BzrCommandError(gettext("Parent directory of %s"
1745
raise errors.BzrCommandError("Parent directory of %s"
2102
1746
" does not exist."
2103
1747
"\nYou may supply --create-prefix to create all"
2104
" leading parent directories.")
1748
" leading parent directories."
2106
1750
to_transport.create_prefix()
2109
a_controldir = controldir.ControlDir.open_from_transport(to_transport)
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2110
1754
except errors.NotBranchError:
2111
1755
# really a NotBzrDir error...
2112
create_branch = controldir.ControlDir.create_branch_convenience
2114
force_new_tree = False
2116
force_new_tree = None
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
2117
1757
branch = create_branch(to_transport.base, format=format,
2118
possible_transports=[to_transport],
2119
force_new_tree=force_new_tree)
2120
a_controldir = branch.controldir
1758
possible_transports=[to_transport])
1759
a_bzrdir = branch.bzrdir
2122
from .transport.local import LocalTransport
2123
if a_controldir.has_branch():
1761
from bzrlib.transport.local import LocalTransport
1762
if a_bzrdir.has_branch():
2124
1763
if (isinstance(to_transport, LocalTransport)
2125
and not a_controldir.has_workingtree()):
1764
and not a_bzrdir.has_workingtree()):
2126
1765
raise errors.BranchExistsWithoutWorkingTree(location)
2127
1766
raise errors.AlreadyBranchError(location)
2128
branch = a_controldir.create_branch()
2129
if not no_tree and not a_controldir.has_workingtree():
2130
a_controldir.create_workingtree()
1767
branch = a_bzrdir.create_branch()
1768
a_bzrdir.create_workingtree()
2131
1769
if append_revisions_only:
2133
1771
branch.set_append_revisions_only(True)
2134
1772
except errors.UpgradeRequired:
2135
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2136
' to append-revisions-only. Try --default.'))
1773
raise errors.BzrCommandError('This branch format cannot be set'
1774
' to append-revisions-only. Try --default.')
2137
1775
if not is_quiet():
2138
from .info import describe_layout, describe_format
1776
from bzrlib.info import describe_layout, describe_format
2140
tree = a_controldir.open_workingtree(recommend_upgrade=False)
1778
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
2141
1779
except (errors.NoWorkingTree, errors.NotLocalUrl):
2143
1781
repository = branch.repository
2144
1782
layout = describe_layout(repository, branch, tree).lower()
2145
format = describe_format(a_controldir, repository, branch, tree)
2146
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1783
format = describe_format(a_bzrdir, repository, branch, tree)
1784
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
2148
1785
if repository.is_shared():
2149
1786
#XXX: maybe this can be refactored into transport.path_or_url()
2150
url = repository.controldir.root_transport.external_url()
1787
url = repository.bzrdir.root_transport.external_url()
2152
1789
url = urlutils.local_path_from_url(url)
2153
1790
except errors.InvalidURL:
2155
self.outf.write(gettext("Using shared repository: %s\n") % url)
1792
self.outf.write("Using shared repository: %s\n" % url)
2158
1795
class cmd_init_repository(Command):
2200
1837
def run(self, location, format=None, no_trees=False):
2201
1838
if format is None:
2202
format = controldir.format_registry.make_controldir('default')
1839
format = bzrdir.format_registry.make_bzrdir('default')
2204
1841
if location is None:
2207
1844
to_transport = transport.get_transport(location)
1845
to_transport.ensure_base()
2209
(repo, newdir, require_stacking, repository_policy) = (
2210
format.initialize_on_transport_ex(to_transport,
2211
create_prefix=True, make_working_trees=not no_trees,
2212
shared_repo=True, force_new_repo=True,
2213
use_existing_dir=True,
2214
repo_format_name=format.repository_format.get_format_string()))
1847
newdir = format.initialize_on_transport(to_transport)
1848
repo = newdir.create_repository(shared=True)
1849
repo.set_make_working_trees(not no_trees)
2215
1850
if not is_quiet():
2216
from .info import show_bzrdir_info
2217
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1851
from bzrlib.info import show_bzrdir_info
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2220
1855
class cmd_diff(Command):
2247
1875
Shows the difference in the working tree versus the last commit::
2251
1879
Difference between the working tree and revision 1::
2255
1883
Difference between revision 3 and revision 1::
2259
1887
Difference between revision 3 and revision 1 for branch xxx::
2263
The changes introduced by revision 2 (equivalent to -r1..2)::
2267
To see the changes introduced by revision X::
1891
To see the changes introduced in revision X::
2271
1895
Note that in the case of a merge, the -c option shows the changes
2272
1896
compared to the left hand parent. To see the changes against
2273
1897
another parent, use::
2275
brz diff -r<chosen_parent>..X
2277
The changes between the current revision and the previous revision
2278
(equivalent to -c-1 and -r-2..-1)
1899
bzr diff -r<chosen_parent>..X
1901
The changes introduced by revision 2 (equivalent to -r1..2)::
2282
1905
Show just the differences for file NEWS::
2286
1909
Show the differences in working tree xxx for file NEWS::
2290
1913
Show the differences from branch xxx to this working tree:
2294
1917
Show the differences between two branches for file NEWS::
2296
brz diff --old xxx --new yyy NEWS
2298
Same as 'brz diff' but prefix paths with old/ and new/::
2300
brz diff --prefix old/:new/
2302
Show the differences using a custom diff program with options::
2304
brz diff --using /usr/bin/diff --diff-options -wu
1919
bzr diff --old xxx --new yyy NEWS
1921
Same as 'bzr diff' but prefix paths with old/ and new/::
1923
bzr diff --prefix old/:new/
2306
1925
_see_also = ['status']
2307
1926
takes_args = ['file*']
2314
1933
'two values separated by a colon. (eg "old/:new/").'),
2316
1935
help='Branch/tree to compare from.',
2320
1939
help='Branch/tree to compare to.',
2325
1944
Option('using',
2326
1945
help='Use this command to compare files.',
2329
1948
RegistryOption('format',
2331
1949
help='Diff format to use.',
2332
lazy_registry=('breezy.diff', 'format_registry'),
2333
title='Diff format'),
2335
help='How many lines of context to show.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
2339
1953
aliases = ['di', 'dif']
2340
1954
encoding_type = 'exact'
2342
1956
@display_command
2343
1957
def run(self, revision=None, file_list=None, diff_options=None,
2344
prefix=None, old=None, new=None, using=None, format=None,
2346
from .diff import (get_trees_and_branches_to_diff_locked,
1958
prefix=None, old=None, new=None, using=None, format=None):
1959
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
2347
1960
show_diff_trees)
1962
if (prefix is None) or (prefix == '0'):
2350
1963
# diff -p0 format
2353
elif prefix == '1' or prefix is None:
2354
1967
old_label = 'old/'
2355
1968
new_label = 'new/'
2356
1969
elif ':' in prefix:
2357
1970
old_label, new_label = prefix.split(":")
2359
raise errors.BzrCommandError(gettext(
1972
raise errors.BzrCommandError(
2360
1973
'--prefix expects two values separated by a colon'
2361
' (eg "old/:new/")'))
1974
' (eg "old/:new/")')
2363
1976
if revision and len(revision) > 2:
2364
raise errors.BzrCommandError(gettext('brz diff --revision takes exactly'
2365
' one or two revision specifiers'))
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2367
1980
if using is not None and format is not None:
2368
raise errors.BzrCommandError(gettext(
2369
'{0} and {1} are mutually exclusive').format(
2370
'--using', '--format'))
1981
raise errors.BzrCommandError('--using and --format are mutually '
2372
1984
(old_tree, new_tree,
2373
1985
old_branch, new_branch,
2374
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2375
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2376
# GNU diff on Windows uses ANSI encoding for filenames
2377
path_encoding = osutils.get_diff_header_encoding()
2378
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
2379
1989
specific_files=specific_files,
2380
1990
external_diff_options=diff_options,
2381
1991
old_label=old_label, new_label=new_label,
2382
extra_trees=extra_trees,
2383
path_encoding=path_encoding,
2384
using=using, context=context,
1992
extra_trees=extra_trees, using=using,
2385
1993
format_cls=format)
2441
2053
_see_also = ['status', 'ls']
2442
takes_options = ['directory', 'null']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2444
2060
@display_command
2445
def run(self, null=False, directory=u'.'):
2446
wt = WorkingTree.open_containing(directory)[0]
2447
self.add_cleanup(wt.lock_read().unlock)
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2448
2065
basis = wt.basis_tree()
2449
self.add_cleanup(basis.lock_read().unlock)
2450
root_id = wt.get_root_id()
2451
for file_id in wt.all_file_ids():
2452
if basis.has_id(file_id):
2454
if root_id == file_id:
2456
path = wt.id2path(file_id)
2457
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
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):
2460
2079
self.outf.write(path + '\0')
2625
2241
top = log -l10 --line
2626
2242
show = log -v -p
2628
``brz tip`` will then show the latest revision while ``brz top``
2244
``bzr tip`` will then show the latest revision while ``bzr top``
2629
2245
will show the last 10 mainline revisions. To see the details of a
2630
particular revision X, ``brz show -rX``.
2246
particular revision X, ``bzr show -rX``.
2632
2248
If you are interested in looking deeper into a particular merge X,
2633
use ``brz log -n0 -rX``.
2249
use ``bzr log -n0 -rX``.
2635
``brz log -v`` on a branch with lots of history is currently
2251
``bzr log -v`` on a branch with lots of history is currently
2636
2252
very slow. A fix for this issue is currently under development.
2637
2253
With or without that fix, it is recommended that a revision range
2638
2254
be given when using the -v option.
2640
brz has a generic full-text matching plugin, brz-search, that can be
2256
bzr has a generic full-text matching plugin, bzr-search, that can be
2641
2257
used to find revisions matching user names, commit messages, etc.
2642
2258
Among other features, this plugin can find all revisions containing
2643
2259
a list of words but not others.
2686
2297
Option('show-diff',
2687
2298
short_name='p',
2688
2299
help='Show changes made in each revision as a patch.'),
2689
Option('include-merged',
2300
Option('include-merges',
2690
2301
help='Show merged revisions like --levels 0 does.'),
2691
Option('include-merges', hidden=True,
2692
help='Historical alias for --include-merged.'),
2693
Option('omit-merges',
2694
help='Do not report commits with more than one parent.'),
2695
2302
Option('exclude-common-ancestry',
2696
2303
help='Display only the revisions that are not part'
2697
' of both ancestries (require -rX..Y).'
2699
Option('signatures',
2700
help='Show digital signature validity.'),
2703
help='Show revisions whose properties match this '
2706
ListOption('match-message',
2707
help='Show revisions whose message matches this '
2710
ListOption('match-committer',
2711
help='Show revisions whose committer matches this '
2714
ListOption('match-author',
2715
help='Show revisions whose authors match this '
2718
ListOption('match-bugs',
2719
help='Show revisions whose bugs match this '
2304
' of both ancestries (require -rX..Y)'
2723
2307
encoding_type = 'replace'
2974
2528
help='Recurse into subdirectories.'),
2975
2529
Option('from-root',
2976
2530
help='Print paths relative to the root of the branch.'),
2977
Option('unknown', short_name='u',
2978
help='Print unknown files.'),
2531
Option('unknown', help='Print unknown files.'),
2979
2532
Option('versioned', help='Print versioned files.',
2980
2533
short_name='V'),
2981
Option('ignored', short_name='i',
2982
help='Print ignored files.'),
2983
Option('kind', short_name='k',
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2984
2539
help='List entries of a particular kind: file, directory, symlink.',
2990
2543
@display_command
2991
2544
def run(self, revision=None, verbose=False,
2992
2545
recursive=False, from_root=False,
2993
2546
unknown=False, versioned=False, ignored=False,
2994
null=False, kind=None, show_ids=False, path=None, directory=None):
2547
null=False, kind=None, show_ids=False, path=None):
2996
2549
if kind and kind not in ('file', 'directory', 'symlink'):
2997
raise errors.BzrCommandError(gettext('invalid kind specified'))
2550
raise errors.BzrCommandError('invalid kind specified')
2999
2552
if verbose and null:
3000
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
3001
2554
all = not (unknown or versioned or ignored)
3003
2556
selection = {'I':ignored, '?':unknown, 'V':versioned}
3121
2674
Patterns prefixed with '!!' act as regular ignore patterns, but have
3122
2675
precedence over the '!' exception patterns.
3126
* Ignore patterns containing shell wildcards must be quoted from
3129
* Ignore patterns starting with "#" act as comments in the ignore file.
3130
To ignore patterns that begin with that character, use the "RE:" prefix.
2677
Note: ignore patterns containing shell wildcards must be quoted from
3133
2681
Ignore the top level Makefile::
3135
brz ignore ./Makefile
2683
bzr ignore ./Makefile
3137
2685
Ignore .class files in all directories...::
3139
brz ignore "*.class"
2687
bzr ignore "*.class"
3141
2689
...but do not ignore "special.class"::
3143
brz ignore "!special.class"
3145
Ignore files whose name begins with the "#" character::
3149
Ignore .o files under the lib directory::
3151
brz ignore "lib/**/*.o"
3153
Ignore .o files under the lib directory::
3155
brz ignore "RE:lib/.*\.o"
2691
bzr ignore "!special.class"
2693
Ignore .o files under the lib directory::
2695
bzr ignore "lib/**/*.o"
2697
Ignore .o files under the lib directory::
2699
bzr ignore "RE:lib/.*\.o"
3157
2701
Ignore everything but the "debian" toplevel directory::
3159
brz ignore "RE:(?!debian/).*"
2703
bzr ignore "RE:(?!debian/).*"
3161
2705
Ignore everything except the "local" toplevel directory,
3162
but always ignore autosave files ending in ~, even under local/::
2706
but always ignore "*~" autosave files, even under local/::
3165
brz ignore "!./local"
2709
bzr ignore "!./local"
3169
2713
_see_also = ['status', 'ignored', 'patterns']
3170
2714
takes_args = ['name_pattern*']
3171
takes_options = ['directory',
3172
2716
Option('default-rules',
3173
help='Display the default ignore rules that brz uses.')
2717
help='Display the default ignore rules that bzr uses.')
3176
def run(self, name_pattern_list=None, default_rules=None,
3178
from breezy import ignores
2720
def run(self, name_pattern_list=None, default_rules=None):
2721
from bzrlib import ignores
3179
2722
if default_rules is not None:
3180
2723
# dump the default rules and exit
3181
2724
for pattern in ignores.USER_DEFAULTS:
3182
2725
self.outf.write("%s\n" % pattern)
3184
2727
if not name_pattern_list:
3185
raise errors.BzrCommandError(gettext("ignore requires at least one "
3186
"NAME_PATTERN or --default-rules."))
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3187
2730
name_pattern_list = [globbing.normalize_pattern(p)
3188
2731
for p in name_pattern_list]
3190
bad_patterns_count = 0
3191
for p in name_pattern_list:
3192
if not globbing.Globster.is_pattern_valid(p):
3193
bad_patterns_count += 1
3194
bad_patterns += ('\n %s' % p)
3196
msg = (ngettext('Invalid ignore pattern found. %s',
3197
'Invalid ignore patterns found. %s',
3198
bad_patterns_count) % bad_patterns)
3199
ui.ui_factory.show_error(msg)
3200
raise errors.InvalidPattern('')
3201
2732
for name_pattern in name_pattern_list:
3202
2733
if (name_pattern[0] == '/' or
3203
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
3204
raise errors.BzrCommandError(gettext(
3205
"NAME_PATTERN should not be an absolute path"))
3206
tree, relpath = WorkingTree.open_containing(directory)
2735
raise errors.BzrCommandError(
2736
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
3207
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
3208
2739
ignored = globbing.Globster(name_pattern_list)
3210
self.add_cleanup(tree.lock_read().unlock)
3211
2742
for entry in tree.list_files():
3213
2744
if id is not None:
3214
2745
filename = entry[0]
3215
2746
if ignored.match(filename):
3216
2747
matches.append(filename)
3217
2749
if len(matches) > 0:
3218
self.outf.write(gettext("Warning: the following files are version "
3219
"controlled and match your ignore pattern:\n%s"
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3220
2752
"\nThese files will continue to be version controlled"
3221
" unless you 'brz remove' them.\n") % ("\n".join(matches),))
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3224
2756
class cmd_ignored(Command):
3312
2842
Option('per-file-timestamps',
3313
2843
help='Set modification time of files to that of the last '
3314
2844
'revision in which it was changed.'),
3315
Option('uncommitted',
3316
help='Export the working tree contents rather than that of the '
3319
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
3320
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3322
from .export import export
2847
root=None, filters=False, per_file_timestamps=False):
2848
from bzrlib.export import export
3324
2850
if branch_or_subdir is None:
3325
branch_or_subdir = directory
3327
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3329
if tree is not None:
3330
self.add_cleanup(tree.lock_read().unlock)
3334
raise errors.BzrCommandError(
3335
gettext("--uncommitted requires a working tree"))
2851
tree = WorkingTree.open_containing(u'.')[0]
3338
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=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(export_tree, dest, format, root, subdir, filtered=filters,
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3341
2861
per_file_timestamps=per_file_timestamps)
3342
except errors.NoSuchExportFormat as e:
3343
raise errors.BzrCommandError(
3344
gettext('Unsupported export format: %s') % e.format)
2862
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3347
2866
class cmd_cat(Command):
3380
2900
if tree is None:
3381
2901
tree = b.basis_tree()
3382
2902
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
3383
self.add_cleanup(rev_tree.lock_read().unlock)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3385
2906
old_file_id = rev_tree.path2id(relpath)
3387
# TODO: Split out this code to something that generically finds the
3388
# best id for a path across one or more trees; it's like
3389
# find_ids_across_trees but restricted to find just one. -- mbp
3391
2908
if name_from_revision:
3392
2909
# Try in revision if requested
3393
2910
if old_file_id is None:
3394
raise errors.BzrCommandError(gettext(
3395
"{0!r} is not present in revision {1}").format(
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3396
2913
filename, rev_tree.get_revision_id()))
3398
actual_file_id = old_file_id
2915
content = rev_tree.get_file_text(old_file_id)
3400
2917
cur_file_id = tree.path2id(relpath)
3401
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3402
actual_file_id = cur_file_id
3403
elif old_file_id is not None:
3404
actual_file_id = old_file_id
3406
raise errors.BzrCommandError(gettext(
3407
"{0!r} is not present in revision {1}").format(
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" % (
3408
2935
filename, rev_tree.get_revision_id()))
3410
from .filter_tree import ContentFilterTree
3411
filter_tree = ContentFilterTree(rev_tree,
3412
rev_tree._content_filter_stack)
3413
content = filter_tree.get_file_text(actual_file_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)
3415
content = rev_tree.get_file_text(actual_file_id)
3417
self.outf.write(content)
2949
self.outf.write(content)
3420
2952
class cmd_local_time_offset(Command):
3468
3000
A common mistake is to forget to add a new file or directory before
3469
3001
running the commit command. The --strict option checks for unknown
3470
3002
files and aborts the commit if any are found. More advanced pre-commit
3471
checks can be implemented by defining hooks. See ``brz help hooks``
3003
checks can be implemented by defining hooks. See ``bzr help hooks``
3474
3006
:Things to note:
3476
3008
If you accidentially commit the wrong changes or make a spelling
3477
3009
mistake in the commit message say, you can use the uncommit command
3478
to undo it. See ``brz help uncommit`` for details.
3010
to undo it. See ``bzr help uncommit`` for details.
3480
3012
Hooks can also be configured to run after a commit. This allows you
3481
3013
to trigger updates to external systems like bug trackers. The --fixes
3482
3014
option can be used to record the association between a revision and
3483
one or more bugs. See ``brz help bugs`` for details.
3015
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3034
# TODO: Run hooks on tree to-be-committed, and after commit.
3036
# TODO: Strict commit that fails if there are deleted files.
3037
# (what does "deleted files" mean ??)
3039
# TODO: Give better message for -s, --summary, used by tla people
3041
# XXX: verbose currently does nothing
3486
3043
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3487
3044
takes_args = ['selected*']
3488
3045
takes_options = [
3489
3046
ListOption('exclude', type=str, short_name='x',
3490
3047
help="Do not consider changes made to a given path."),
3491
Option('message', type=text_type,
3048
Option('message', type=unicode,
3492
3049
short_name='m',
3493
3050
help="Description of the new revision."),
3519
3076
Option('show-diff', short_name='p',
3520
3077
help='When no message is supplied, show the diff along'
3521
3078
' with the status summary in the message editor.'),
3523
help='When committing to a foreign version control '
3524
'system do not push data that can not be natively '
3527
3080
aliases = ['ci', 'checkin']
3529
3082
def _iter_bug_fix_urls(self, fixes, branch):
3530
default_bugtracker = None
3531
3083
# Configure the properties for bug fixing attributes.
3532
3084
for fixed_bug in fixes:
3533
3085
tokens = fixed_bug.split(':')
3534
if len(tokens) == 1:
3535
if default_bugtracker is None:
3536
branch_config = branch.get_config_stack()
3537
default_bugtracker = branch_config.get(
3539
if default_bugtracker is None:
3540
raise errors.BzrCommandError(gettext(
3541
"No tracker specified for bug %s. Use the form "
3542
"'tracker:id' or specify a default bug tracker "
3543
"using the `bugtracker` option.\nSee "
3544
"\"brz help bugs\" for more information on this "
3545
"feature. Commit refused.") % fixed_bug)
3546
tag = default_bugtracker
3548
elif len(tokens) != 2:
3549
raise errors.BzrCommandError(gettext(
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3550
3088
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3551
"See \"brz help bugs\" for more information on this "
3552
"feature.\nCommit refused.") % fixed_bug)
3554
tag, bug_id = tokens
3089
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3556
3093
yield bugtracker.get_bug_url(tag, branch, bug_id)
3557
3094
except errors.UnknownBugTrackerAbbreviation:
3558
raise errors.BzrCommandError(gettext(
3559
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3560
except errors.MalformedBugIdentifier as e:
3561
raise errors.BzrCommandError(gettext(
3562
"%s\nCommit refused.") % (str(e),))
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),))
3564
3101
def run(self, message=None, file=None, verbose=False, selected_list=None,
3565
3102
unchanged=False, strict=False, local=False, fixes=None,
3566
author=None, show_diff=False, exclude=None, commit_time=None,
3568
from .errors import (
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3104
from bzrlib.errors import (
3569
3105
PointlessCommit,
3570
3106
ConflictsInTree,
3571
3107
StrictCommitFailed
3573
from .msgeditor import (
3109
from bzrlib.msgeditor import (
3574
3110
edit_commit_message_encoded,
3575
3111
generate_commit_message_template,
3576
make_commit_message_template_encoded,
3112
make_commit_message_template_encoded
3580
3115
commit_stamp = offset = None
3581
3116
if commit_time is not None:
3583
3118
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3584
except ValueError as e:
3585
raise errors.BzrCommandError(gettext(
3586
"Could not parse --commit-time: " + str(e)))
3119
except ValueError, e:
3120
raise errors.BzrCommandError(
3121
"Could not parse --commit-time: " + str(e))
3123
# TODO: Need a blackbox test for invoking the external editor; may be
3124
# slightly problematic to run this cross-platform.
3126
# TODO: do more checks that the commit will succeed before
3127
# spending the user's valuable time typing a commit message.
3588
3129
properties = {}
3590
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3131
tree, selected_list = tree_files(selected_list)
3591
3132
if selected_list == ['']:
3592
3133
# workaround - commit of root of tree should be exactly the same
3593
3134
# as just default commit in that tree, and succeed even though
3672
3205
reporter=None, verbose=verbose, revprops=properties,
3673
3206
authors=author, timestamp=commit_stamp,
3674
3207
timezone=offset,
3675
exclude=tree.safe_relpath_files(exclude),
3208
exclude=safe_relpath_files(tree, exclude))
3677
3209
except PointlessCommit:
3678
raise errors.BzrCommandError(gettext("No changes to commit."
3679
" Please 'brz add' the files you want to commit, or use"
3680
" --unchanged to force an empty commit."))
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3681
3212
except ConflictsInTree:
3682
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3683
'tree. Use "brz conflicts" to list, "brz resolve FILE" to'
3213
raise errors.BzrCommandError('Conflicts detected in working '
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3685
3216
except StrictCommitFailed:
3686
raise errors.BzrCommandError(gettext("Commit refused because there are"
3687
" unknown files in the working tree."))
3688
except errors.BoundBranchOutOfDate as e:
3689
e.extra_help = (gettext("\n"
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"
3690
3221
'To commit to master branch, run update and then commit.\n'
3691
3222
'You can also pass --local to commit to continue working '
3766
3297
class cmd_upgrade(Command):
3767
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3769
When the default format has changed after a major new release of
3770
Bazaar, you may be informed during certain operations that you
3771
should upgrade. Upgrading to a newer format may improve performance
3772
or make new features available. It may however limit interoperability
3773
with older repositories or with older versions of Bazaar.
3775
If you wish to upgrade to a particular format rather than the
3776
current default, that can be specified using the --format option.
3777
As a consequence, you can use the upgrade command this way to
3778
"downgrade" to an earlier format, though some conversions are
3779
a one way process (e.g. changing from the 1.x default to the
3780
2.x default) so downgrading is not always possible.
3782
A backup.bzr.~#~ directory is created at the start of the conversion
3783
process (where # is a number). By default, this is left there on
3784
completion. If the conversion fails, delete the new .bzr directory
3785
and rename this one back in its place. Use the --clean option to ask
3786
for the backup.bzr directory to be removed on successful conversion.
3787
Alternatively, you can delete it by hand if everything looks good
3790
If the location given is a shared repository, dependent branches
3791
are also converted provided the repository converts successfully.
3792
If the conversion of a branch fails, remaining branches are still
3795
For more information on upgrades, see the Bazaar Upgrade Guide,
3796
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3298
__doc__ = """Upgrade branch storage to current format.
3300
The check command or bzr developers may sometimes advise you to run
3301
this command. When the default format has changed you may also be warned
3302
during other operations to upgrade.
3799
_see_also = ['check', 'reconcile', 'formats']
3305
_see_also = ['check']
3800
3306
takes_args = ['url?']
3801
3307
takes_options = [
3802
RegistryOption('format',
3803
help='Upgrade to a specific format. See "brz help'
3804
' formats" for details.',
3805
lazy_registry=('breezy.controldir', 'format_registry'),
3806
converter=lambda name: controldir.format_registry.make_controldir(name),
3807
value_switches=True, title='Branch format'),
3809
help='Remove the backup.bzr directory if successful.'),
3811
help="Show what would be done, but don't actually do anything."),
3308
RegistryOption('format',
3309
help='Upgrade to a specific format. See "bzr help'
3310
' formats" for details.',
3311
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3312
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3313
value_switches=True, title='Branch format'),
3814
def run(self, url='.', format=None, clean=False, dry_run=False):
3815
from .upgrade import upgrade
3816
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3818
if len(exceptions) == 1:
3819
# Compatibility with historical behavior
3316
def run(self, url='.', format=None):
3317
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3825
3321
class cmd_whoami(Command):
3826
__doc__ = """Show or set brz user id.
3322
__doc__ = """Show or set bzr user id.
3829
3325
Show the email of the current user::
3833
3329
Set the current user::
3835
brz whoami "Frank Chu <fchu@example.com>"
3331
bzr whoami "Frank Chu <fchu@example.com>"
3837
takes_options = [ 'directory',
3333
takes_options = [ Option('email',
3839
3334
help='Display email address only.'),
3840
3335
Option('branch',
3841
3336
help='Set identity for the current branch instead of '
3845
3340
encoding_type = 'replace'
3847
3342
@display_command
3848
def run(self, email=False, branch=False, name=None, directory=None):
3343
def run(self, email=False, branch=False, name=None):
3849
3344
if name is None:
3850
if directory is None:
3851
# use branch if we're inside one; otherwise global config
3853
c = Branch.open_containing(u'.')[0].get_config_stack()
3854
except errors.NotBranchError:
3855
c = _mod_config.GlobalStack()
3857
c = Branch.open(directory).get_config_stack()
3858
identity = c.get('email')
3345
# use branch if we're inside one; otherwise global config
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3860
self.outf.write(_mod_config.extract_email_address(identity)
3351
self.outf.write(c.user_email() + '\n')
3863
self.outf.write(identity + '\n')
3353
self.outf.write(c.username() + '\n')
3867
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3870
3356
# display a warning if an email address isn't included in the given name.
3872
_mod_config.extract_email_address(name)
3873
except errors.NoEmailInUsername as e:
3358
config.extract_email_address(name)
3359
except errors.NoEmailInUsername, e:
3874
3360
warning('"%s" does not seem to contain an email address. '
3875
3361
'This is allowed, but not recommended.', name)
3877
3363
# use global config unless --branch given
3879
if directory is None:
3880
c = Branch.open_containing(u'.')[0].get_config_stack()
3882
b = Branch.open(directory)
3883
self.add_cleanup(b.lock_write().unlock)
3884
c = b.get_config_stack()
3365
c = Branch.open_containing('.')[0].get_config()
3886
c = _mod_config.GlobalStack()
3887
c.set('email', name)
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3890
3371
class cmd_nick(Command):
3891
3372
__doc__ = """Print or set the branch nickname.
3893
If unset, the colocated branch name is used for colocated branches, and
3894
the branch directory name is used for other branches. To print the
3895
current nickname, execute with no argument.
3374
If unset, the tree root directory name is used as the nickname.
3375
To print the current nickname, execute with no argument.
3897
3377
Bound branches use the nickname of its master branch unless it is set
3954
3433
def remove_alias(self, alias_name):
3955
3434
if alias_name is None:
3956
raise errors.BzrCommandError(gettext(
3957
'brz alias --remove expects an alias to remove.'))
3435
raise errors.BzrCommandError(
3436
'bzr alias --remove expects an alias to remove.')
3958
3437
# If alias is not found, print something like:
3959
3438
# unalias: foo: not found
3960
c = _mod_config.GlobalConfig()
3439
c = config.GlobalConfig()
3961
3440
c.unset_alias(alias_name)
3963
3442
@display_command
3964
3443
def print_aliases(self):
3965
3444
"""Print out the defined aliases in a similar format to bash."""
3966
aliases = _mod_config.GlobalConfig().get_aliases()
3967
for key, value in sorted(viewitems(aliases)):
3968
self.outf.write('brz alias %s="%s"\n' % (key, value))
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))
3970
3449
@display_command
3971
3450
def print_alias(self, alias_name):
3972
from .commands import get_alias
3451
from bzrlib.commands import get_alias
3973
3452
alias = get_alias(alias_name)
3974
3453
if alias is None:
3975
self.outf.write("brz alias: %s: not found\n" % alias_name)
3454
self.outf.write("bzr alias: %s: not found\n" % alias_name)
3977
3456
self.outf.write(
3978
'brz alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3457
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3980
3459
def set_alias(self, alias_name, alias_command):
3981
3460
"""Save the alias in the global config."""
3982
c = _mod_config.GlobalConfig()
3461
c = config.GlobalConfig()
3983
3462
c.set_alias(alias_name, alias_command)
4017
3496
Tests that need working space on disk use a common temporary directory,
4018
3497
typically inside $TMPDIR or /tmp.
4020
If you set BRZ_TEST_PDB=1 when running selftest, failing tests will drop
3499
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
4021
3500
into a pdb postmortem session.
4023
The --coverage=DIRNAME global option produces a report with covered code
4027
3503
Run only tests relating to 'ignore'::
4031
3507
Disable plugins and list tests as they're run::
4033
brz --no-plugins selftest -v
3509
bzr --no-plugins selftest -v
4035
3511
# NB: this is used from the class without creating an instance, which is
4036
3512
# why it does not have a self parameter.
4037
3513
def get_transport_type(typestring):
4038
3514
"""Parse and return a transport specifier."""
4039
3515
if typestring == "sftp":
4040
from .tests import stub_sftp
3516
from bzrlib.tests import stub_sftp
4041
3517
return stub_sftp.SFTPAbsoluteServer
4042
elif typestring == "memory":
4043
from .tests import test_server
3518
if typestring == "memory":
3519
from bzrlib.tests import test_server
4044
3520
return memory.MemoryServer
4045
elif typestring == "fakenfs":
4046
from .tests import test_server
3521
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
4047
3523
return test_server.FakeNFSServer
4048
3524
msg = "No known transport type %s. Supported types are: sftp\n" %\
4076
3554
help='List the tests instead of running them.'),
4077
3555
RegistryOption('parallel',
4078
3556
help="Run the test suite in parallel.",
4079
lazy_registry=('breezy.tests', 'parallel_registry'),
3557
lazy_registry=('bzrlib.tests', 'parallel_registry'),
4080
3558
value_switches=False,
4082
3560
Option('randomize', type=str, argname="SEED",
4083
3561
help='Randomize the order of tests using the given'
4084
3562
' seed or "now" for the current time.'),
4085
ListOption('exclude', type=str, argname="PATTERN",
4087
help='Exclude tests that match this regular'
3563
Option('exclude', type=str, argname="PATTERN",
3565
help='Exclude tests that match this regular'
4089
3567
Option('subunit',
4090
3568
help='Output test progress via subunit.'),
4091
3569
Option('strict', help='Fail on missing dependencies or '
4111
3586
def run(self, testspecs_list=None, verbose=False, one=False,
4112
3587
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
4114
3589
first=False, list_only=False,
4115
3590
randomize=None, exclude=None, strict=False,
4116
3591
load_list=None, debugflag=None, starting_with=None, subunit=False,
4117
parallel=None, lsprof_tests=False,
4120
# During selftest, disallow proxying, as it can cause severe
4121
# performance penalties and is only needed for thread
4122
# safety. The selftest command is assumed to not use threads
4123
# too heavily. The call should be as early as possible, as
4124
# error reporting for past duplicate imports won't have useful
4126
lazy_import.disallow_proxying()
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)
4130
3602
if testspecs_list is not None:
4131
3603
pattern = '|'.join(testspecs_list)
4136
from .tests import SubUnitBzrRunner
3608
from bzrlib.tests import SubUnitBzrRunner
4137
3609
except ImportError:
4138
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4139
"needs to be installed to use --subunit."))
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
4140
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
4141
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
4142
3614
# stdout, which would corrupt the subunit stream.
4143
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4144
# following code can be deleted when it's sufficiently deployed
4145
# -- vila/mgz 20100514
4146
if (sys.platform == "win32"
4147
and getattr(sys.stdout, 'fileno', None) is not None):
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4149
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
4151
3619
self.additional_selftest_args.setdefault(
4152
3620
'suite_decorators', []).append(parallel)
4154
raise errors.BzrCommandError(gettext(
4155
"--benchmark is no longer supported from brz 2.2; "
4156
"use bzr-usertest instead"))
4157
test_suite_factory = None
4159
exclude_pattern = None
3622
test_suite_factory = benchmarks.test_suite
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
verbose = not is_quiet()
3625
# TODO: should possibly lock the history file...
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
4161
exclude_pattern = '(' + '|'.join(exclude) + ')'
4163
self._disable_fsync()
3629
test_suite_factory = None
4164
3631
selftest_kwargs = {"verbose": verbose,
4165
3632
"pattern": pattern,
4166
3633
"stop_on_failure": one,
4168
3635
"test_suite_factory": test_suite_factory,
4169
3636
"lsprof_timed": lsprof_timed,
4170
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
4171
3639
"matching_tests_first": first,
4172
3640
"list_only": list_only,
4173
3641
"random_seed": randomize,
4174
"exclude_pattern": exclude_pattern,
3642
"exclude_pattern": exclude,
4175
3643
"strict": strict,
4176
3644
"load_list": load_list,
4177
3645
"debug_flags": debugflag,
4178
3646
"starting_with": starting_with
4180
3648
selftest_kwargs.update(self.additional_selftest_args)
4182
# Make deprecation warnings visible, unless -Werror is set
4183
cleanup = symbol_versioning.activate_deprecation_warnings(
4186
result = tests.selftest(**selftest_kwargs)
3649
result = selftest(**selftest_kwargs)
4189
3650
return int(not result)
4191
def _disable_fsync(self):
4192
"""Change the 'os' functionality to not synchronize."""
4193
self._orig_fsync = getattr(os, 'fsync', None)
4194
if self._orig_fsync is not None:
4195
os.fsync = lambda filedes: None
4196
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4197
if self._orig_fdatasync is not None:
4198
os.fdatasync = lambda filedes: None
4201
3653
class cmd_version(Command):
4202
__doc__ = """Show version of brz."""
3654
__doc__ = """Show version of bzr."""
4204
3656
encoding_type = 'replace'
4205
3657
takes_options = [
4255
3709
The source of the merge can be specified either in the form of a branch,
4256
3710
or in the form of a path to a file containing a merge directive generated
4257
with brz send. If neither is specified, the default is the upstream branch
4258
or the branch most recently merged using --remember. The source of the
4259
merge may also be specified in the form of a path to a file in another
4260
branch: in this case, only the modifications to that file are merged into
4261
the current working tree.
4263
When merging from a branch, by default brz will try to merge in all new
4264
work from the other branch, automatically determining an appropriate base
4265
revision. If this fails, you may need to give an explicit base.
4267
To pick a different ending revision, pass "--revision OTHER". brz will
4268
try to merge in all new work up to and including revision OTHER.
4270
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4271
through OTHER, excluding BASE but including OTHER, will be merged. If this
4272
causes some revisions to be skipped, i.e. if the destination branch does
4273
not already contain revision BASE, such a merge is commonly referred to as
4274
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4275
cherrypicks. The changes look like a normal commit, and the history of the
4276
changes from the other branch is not stored in the commit.
4278
Revision numbers are always relative to the source branch.
3711
with bzr send. If neither is specified, the default is the upstream branch
3712
or the branch most recently merged using --remember.
3714
When merging a branch, by default the tip will be merged. To pick a different
3715
revision, pass --revision. If you specify two values, the first will be used as
3716
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3717
available revisions, like this is commonly referred to as "cherrypicking".
3719
Revision numbers are always relative to the branch being merged.
3721
By default, bzr will try to merge in all new work from the other
3722
branch, automatically determining an appropriate base. If this
3723
fails, you may need to give an explicit base.
4280
3725
Merge will do its best to combine the changes in two branches, but there
4281
3726
are some kinds of problems only a human can fix. When it encounters those,
4282
3727
it will mark a conflict. A conflict means that you need to fix something,
4283
before you can commit.
4285
Use brz resolve when you have fixed a problem. See also brz conflicts.
4287
If there is no default branch set, the first merge will set it (use
4288
--no-remember to avoid setting it). After that, you can omit the branch
4289
to use the default. To change the default, use --remember. The value will
4290
only be saved if the remote location can be accessed.
3728
before you should commit.
3730
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3732
If there is no default branch set, the first merge will set it. After
3733
that, you can omit the branch to use the default. To change the
3734
default, use --remember. The value will only be saved if the remote
3735
location can be accessed.
4292
3737
The results of the merge are placed into the destination working
4293
directory, where they can be reviewed (with brz diff), tested, and then
3738
directory, where they can be reviewed (with bzr diff), tested, and then
4294
3739
committed to record the result of the merge.
4296
3741
merge refuses to run if there are any uncommitted changes, unless
4297
--force is given. If --force is given, then the changes from the source
4298
will be merged with the current working tree, including any uncommitted
4299
changes in the tree. The --force option can also be used to create a
3742
--force is given. The --force option can also be used to create a
4300
3743
merge revision which has more than two parents.
4302
3745
If one would like to merge changes from the working tree of the other
4430
3873
self.sanity_check_merger(merger)
4431
3874
if (merger.base_rev_id == merger.other_rev_id and
4432
3875
merger.other_rev_id is not None):
4433
# check if location is a nonexistent file (and not a branch) to
4434
# disambiguate the 'Nothing to do'
4435
if merger.interesting_files:
4436
if not merger.other_tree.has_filename(
4437
merger.interesting_files[0]):
4438
note(gettext("merger: ") + str(merger))
4439
raise errors.PathsDoNotExist([location])
4440
note(gettext('Nothing to do.'))
3876
note('Nothing to do.')
4442
if pull and not preview:
4443
3879
if merger.interesting_files is not None:
4444
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3880
raise errors.BzrCommandError('Cannot pull individual files')
4445
3881
if (merger.base_rev_id == tree.last_revision()):
4446
3882
result = tree.pull(merger.other_branch, False,
4447
3883
merger.other_rev_id)
4448
3884
result.report(self.outf)
4450
3886
if merger.this_basis is None:
4451
raise errors.BzrCommandError(gettext(
3887
raise errors.BzrCommandError(
4452
3888
"This branch has no commits."
4453
" (perhaps you would prefer 'brz pull')"))
3889
" (perhaps you would prefer 'bzr pull')")
4455
3891
return self._do_preview(merger)
4456
3892
elif interactive:
4553
3988
if other_revision_id is None:
4554
3989
other_revision_id = _mod_revision.ensure_null(
4555
3990
other_branch.last_revision())
4556
# Remember where we merge from. We need to remember if:
4557
# - user specify a location (and we don't merge from the parent
4559
# - user ask to remember or there is no previous location set to merge
4560
# from and user didn't ask to *not* remember
4561
if (user_location is not None
4563
or (remember is None
4564
and tree.branch.get_submit_branch() is None)))):
3991
# Remember where we merge from
3992
if ((remember or tree.branch.get_submit_branch() is None) and
3993
user_location is not None):
4565
3994
tree.branch.set_submit_branch(other_branch.base)
4566
# Merge tags (but don't set them in the master branch yet, the user
4567
# might revert this merge). Commit will propagate them.
4568
other_branch.tags.merge_to(tree.branch.tags, ignore_master=True)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4569
3996
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4570
3997
other_revision_id, base_revision_id, other_branch, base_branch)
4571
3998
if other_path != '':
4735
4162
class cmd_revert(Command):
4737
Set files in the working tree back to the contents of a previous revision.
4163
__doc__ = """Revert files to a previous revision.
4739
4165
Giving a list of files will revert only those files. Otherwise, all files
4740
4166
will be reverted. If the revision is not specified with '--revision', the
4741
working tree basis revision is used. A revert operation affects only the
4742
working tree, not any revision history like the branch and repository or
4743
the working tree basis revision.
4167
last committed revision is used.
4745
4169
To remove only some changes, without reverting to a prior version, use
4746
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4747
will remove the changes introduced by the second last commit (-2), without
4748
affecting the changes introduced by the last commit (-1). To remove
4749
certain changes on a hunk-by-hunk basis, see the shelve command.
4750
To update the branch to a specific revision or the latest revision and
4751
update the working tree accordingly while preserving local changes, see the
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.
4754
Uncommitted changes to files that are reverted will be discarded.
4755
Howver, by default, any files that have been manually changed will be
4756
backed up first. (Files changed only by merge are not backed up.) Backup
4757
files have '.~#~' appended to their name, where # is a number.
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.
4759
4178
When you provide files, you can use their current pathname or the pathname
4760
4179
from the target revision. So you can use revert to "undelete" a file by
5009
4419
if remote_extra and not mine_only:
5010
4420
if printed_local is True:
5011
4421
message("\n\n\n")
5012
message(ngettext("You are missing %d revision:\n",
5013
"You are missing %d revisions:\n",
5014
len(remote_extra)) %
4422
message("You are missing %d revision(s):\n" %
5015
4423
len(remote_extra))
5016
if remote_branch.supports_tags():
5017
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
5018
4424
for revision in iter_log_revisions(remote_extra,
5019
4425
remote_branch.repository,
5022
4427
lf.log_revision(revision)
5023
4428
status_code = 1
5025
4430
if mine_only and not local_extra:
5026
4431
# We checked local, and found nothing extra
5027
message(gettext('This branch has no new revisions.\n'))
4432
message('This branch is up to date.\n')
5028
4433
elif theirs_only and not remote_extra:
5029
4434
# We checked remote, and found nothing extra
5030
message(gettext('Other branch has no new revisions.\n'))
4435
message('Other branch is up to date.\n')
5031
4436
elif not (mine_only or theirs_only or local_extra or
5033
4438
# We checked both branches, and neither one had extra
5035
message(gettext("Branches are up to date.\n"))
4440
message("Branches are up to date.\n")
5036
4441
self.cleanup_now()
5037
4442
if not status_code and parent is None and other_branch is not None:
5038
self.add_cleanup(local_branch.lock_write().unlock)
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
5039
4445
# handle race conditions - a parent might be set while we run.
5040
4446
if local_branch.get_parent() is None:
5041
4447
local_branch.set_parent(remote_branch.base)
5156
4578
Option('long', help='Show commit date in annotations.'),
5161
4582
encoding_type = 'exact'
5163
4584
@display_command
5164
4585
def run(self, filename, all=False, long=False, revision=None,
5165
show_ids=False, directory=None):
5166
from .annotate import (
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5169
4588
wt, branch, relpath = \
5170
_open_directory_or_containing_tree_or_branch(filename, directory)
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5171
4590
if wt is not None:
5172
self.add_cleanup(wt.lock_read().unlock)
4592
self.add_cleanup(wt.unlock)
5174
self.add_cleanup(branch.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5175
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
5176
self.add_cleanup(tree.lock_read().unlock)
5177
if wt is not None and revision is None:
4598
self.add_cleanup(tree.unlock)
5178
4600
file_id = wt.path2id(relpath)
5180
4602
file_id = tree.path2id(relpath)
5181
4603
if file_id is None:
5182
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
5183
4606
if wt is not None and revision is None:
5184
4607
# If there is a tree and we're not annotating historical
5185
4608
# versions, annotate the working tree's content.
5186
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
5187
4610
show_ids=show_ids)
5189
annotate_file_tree(tree, file_id, self.outf, long, all,
5190
show_ids=show_ids, branch=branch)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5193
4616
class cmd_re_sign(Command):
5197
4620
hidden = True # is this right ?
5198
4621
takes_args = ['revision_id*']
5199
takes_options = ['directory', 'revision']
4622
takes_options = ['revision']
5201
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4624
def run(self, revision_id_list=None, revision=None):
5202
4625
if revision_id_list is not None and revision is not None:
5203
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5204
4627
if revision_id_list is None and revision is None:
5205
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5206
b = WorkingTree.open_containing(directory)[0].branch
5207
self.add_cleanup(b.lock_write().unlock)
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
5208
4632
return self._run(b, revision_id_list, revision)
5210
4634
def _run(self, b, revision_id_list, revision):
5212
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4635
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5213
4637
if revision_id_list is not None:
5214
4638
b.repository.start_write_group()
5270
4694
_see_also = ['checkouts', 'unbind']
5271
4695
takes_args = ['location?']
5272
takes_options = ['directory']
5274
def run(self, location=None, directory=u'.'):
5275
b, relpath = Branch.open_containing(directory)
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5276
4700
if location is None:
5278
4702
location = b.get_old_bound_location()
5279
4703
except errors.UpgradeRequired:
5280
raise errors.BzrCommandError(gettext('No location supplied. '
5281
'This format does not remember old locations.'))
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5283
4707
if location is None:
5284
4708
if b.get_bound_location() is not None:
5285
raise errors.BzrCommandError(
5286
gettext('Branch is already bound'))
4709
raise errors.BzrCommandError('Branch is already bound')
5288
raise errors.BzrCommandError(
5289
gettext('No location supplied'
5290
' and no previous location known'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5291
4713
b_other = Branch.open(location)
5293
4715
b.bind(b_other)
5294
4716
except errors.DivergedBranches:
5295
raise errors.BzrCommandError(gettext('These branches have diverged.'
5296
' Try merging, and then bind again.'))
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5297
4719
if b.get_config().has_explicit_nickname():
5298
4720
b.nick = b_other.nick
5363
4784
b = control.open_branch()
5365
4786
if tree is not None:
5366
self.add_cleanup(tree.lock_write().unlock)
4788
self.add_cleanup(tree.unlock)
5368
self.add_cleanup(b.lock_write().unlock)
5369
return self._run(b, tree, dry_run, verbose, revision, force,
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5372
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5374
from .log import log_formatter, show_log
5375
from .uncommit import uncommit
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
5377
4798
last_revno, last_rev_id = b.last_revision_info()
5406
4827
end_revision=last_revno)
5409
self.outf.write(gettext('Dry-run, pretending to remove'
5410
' the above revisions.\n'))
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5412
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5415
if not ui.ui_factory.confirm_action(
5416
gettext(u'Uncommit these revisions'),
5417
'breezy.builtins.uncommit',
5419
self.outf.write(gettext('Canceled\n'))
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5422
4840
mutter('Uncommitting from {%s} to {%s}',
5423
4841
last_rev_id, rev_id)
5424
4842
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5425
revno=revno, local=local, keep_tags=keep_tags)
5426
self.outf.write(gettext('You can restore the old tip by running:\n'
5427
' brz pull . -r revid:%s\n') % last_rev_id)
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)
5430
4848
class cmd_break_lock(Command):
5431
__doc__ = """Break a dead lock.
5433
This command breaks a lock on a repository, branch, working directory or
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5436
4851
CAUTION: Locks should only be broken when you are sure that the process
5437
4852
holding the lock has been stopped.
5439
You can get information on what locks are open via the 'brz info
4854
You can get information on what locks are open via the 'bzr info
5440
4855
[location]' command.
5444
brz break-lock brz+ssh://example.com/brz/foo
5445
brz break-lock --conf ~/.bazaar
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
5448
4861
takes_args = ['location?']
5451
help='LOCATION is the directory where the config lock is.'),
5453
help='Do not ask for confirmation before breaking the lock.'),
5456
def run(self, location=None, config=False, force=False):
4863
def run(self, location=None, show=False):
5457
4864
if location is None:
5458
4865
location = u'.'
5460
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5462
{'breezy.lockdir.break': True})
5464
conf = _mod_config.LockableConfig(file_name=location)
5467
control, relpath = controldir.ControlDir.open_containing(location)
5469
control.break_lock()
5470
except NotImplementedError:
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5474
4873
class cmd_wait_until_signalled(Command):
5475
__doc__ = """Test helper for test_start_and_stop_brz_subprocess_send_signal.
4874
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5477
4876
This just prints a line to signal when it is ready, then blocks on stdin.
5495
4894
help='Serve on stdin/out for use from inetd or sshd.'),
5496
4895
RegistryOption('protocol',
5497
4896
help="Protocol to serve.",
5498
lazy_registry=('breezy.transport', 'transport_server_registry'),
4897
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5499
4898
value_switches=True),
5501
help='Listen for connections on nominated address.', type=str),
5503
help='Listen for connections on nominated port. Passing 0 as '
5504
'the port number will result in a dynamically allocated '
5505
'port. The default port depends on the protocol.',
5507
custom_help('directory',
5508
help='Serve contents of this directory.'),
4900
help='Listen for connections on nominated port of the form '
4901
'[hostname:]portnumber. Passing 0 as the port number will '
4902
'result in a dynamically allocated port. The default port '
4903
'depends on the protocol.',
4906
help='Serve contents of this directory.',
5509
4908
Option('allow-writes',
5510
4909
help='By default the server is a readonly server. Supplying '
5511
4910
'--allow-writes enables write access to the contents of '
5512
'the served directory and below. Note that ``brz serve`` '
4911
'the served directory and below. Note that ``bzr serve`` '
5513
4912
'does not perform authentication, so unless some form of '
5514
4913
'external authentication is arranged supplying this '
5515
4914
'option leads to global uncontrolled write access to your '
5518
Option('client-timeout', type=float,
5519
help='Override the default idle client timeout (5min).'),
5522
def run(self, listen=None, port=None, inet=False, directory=None,
5523
allow_writes=False, protocol=None, client_timeout=None):
5524
from . import transport
4919
def get_host_and_port(self, port):
4920
"""Return the host and port to run the smart server on.
4922
If 'port' is None, None will be returned for the host and port.
4924
If 'port' has a colon in it, the string before the colon will be
4925
interpreted as the host.
4927
:param port: A string of the port to run the server on.
4928
:return: A tuple of (host, port), where 'host' is a host name or IP,
4929
and port is an integer TCP/IP port.
4932
if port is not None:
4934
host, port = port.split(':')
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5525
4941
if directory is None:
5526
directory = osutils.getcwd()
4942
directory = os.getcwd()
5527
4943
if protocol is None:
5528
protocol = transport.transport_server_registry.get()
5529
url = transport.location_to_url(directory)
4944
protocol = transport_server_registry.get()
4945
host, port = self.get_host_and_port(port)
4946
url = urlutils.local_path_to_url(directory)
5530
4947
if not allow_writes:
5531
4948
url = 'readonly+' + url
5532
t = transport.get_transport_from_url(url)
5533
protocol(t, listen, port, inet, client_timeout)
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5536
4953
class cmd_join(Command):
5559
4976
containing_tree = WorkingTree.open_containing(parent_dir)[0]
5560
4977
repo = containing_tree.branch.repository
5561
4978
if not repo.supports_rich_root():
5562
raise errors.BzrCommandError(gettext(
4979
raise errors.BzrCommandError(
5563
4980
"Can't join trees because %s doesn't support rich root data.\n"
5564
"You can use brz upgrade on the repository.")
4981
"You can use bzr upgrade on the repository."
5568
4985
containing_tree.add_reference(sub_tree)
5569
except errors.BadReferenceTarget as e:
4986
except errors.BadReferenceTarget, e:
5570
4987
# XXX: Would be better to just raise a nicely printable
5571
4988
# exception from the real origin. Also below. mbp 20070306
5572
raise errors.BzrCommandError(
5573
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4989
raise errors.BzrCommandError("Cannot join %s. %s" %
5576
4993
containing_tree.subsume(sub_tree)
5577
except errors.BadSubsumeSource as e:
5578
raise errors.BzrCommandError(
5579
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4994
except errors.BadSubsumeSource, e:
4995
raise errors.BzrCommandError("Cannot join %s. %s" %
5582
4999
class cmd_split(Command):
5800
5208
help='Branch to generate the submission from, '
5801
5209
'rather than the one containing the working directory.',
5802
5210
short_name='f',
5804
5212
Option('output', short_name='o',
5805
5213
help='Write merge directive to this file or directory; '
5806
5214
'use - for stdout.',
5808
5216
Option('strict',
5809
5217
help='Refuse to send if there are uncommitted changes in'
5810
5218
' the working tree, --no-strict disables the check.'),
5811
5219
Option('mail-to', help='Mail the request to this address.',
5815
Option('body', help='Body for the email.', type=text_type),
5223
Option('body', help='Body for the email.', type=unicode),
5816
5224
RegistryOption('format',
5817
5225
help='Use the specified output format.',
5818
lazy_registry=('breezy.send', 'format_registry')),
5226
lazy_registry=('bzrlib.send', 'format_registry')),
5821
5229
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5822
no_patch=False, revision=None, remember=None, output=None,
5230
no_patch=False, revision=None, remember=False, output=None,
5823
5231
format=None, mail_to=None, message=None, body=None,
5824
5232
strict=None, **kwargs):
5825
from .send import send
5233
from bzrlib.send import send
5826
5234
return send(submit_branch, revision, public_branch, remember,
5827
5235
format, no_bundle, no_patch, output,
5828
5236
kwargs.get('from', '.'), mail_to, message, body,
5948
5359
branch, relpath = Branch.open_containing(directory)
5949
self.add_cleanup(branch.lock_write().unlock)
5361
self.add_cleanup(branch.unlock)
5951
5363
if tag_name is None:
5952
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5364
raise errors.BzrCommandError("No tag specified to delete.")
5953
5365
branch.tags.delete_tag(tag_name)
5954
note(gettext('Deleted tag %s.') % tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5957
5369
if len(revision) != 1:
5958
raise errors.BzrCommandError(gettext(
5370
raise errors.BzrCommandError(
5959
5371
"Tags can only be placed on a single revision, "
5961
5373
revision_id = revision[0].as_revision_id(branch)
5963
5375
revision_id = branch.last_revision()
5964
5376
if tag_name is None:
5965
5377
tag_name = branch.automatic_tag_name(revision_id)
5966
5378
if tag_name is None:
5967
raise errors.BzrCommandError(gettext(
5968
"Please specify a tag name."))
5970
existing_target = branch.tags.lookup_tag(tag_name)
5971
except errors.NoSuchTag:
5972
existing_target = None
5973
if not force and existing_target not in (None, revision_id):
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5974
5382
raise errors.TagAlreadyExists(tag_name)
5975
if existing_target == revision_id:
5976
note(gettext('Tag %s already exists for that revision.') % tag_name)
5978
branch.tags.set_tag(tag_name, revision_id)
5979
if existing_target is None:
5980
note(gettext('Created tag %s.') % tag_name)
5982
note(gettext('Updated tag %s.') % tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5985
5387
class cmd_tags(Command):
5991
5393
_see_also = ['tag']
5992
5394
takes_options = [
5993
custom_help('directory',
5994
help='Branch whose tags should be displayed.'),
5995
RegistryOption('sort',
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5996
5401
'Sort tags by different criteria.', title='Sorting',
5997
lazy_registry=('breezy.tag', 'tag_sort_methods')
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
6003
5409
@display_command
6004
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6005
from .tag import tag_sort_methods
6006
5416
branch, relpath = Branch.open_containing(directory)
6008
tags = list(viewitems(branch.tags.get_tag_dict()))
5418
tags = branch.tags.get_tag_dict().items()
6012
self.add_cleanup(branch.lock_read().unlock)
5423
self.add_cleanup(branch.unlock)
6014
# Restrict to the specified range
6015
tags = self._tags_for_range(branch, revision)
6017
sort = tag_sort_methods.get()
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]])
6019
5444
if not show_ids:
6020
5445
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
6021
5446
for index, (tag, revid) in enumerate(tags):
6034
5457
for tag, revspec in tags:
6035
5458
self.outf.write('%-20s %s\n' % (tag, revspec))
6037
def _tags_for_range(self, branch, revision):
6039
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6040
revid1, revid2 = rev1.rev_id, rev2.rev_id
6041
# _get_revision_range will always set revid2 if it's not specified.
6042
# If revid1 is None, it means we want to start from the branch
6043
# origin which is always a valid ancestor. If revid1 == revid2, the
6044
# ancestry check is useless.
6045
if revid1 and revid1 != revid2:
6046
# FIXME: We really want to use the same graph than
6047
# branch.iter_merge_sorted_revisions below, but this is not
6048
# easily available -- vila 2011-09-23
6049
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6050
# We don't want to output anything in this case...
6052
# only show revisions between revid1 and revid2 (inclusive)
6053
tagged_revids = branch.tags.get_reverse_tag_dict()
6055
for r in branch.iter_merge_sorted_revisions(
6056
start_revision_id=revid2, stop_revision_id=revid1,
6057
stop_rule='include'):
6058
revid_tags = tagged_revids.get(r[0], None)
6060
found.extend([(tag, r[0]) for tag in revid_tags])
6064
5461
class cmd_reconfigure(Command):
6065
__doc__ = """Reconfigure the type of a brz directory.
5462
__doc__ = """Reconfigure the type of a bzr directory.
6067
5464
A target configuration must be specified.
6079
5476
takes_args = ['location?']
6080
5477
takes_options = [
6081
5478
RegistryOption.from_kwargs(
6084
help='The relation between branch and tree.',
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6085
5482
value_switches=True, enum_switch=False,
6086
5483
branch='Reconfigure to be an unbound branch with no working tree.',
6087
5484
tree='Reconfigure to be an unbound branch with a working tree.',
6088
5485
checkout='Reconfigure to be a bound branch with a working tree.',
6089
5486
lightweight_checkout='Reconfigure to be a lightweight'
6090
5487
' checkout (with no local history).',
6092
RegistryOption.from_kwargs(
6094
title='Repository type',
6095
help='Location fo the repository.',
6096
value_switches=True, enum_switch=False,
6097
5488
standalone='Reconfigure to be a standalone branch '
6098
5489
'(i.e. stop using shared repository).',
6099
5490
use_shared='Reconfigure to use a shared repository.',
6101
RegistryOption.from_kwargs(
6103
title='Trees in Repository',
6104
help='Whether new branches in the repository have trees.',
6105
value_switches=True, enum_switch=False,
6106
5491
with_trees='Reconfigure repository to create '
6107
5492
'working trees on branches by default.',
6108
5493
with_no_trees='Reconfigure repository to not create '
6135
5520
# At the moment you can use --stacked-on and a different
6136
5521
# reconfiguration shape at the same time; there seems no good reason
6138
if (tree_type is None and
6139
repository_type is None and
6140
repository_trees is None):
5523
if target_type is None:
6141
5524
if stacked_on or unstacked:
6144
raise errors.BzrCommandError(gettext('No target configuration '
6146
reconfiguration = None
6147
if tree_type == 'branch':
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6148
5530
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
6149
elif tree_type == 'tree':
5531
elif target_type == 'tree':
6150
5532
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
6151
elif tree_type == 'checkout':
5533
elif target_type == 'checkout':
6152
5534
reconfiguration = reconfigure.Reconfigure.to_checkout(
6153
5535
directory, bind_to)
6154
elif tree_type == 'lightweight-checkout':
5536
elif target_type == 'lightweight-checkout':
6155
5537
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
6156
5538
directory, bind_to)
6158
reconfiguration.apply(force)
6159
reconfiguration = None
6160
if repository_type == 'use-shared':
5539
elif target_type == 'use-shared':
6161
5540
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
6162
elif repository_type == 'standalone':
5541
elif target_type == 'standalone':
6163
5542
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
6165
reconfiguration.apply(force)
6166
reconfiguration = None
6167
if repository_trees == 'with-trees':
5543
elif target_type == 'with-trees':
6168
5544
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
6169
5545
directory, True)
6170
elif repository_trees == 'with-no-trees':
5546
elif target_type == 'with-no-trees':
6171
5547
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
6172
5548
directory, False)
6174
reconfiguration.apply(force)
6175
reconfiguration = None
5549
reconfiguration.apply(force)
6178
5552
class cmd_switch(Command):
6201
5575
takes_args = ['to_location?']
6202
takes_options = ['directory',
5576
takes_options = [Option('force',
6204
5577
help='Switch even if local commits will be lost.'),
6206
5579
Option('create-branch', short_name='b',
6207
5580
help='Create the target branch from this one before'
6208
5581
' switching to it.'),
6210
help='Store and restore uncommitted changes in the'
6214
5584
def run(self, to_location=None, force=False, create_branch=False,
6215
revision=None, directory=u'.', store=False):
6216
from . import switch
6217
tree_location = directory
5586
from bzrlib import switch
6218
5588
revision = _get_one_revision('switch', revision)
6219
possible_transports = []
6220
control_dir = controldir.ControlDir.open_containing(tree_location,
6221
possible_transports=possible_transports)[0]
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6222
5590
if to_location is None:
6223
5591
if revision is None:
6224
raise errors.BzrCommandError(gettext('You must supply either a'
6225
' revision or a location'))
6226
to_location = tree_location
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6228
branch = control_dir.open_branch(
6229
possible_transports=possible_transports)
5596
branch = control_dir.open_branch()
6230
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
6231
5598
except errors.NotBranchError:
6233
5600
had_explicit_nick = False
6234
5601
if create_branch:
6235
5602
if branch is None:
6236
raise errors.BzrCommandError(
6237
gettext('cannot create branch without source branch'))
6238
to_location = lookup_new_sibling_branch(control_dir, to_location,
6239
possible_transports=possible_transports)
6240
to_branch = branch.controldir.sprout(to_location,
6241
possible_transports=possible_transports,
6242
source_branch=branch).open_branch()
5603
raise errors.BzrCommandError('cannot create branch without'
5605
to_location = directory_service.directories.dereference(
5607
if '/' not in to_location and '\\' not in to_location:
5608
# This path is meant to be relative to the existing branch
5609
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
5611
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
6245
to_branch = Branch.open(to_location,
6246
possible_transports=possible_transports)
5616
to_branch = Branch.open(to_location)
6247
5617
except errors.NotBranchError:
6248
to_branch = open_sibling_branch(control_dir, to_location,
6249
possible_transports=possible_transports)
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
6250
5621
if revision is not None:
6251
5622
revision = revision.as_revision_id(to_branch)
6252
switch.switch(control_dir, to_branch, force, revision_id=revision,
6253
store_uncommitted=store)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
6254
5624
if had_explicit_nick:
6255
5625
branch = control_dir.open_branch() #get the new branch!
6256
5626
branch.nick = to_branch.nick
6257
note(gettext('Switched to branch: %s'),
5627
note('Switched to branch: %s',
6258
5628
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
def _get_branch_location(self, control_dir):
5631
"""Return location of branch for this control dir."""
5633
this_branch = control_dir.open_branch()
5634
# This may be a heavy checkout, where we want the master branch
5635
master_location = this_branch.get_bound_location()
5636
if master_location is not None:
5637
return master_location
5638
# If not, use a local sibling
5639
return this_branch.base
5640
except errors.NotBranchError:
5641
format = control_dir.find_branch_format()
5642
if getattr(format, 'get_reference', None) is not None:
5643
return format.get_reference(control_dir)
5645
return control_dir.root_transport.base
6262
5648
class cmd_view(Command):
6349
tree, file_list = WorkingTree.open_containing_paths(file_list,
5735
tree, file_list = tree_files(file_list, apply_view=False)
6351
5736
current_view, view_dict = tree.views.get_view_info()
6352
5737
if name is None:
6353
5738
name = current_view
6356
raise errors.BzrCommandError(gettext(
6357
"Both --delete and a file list specified"))
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6359
raise errors.BzrCommandError(gettext(
6360
"Both --delete and --switch specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6362
5747
tree.views.set_view_info(None, {})
6363
self.outf.write(gettext("Deleted all views.\n"))
5748
self.outf.write("Deleted all views.\n")
6364
5749
elif name is None:
6365
raise errors.BzrCommandError(gettext("No current view to delete"))
5750
raise errors.BzrCommandError("No current view to delete")
6367
5752
tree.views.delete_view(name)
6368
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6371
raise errors.BzrCommandError(gettext(
6372
"Both --switch and a file list specified"))
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6374
raise errors.BzrCommandError(gettext(
6375
"Both --switch and --all specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6376
5761
elif switch == 'off':
6377
5762
if current_view is None:
6378
raise errors.BzrCommandError(gettext("No current view to disable"))
5763
raise errors.BzrCommandError("No current view to disable")
6379
5764
tree.views.set_view_info(None, view_dict)
6380
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6382
5767
tree.views.set_view_info(switch, view_dict)
6383
5768
view_str = views.view_display_str(tree.views.lookup_view())
6384
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6387
self.outf.write(gettext('Views defined:\n'))
5772
self.outf.write('Views defined:\n')
6388
5773
for view in sorted(view_dict):
6389
5774
if view == current_view:
6393
5778
view_str = views.view_display_str(view_dict[view])
6394
5779
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
6396
self.outf.write(gettext('No views defined.\n'))
5781
self.outf.write('No views defined.\n')
6397
5782
elif file_list:
6398
5783
if name is None:
6399
5784
# No name given and no current view set
6401
5786
elif name == 'off':
6402
raise errors.BzrCommandError(gettext(
6403
"Cannot change the 'off' pseudo view"))
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6404
5789
tree.views.set_view(name, sorted(file_list))
6405
5790
view_str = views.view_display_str(tree.views.lookup_view())
6406
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6408
5793
# list the files
6409
5794
if name is None:
6410
5795
# No name given and no current view set
6411
self.outf.write(gettext('No current view.\n'))
5796
self.outf.write('No current view.\n')
6413
5798
view_str = views.view_display_str(tree.views.lookup_view(name))
6414
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6417
5802
class cmd_hooks(Command):
6445
5830
Remove the branch at repo/trunk::
6447
brz remove-branch repo/trunk
5832
bzr remove-branch repo/trunk
6451
5836
takes_args = ["location?"]
6453
takes_options = ['directory',
6454
Option('force', help='Remove branch even if it is the active branch.')]
6456
5838
aliases = ["rmbranch"]
6458
def run(self, directory=None, location=None, force=False):
6459
br = open_nearby_branch(near=directory, location=location)
6460
if not force and br.controldir.has_workingtree():
6462
active_branch = br.controldir.open_branch(name="")
6463
except errors.NotBranchError:
6464
active_branch = None
6465
if (active_branch is not None and
6466
br.control_url == active_branch.control_url):
6467
raise errors.BzrCommandError(
6468
gettext("Branch is active. Use --force to remove it."))
6469
br.controldir.destroy_branch(br.name)
5840
def run(self, location=None):
5841
if location is None:
5843
branch = Branch.open_containing(location)[0]
5844
branch.bzrdir.destroy_branch()
6472
5847
class cmd_shelve(Command):
6473
5848
__doc__ = """Temporarily set aside some changes from the current tree.
6493
5868
You can put multiple items on the shelf, and by default, 'unshelve' will
6494
5869
restore the most recently shelved changes.
6496
For complicated changes, it is possible to edit the changes in a separate
6497
editor program to decide what the file remaining in the working copy
6498
should look like. To do this, add the configuration option
6500
change_editor = PROGRAM @new_path @old_path
6502
where @new_path is replaced with the path of the new version of the
6503
file and @old_path is replaced with the path of the old version of
6504
the file. The PROGRAM should save the new file with the desired
6505
contents of the file in the working tree.
6509
5872
takes_args = ['file*']
6511
5874
takes_options = [
6514
5876
Option('all', help='Shelve all changes.'),
6516
5878
RegistryOption('writer', 'Method to use for writing diffs.',
6517
breezy.option.diff_writer_registry,
5879
bzrlib.option.diff_writer_registry,
6518
5880
value_switches=True, enum_switch=False),
6520
5882
Option('list', help='List shelved changes.'),
6521
5883
Option('destroy',
6522
5884
help='Destroy removed changes instead of shelving them.'),
6524
_see_also = ['unshelve', 'configuration']
5886
_see_also = ['unshelve']
6526
5888
def run(self, revision=None, all=False, file_list=None, message=None,
6527
writer=None, list=False, destroy=False, directory=None):
5889
writer=None, list=False, destroy=False):
6529
return self.run_for_list(directory=directory)
6530
from .shelf_ui import Shelver
5891
return self.run_for_list()
5892
from bzrlib.shelf_ui import Shelver
6531
5893
if writer is None:
6532
writer = breezy.option.diff_writer_registry.get()
5894
writer = bzrlib.option.diff_writer_registry.get()
6534
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
6535
file_list, message, destroy=destroy, directory=directory)
5897
file_list, message, destroy=destroy)
6607
5967
To check what clean-tree will do, use --dry-run.
6609
takes_options = ['directory',
6610
Option('ignored', help='Delete all ignored files.'),
6611
Option('detritus', help='Delete conflict files, merge and revert'
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5970
Option('detritus', help='Delete conflict files, merge'
6612
5971
' backups, and failed selftest dirs.'),
6613
5972
Option('unknown',
6614
help='Delete files unknown to brz (default).'),
5973
help='Delete files unknown to bzr (default).'),
6615
5974
Option('dry-run', help='Show files to delete instead of'
6616
5975
' deleting them.'),
6617
5976
Option('force', help='Do not prompt before deleting.')]
6618
5977
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6619
force=False, directory=u'.'):
6620
from .clean_tree import clean_tree
5979
from bzrlib.clean_tree import clean_tree
6621
5980
if not (unknown or ignored or detritus):
6625
clean_tree(directory, unknown=unknown, ignored=ignored,
6626
detritus=detritus, dry_run=dry_run, no_prompt=force)
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6629
5988
class cmd_reference(Command):
6673
6032
self.outf.write('%s %s\n' % (path, location))
6676
class cmd_export_pot(Command):
6677
__doc__ = """Export command helps and error messages in po format."""
6680
takes_options = [Option('plugin',
6681
help='Export help text from named command '\
6682
'(defaults to all built in commands).',
6684
Option('include-duplicates',
6685
help='Output multiple copies of the same msgid '
6686
'string if it appears more than once.'),
6689
def run(self, plugin=None, include_duplicates=False):
6690
from .export_pot import export_pot
6691
export_pot(self.outf, plugin, include_duplicates)
6694
class cmd_import(Command):
6695
__doc__ = """Import sources from a directory, tarball or zip file
6697
This command will import a directory, tarball or zip file into a bzr
6698
tree, replacing any versioned files already present. If a directory is
6699
specified, it is used as the target. If the directory does not exist, or
6700
is not versioned, it is created.
6702
Tarballs may be gzip or bzip2 compressed. This is autodetected.
6704
If the tarball or zip has a single root directory, that directory is
6705
stripped when extracting the tarball. This is not done for directories.
6708
takes_args = ['source', 'tree?']
6710
def run(self, source, tree=None):
6711
from .upstream_import import do_import
6712
do_import(source, tree)
6715
class cmd_fetch_ghosts(Command):
6716
__doc__ = """Attempt to retrieve ghosts from another branch.
6718
If the other branch is not supplied, the last-pulled branch is used.
6722
aliases = ['fetch-missing']
6723
takes_args = ['branch?']
6724
takes_options = [Option('no-fix', help="Skip additional synchonization.")]
6726
def run(self, branch=None, no_fix=False):
6727
from .fetch_ghosts import GhostFetcher
6728
installed, failed = GhostFetcher.from_cmdline(branch).run()
6729
if len(installed) > 0:
6730
self.outf.write("Installed:\n")
6731
for rev in installed:
6732
self.outf.write(rev + "\n")
6734
self.outf.write("Still missing:\n")
6736
self.outf.write(rev + "\n")
6737
if not no_fix and len(installed) > 0:
6738
cmd_reconcile().run(".")
6741
6035
def _register_lazy_builtins():
6742
6036
# register lazy builtins from other modules; called at startup and should
6743
6037
# be only called once.
6744
6038
for (name, aliases, module_name) in [
6745
('cmd_bisect', [], 'breezy.bisect'),
6746
('cmd_bundle_info', [], 'breezy.bundle.commands'),
6747
('cmd_config', [], 'breezy.config'),
6748
('cmd_dpush', [], 'breezy.foreign'),
6749
('cmd_version_info', [], 'breezy.cmd_version_info'),
6750
('cmd_resolve', ['resolved'], 'breezy.conflicts'),
6751
('cmd_conflicts', [], 'breezy.conflicts'),
6752
('cmd_ping', [], 'breezy.smart.ping'),
6753
('cmd_sign_my_commits', [], 'breezy.commit_signature_commands'),
6754
('cmd_verify_signatures', [], 'breezy.commit_signature_commands'),
6755
('cmd_test_script', [], 'breezy.cmd_test_script'),
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'),
6757
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
