55
from bzrlib.branch import Branch
56
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
from bzrlib.smtp_connection import SMTPConnection
60
from bzrlib.workingtree import WorkingTree
60
from breezy.branch import Branch
61
from breezy.conflicts import ConflictList
62
from breezy.transport import memory
63
from breezy.revisionspec import RevisionSpec, RevisionInfo
64
from breezy.smtp_connection import SMTPConnection
65
from breezy.workingtree import WorkingTree
66
from breezy.i18n import gettext, ngettext
63
from bzrlib.commands import (
69
from .commands import (
65
71
builtin_command_registry,
68
from bzrlib.option import (
73
79
_parse_revision_str,
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
87
from .trace import mutter, note, warning, is_quiet, get_verbosity_level
90
def _get_branch_location(control_dir, possible_transports=None):
91
"""Return location of branch for this control dir."""
93
target = control_dir.get_branch_reference()
94
except errors.NotBranchError:
95
return control_dir.root_transport.base
96
if target is not None:
98
this_branch = control_dir.open_branch(
99
possible_transports=possible_transports)
100
# This may be a heavy checkout, where we want the master branch
101
master_location = this_branch.get_bound_location()
102
if master_location is not None:
103
return master_location
104
# If not, use a local sibling
105
return this_branch.base
108
def _is_colocated(control_dir, possible_transports=None):
109
"""Check if the branch in control_dir is colocated.
111
:param control_dir: Control directory
112
:return: Tuple with boolean indicating whether the branch is colocated
113
and the full URL to the actual branch
115
# This path is meant to be relative to the existing branch
116
this_url = _get_branch_location(control_dir,
117
possible_transports=possible_transports)
118
# Perhaps the target control dir supports colocated branches?
120
root = controldir.ControlDir.open(this_url,
121
possible_transports=possible_transports)
122
except errors.NotBranchError:
123
return (False, this_url)
126
wt = control_dir.open_workingtree()
127
except (errors.NoWorkingTree, errors.NotLocalUrl):
128
return (False, this_url)
131
root._format.colocated_branches and
132
control_dir.control_url == root.control_url,
136
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
137
"""Lookup the location for a new sibling branch.
139
:param control_dir: Control directory to find sibling branches from
140
:param location: Name of the new branch
141
:return: Full location to the new branch
143
location = directory_service.directories.dereference(location)
144
if '/' not in location and '\\' not in location:
145
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
148
return urlutils.join_segment_parameters(this_url,
149
{"branch": urlutils.escape(location)})
151
return urlutils.join(this_url, '..', urlutils.escape(location))
155
def open_sibling_branch(control_dir, location, possible_transports=None):
156
"""Open a branch, possibly a sibling of another.
158
:param control_dir: Control directory relative to which to lookup the
160
:param location: Location to look up
161
:return: branch to open
164
# Perhaps it's a colocated branch?
165
return control_dir.open_branch(location,
166
possible_transports=possible_transports)
167
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
168
this_url = _get_branch_location(control_dir)
171
this_url, '..', urlutils.escape(location)))
174
def open_nearby_branch(near=None, location=None, possible_transports=None):
175
"""Open a nearby branch.
177
:param near: Optional location of container from which to open branch
178
:param location: Location of the branch
179
:return: Branch instance
185
return Branch.open(location,
186
possible_transports=possible_transports)
187
except errors.NotBranchError:
189
cdir = controldir.ControlDir.open(near,
190
possible_transports=possible_transports)
191
return open_sibling_branch(cdir, location,
192
possible_transports=possible_transports)
195
def iter_sibling_branches(control_dir, possible_transports=None):
196
"""Iterate over the siblings of a branch.
198
:param control_dir: Control directory for which to look up the siblings
199
:return: Iterator over tuples with branch name and branch object
203
reference = control_dir.get_branch_reference()
204
except errors.NotBranchError:
205
# There is no active branch, just return the colocated branches.
206
for name, branch in viewitems(control_dir.get_branches()):
209
if reference is not None:
210
ref_branch = Branch.open(reference,
211
possible_transports=possible_transports)
214
if ref_branch is None or ref_branch.name:
215
if ref_branch is not None:
216
control_dir = ref_branch.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("/")
88
227
def tree_files_for_add(file_list):
153
# XXX: Bad function name; should possibly also be a class method of
154
# WorkingTree rather than a function.
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
157
"""Convert command-line paths to a WorkingTree and relative paths.
159
This is typically used for command-line processors that take one or
160
more filenames, and infer the workingtree that contains them.
162
The filenames given are not required to exist.
164
:param file_list: Filenames to convert.
166
:param default_branch: Fallback tree path to use if file_list is empty or
169
:param apply_view: if True and a view is set, apply it or check that
170
specified files are within it
172
:return: workingtree, [relative_paths]
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
223
292
def _get_view_info_for_change_reporter(tree):
224
293
"""Get the view information from a tree for change reporting."""
364
443
def run(self, revision_id=None, revision=None, directory=u'.'):
365
444
if revision_id is not None and revision is not None:
366
raise errors.BzrCommandError('You can only supply one of'
367
' revision_id or --revision')
445
raise errors.BzrCommandError(gettext('You can only supply one of'
446
' revision_id or --revision'))
368
447
if revision_id is None and revision is None:
369
raise errors.BzrCommandError('You must supply either'
370
' --revision or a revision_id')
371
b = WorkingTree.open_containing(directory)[0].branch
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]
373
453
revisions = b.repository.revisions
374
454
if revisions is None:
375
raise errors.BzrCommandError('Repository %r does not support '
376
'access to raw revision texts')
455
raise errors.BzrCommandError(gettext('Repository %r does not support '
456
'access to raw revision texts'))
378
458
b.repository.lock_read()
380
460
# TODO: jam 20060112 should cat-revision always output utf-8?
381
461
if revision_id is not None:
382
revision_id = osutils.safe_revision_id(revision_id, warn=False)
462
revision_id = cache_utf8.encode(revision_id)
384
464
self.print_revision(revisions, revision_id)
385
465
except errors.NoSuchRevision:
386
msg = "The repository %s contains no revision %s." % (
466
msg = gettext("The repository {0} contains no revision {1}.").format(
387
467
b.repository.base, revision_id)
388
468
raise errors.BzrCommandError(msg)
389
469
elif revision is not None:
390
470
for rev in revision:
392
472
raise errors.BzrCommandError(
393
'You cannot specify a NULL revision.')
473
gettext('You cannot specify a NULL revision.'))
394
474
rev_id = rev.as_revision_id(b)
395
475
self.print_revision(revisions, rev_id)
499
582
location_list=['.']
501
584
for location in location_list:
502
d = bzrdir.BzrDir.open(location)
585
d = controldir.ControlDir.open(location)
505
588
working = d.open_workingtree()
506
589
except errors.NoWorkingTree:
507
raise errors.BzrCommandError("No working tree to remove")
590
raise errors.BzrCommandError(gettext("No working tree to remove"))
508
591
except errors.NotLocalUrl:
509
raise errors.BzrCommandError("You cannot remove the working tree"
592
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
593
" of a remote path"))
512
595
if (working.has_changes()):
513
596
raise errors.UncommittedChanges(working)
597
if working.get_shelf_manager().last_shelf() is not None:
598
raise errors.ShelvedChanges(working)
515
600
if working.user_url != working.branch.user_url:
516
raise errors.BzrCommandError("You cannot remove the working tree"
517
" from a lightweight checkout")
601
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
602
" from a lightweight checkout"))
519
604
d.destroy_workingtree()
607
class cmd_repair_workingtree(Command):
608
__doc__ = """Reset the working tree state file.
610
This is not meant to be used normally, but more as a way to recover from
611
filesystem corruption, etc. This rebuilds the working inventory back to a
612
'known good' state. Any new modifications (adding a file, renaming, etc)
613
will be lost, though modified files will still be detected as such.
615
Most users will want something more like "brz revert" or "brz update"
616
unless the state file has become corrupted.
618
By default this attempts to recover the current state by looking at the
619
headers of the state file. If the state file is too corrupted to even do
620
that, you can supply --revision to force the state of the tree.
623
takes_options = ['revision', 'directory',
625
help='Reset the tree even if it doesn\'t appear to be'
630
def run(self, revision=None, directory='.', force=False):
631
tree, _ = WorkingTree.open_containing(directory)
632
self.add_cleanup(tree.lock_tree_write().unlock)
636
except errors.BzrError:
637
pass # There seems to be a real error here, so we'll reset
640
raise errors.BzrCommandError(gettext(
641
'The tree does not appear to be corrupt. You probably'
642
' want "brz revert" instead. Use "--force" if you are'
643
' sure you want to reset the working tree.'))
647
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
649
tree.reset_state(revision_ids)
650
except errors.BzrError as e:
651
if revision_ids is None:
652
extra = (gettext(', the header appears corrupt, try passing -r -1'
653
' to set the state to the last commit'))
656
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
522
659
class cmd_revno(Command):
523
660
__doc__ = """Show current revision number.
528
665
_see_also = ['info']
529
666
takes_args = ['location?']
530
667
takes_options = [
531
Option('tree', help='Show revno of working tree'),
668
Option('tree', help='Show revno of working tree.'),
535
def run(self, tree=False, location=u'.'):
673
def run(self, tree=False, location=u'.', revision=None):
674
if revision is not None and tree:
675
raise errors.BzrCommandError(gettext("--tree and --revision can "
676
"not be used together"))
538
680
wt = WorkingTree.open_containing(location)[0]
539
681
self.add_cleanup(wt.lock_read().unlock)
540
682
except (errors.NoWorkingTree, errors.NotLocalUrl):
541
683
raise errors.NoWorkingTree(location)
542
685
revid = wt.last_revision()
544
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
545
except errors.NoSuchRevision:
547
revno = ".".join(str(n) for n in revno_t)
549
687
b = Branch.open_containing(location)[0]
550
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)
552
702
self.cleanup_now()
553
self.outf.write(str(revno) + '\n')
703
self.outf.write(revno + '\n')
556
706
class cmd_revision_info(Command):
826
1011
return self.run_auto(names_list, after, dry_run)
828
raise errors.BzrCommandError('--dry-run requires --auto.')
1013
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
829
1014
if names_list is None:
831
1016
if len(names_list) < 2:
832
raise errors.BzrCommandError("missing file argument")
833
tree, rel_names = tree_files(names_list, canonicalize=False)
1017
raise errors.BzrCommandError(gettext("missing file argument"))
1018
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1019
for file_name in rel_names[0:-1]:
1021
raise errors.BzrCommandError(gettext("can not move root of branch"))
834
1022
self.add_cleanup(tree.lock_tree_write().unlock)
835
1023
self._run(tree, names_list, rel_names, after)
837
1025
def run_auto(self, names_list, after, dry_run):
838
1026
if names_list is not None and len(names_list) > 1:
839
raise errors.BzrCommandError('Only one path may be specified to'
1027
raise errors.BzrCommandError(gettext('Only one path may be specified to'
842
raise errors.BzrCommandError('--after cannot be specified with'
844
work_tree, file_list = tree_files(names_list, default_branch='.')
1030
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1032
work_tree, file_list = WorkingTree.open_containing_paths(
1033
names_list, default_directory='.')
845
1034
self.add_cleanup(work_tree.lock_tree_write().unlock)
846
1035
rename_map.RenameMap.guess_renames(work_tree, dry_run)
1060
1273
considered diverged if the destination branch's most recent commit is one
1061
1274
that has not been merged (directly or indirectly) by the source branch.
1063
If branches have diverged, you can use 'bzr push --overwrite' to replace
1276
If branches have diverged, you can use 'brz push --overwrite' to replace
1064
1277
the other branch completely, discarding its unmerged changes.
1066
1279
If you want to ensure you have the different changes in the other branch,
1067
do a merge (see bzr help merge) from the other branch, and commit that.
1280
do a merge (see brz help merge) from the other branch, and commit that.
1068
1281
After that you will be able to do a push without '--overwrite'.
1070
If there is no default push location set, the first push will set it.
1071
After that, you can omit the location to use the default. To change the
1072
default, use --remember. The value will only be saved if the remote
1073
location can be accessed.
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>.
1076
1293
_see_also = ['pull', 'update', 'working-trees']
1093
1310
help='Create a stacked branch that refers to another branch '
1094
1311
'for the commit history. Only the work not present in the '
1095
1312
'referenced branch is included in the branch created.',
1097
1314
Option('strict',
1098
1315
help='Refuse to push if there are uncommitted changes in'
1099
1316
' the working tree, --no-strict disables the check.'),
1318
help="Don't populate the working tree, even for protocols"
1319
" that support it."),
1320
Option('overwrite-tags',
1321
help="Overwrite tags only."),
1101
1323
takes_args = ['location?']
1102
1324
encoding_type = 'replace'
1104
def run(self, location=None, remember=False, overwrite=False,
1326
def run(self, location=None, remember=None, overwrite=False,
1105
1327
create_prefix=False, verbose=False, revision=None,
1106
1328
use_existing_dir=False, directory=None, stacked_on=None,
1107
stacked=False, strict=None):
1108
from bzrlib.push import _show_push_branch
1329
stacked=False, strict=None, no_tree=False,
1330
overwrite_tags=False):
1331
from .push import _show_push_branch
1334
overwrite = ["history", "tags"]
1335
elif overwrite_tags:
1336
overwrite = ["tags"]
1110
1340
if directory is None:
1111
1341
directory = '.'
1112
1342
# Get the source branch
1113
1343
(tree, br_from,
1114
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1344
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1115
1345
# Get the tip's revision_id
1116
1346
revision = _get_one_revision('push', revision)
1117
1347
if revision is not None:
1138
1368
# error by the feedback given to them. RBC 20080227.
1139
1369
stacked_on = parent_url
1140
1370
if not stacked_on:
1141
raise errors.BzrCommandError(
1142
"Could not determine branch to refer to.")
1371
raise errors.BzrCommandError(gettext(
1372
"Could not determine branch to refer to."))
1144
1374
# Get the destination location
1145
1375
if location is None:
1146
1376
stored_loc = br_from.get_push_location()
1147
1377
if stored_loc is None:
1148
raise errors.BzrCommandError(
1149
"No push location known or specified.")
1378
parent_loc = br_from.get_parent()
1380
raise errors.BzrCommandError(gettext(
1381
"No push location known or specified. To push to the "
1382
"parent branch (at %s), use 'brz push :parent'." %
1383
urlutils.unescape_for_display(parent_loc,
1384
self.outf.encoding)))
1386
raise errors.BzrCommandError(gettext(
1387
"No push location known or specified."))
1151
1389
display_url = urlutils.unescape_for_display(stored_loc,
1152
1390
self.outf.encoding)
1153
self.outf.write("Using saved push location: %s\n" % display_url)
1391
note(gettext("Using saved push location: %s") % display_url)
1154
1392
location = stored_loc
1156
1394
_show_push_branch(br_from, revision_id, location, self.outf,
1157
1395
verbose=verbose, overwrite=overwrite, remember=remember,
1158
1396
stacked_on=stacked_on, create_prefix=create_prefix,
1159
use_existing_dir=use_existing_dir)
1397
use_existing_dir=use_existing_dir, no_tree=no_tree)
1162
1400
class cmd_branch(Command):
1201
1443
def run(self, from_location, to_location=None, revision=None,
1202
1444
hardlink=False, stacked=False, standalone=False, no_tree=False,
1203
use_existing_dir=False, switch=False, bind=False):
1204
from bzrlib import switch as _mod_switch
1205
from bzrlib.tag import _merge_tags_if_possible
1206
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1445
use_existing_dir=False, switch=False, bind=False,
1447
from breezy import switch as _mod_switch
1448
if self.invoked_as in ['get', 'clone']:
1449
ui.ui_factory.show_user_warning(
1450
'deprecated_command',
1451
deprecated_name=self.invoked_as,
1452
recommended_name='branch',
1453
deprecated_in_version='2.4')
1454
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1456
if not (hardlink or files_from):
1457
# accelerator_tree is usually slower because you have to read N
1458
# files (no readahead, lots of seeks, etc), but allow the user to
1459
# explicitly request it
1460
accelerator_tree = None
1461
if files_from is not None and files_from != from_location:
1462
accelerator_tree = WorkingTree.open(files_from)
1208
1463
revision = _get_one_revision('branch', revision)
1209
1464
self.add_cleanup(br_from.lock_read().unlock)
1210
1465
if revision is not None:
1216
1471
revision_id = br_from.last_revision()
1217
1472
if to_location is None:
1218
to_location = urlutils.derive_to_location(from_location)
1473
to_location = getattr(br_from, "name", None)
1475
to_location = urlutils.derive_to_location(from_location)
1219
1476
to_transport = transport.get_transport(to_location)
1221
1478
to_transport.mkdir('.')
1222
1479
except errors.FileExists:
1223
if not use_existing_dir:
1224
raise errors.BzrCommandError('Target directory "%s" '
1225
'already exists.' % to_location)
1481
to_dir = controldir.ControlDir.open_from_transport(
1483
except errors.NotBranchError:
1484
if not use_existing_dir:
1485
raise errors.BzrCommandError(gettext('Target directory "%s" '
1486
'already exists.') % to_location)
1228
bzrdir.BzrDir.open_from_transport(to_transport)
1491
to_dir.open_branch()
1229
1492
except errors.NotBranchError:
1232
1495
raise errors.AlreadyBranchError(to_location)
1233
1496
except errors.NoSuchFile:
1234
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1497
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1237
# preserve whatever source format we have.
1238
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1239
possible_transports=[to_transport],
1240
accelerator_tree=accelerator_tree,
1241
hardlink=hardlink, stacked=stacked,
1242
force_new_repo=standalone,
1243
create_tree_if_local=not no_tree,
1244
source_branch=br_from)
1245
branch = dir.open_branch()
1246
except errors.NoSuchRevision:
1247
to_transport.delete_tree('.')
1248
msg = "The branch %s has no revision %s." % (from_location,
1250
raise errors.BzrCommandError(msg)
1251
_merge_tags_if_possible(br_from, branch)
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)
1252
1527
# If the source branch is stacked, the new branch may
1253
1528
# be stacked whether we asked for that explicitly or not.
1254
1529
# We therefore need a try/except here and not just 'if stacked:'
1256
note('Created new stacked branch referring to %s.' %
1531
note(gettext('Created new stacked branch referring to %s.') %
1257
1532
branch.get_stacked_on_url())
1258
1533
except (errors.NotStacked, errors.UnstackableBranchFormat,
1259
errors.UnstackableRepositoryFormat), e:
1260
note('Branched %d revision(s).' % branch.revno())
1534
errors.UnstackableRepositoryFormat) as e:
1535
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1262
1537
# Bind to the parent
1263
1538
parent_branch = Branch.open(from_location)
1264
1539
branch.bind(parent_branch)
1265
note('New branch bound to %s' % from_location)
1540
note(gettext('New branch bound to %s') % from_location)
1267
1542
# Switch to the new branch
1268
1543
wt, _ = WorkingTree.open_containing('.')
1269
_mod_switch.switch(wt.bzrdir, branch)
1270
note('Switched to branch: %s',
1544
_mod_switch.switch(wt.controldir, branch)
1545
note(gettext('Switched to branch: %s'),
1271
1546
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)))
1274
1599
class cmd_checkout(Command):
1275
1600
__doc__ = """Create a new checkout of an existing branch.
1378
1701
class cmd_update(Command):
1379
__doc__ = """Update a tree to have the latest code committed to its branch.
1381
This will perform a merge into the working tree, and may generate
1382
conflicts. If you have any local changes, you will still
1383
need to commit them after the update for the update to be complete.
1385
If you want to discard your local changes, you can just do a
1386
'bzr revert' instead of 'bzr commit' after the update.
1388
If the tree's branch is bound to a master branch, it will also update
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
1389
1717
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.
1392
1731
_see_also = ['pull', 'working-trees', 'status-flags']
1393
1732
takes_args = ['dir?']
1394
takes_options = ['revision']
1733
takes_options = ['revision',
1735
help="Show base revision text in conflicts."),
1395
1737
aliases = ['up']
1397
def run(self, dir='.', revision=None):
1739
def run(self, dir=None, revision=None, show_base=None):
1398
1740
if revision is not None and len(revision) != 1:
1399
raise errors.BzrCommandError(
1400
"bzr update --revision takes exactly one revision")
1401
tree = WorkingTree.open_containing(dir)[0]
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"))
1402
1752
branch = tree.branch
1403
1753
possible_transports = []
1404
1754
master = branch.get_master_branch(
1440
1790
change_reporter,
1441
1791
possible_transports=possible_transports,
1442
1792
revision=revision_id,
1444
except errors.NoSuchRevision, e:
1445
raise errors.BzrCommandError(
1794
show_base=show_base)
1795
except errors.NoSuchRevision as e:
1796
raise errors.BzrCommandError(gettext(
1446
1797
"branch has no revision %s\n"
1447
"bzr update --revision only works"
1448
" for a revision in the branch history"
1798
"brz update --revision only works"
1799
" for a revision in the branch history")
1449
1800
% (e.revision))
1450
1801
revno = tree.branch.revision_id_to_dotted_revno(
1451
1802
_mod_revision.ensure_null(tree.last_revision()))
1452
note('Updated to revision %s of branch %s' %
1453
('.'.join(map(str, revno)), branch_location))
1803
note(gettext('Updated to revision {0} of branch {1}').format(
1804
'.'.join(map(str, revno)), branch_location))
1454
1805
parent_ids = tree.get_parent_ids()
1455
1806
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1456
note('Your local commits will now show as pending merges with '
1457
"'bzr status', and can be committed with 'bzr commit'.")
1807
note(gettext('Your local commits will now show as pending merges with '
1808
"'brz status', and can be committed with 'brz commit'."))
1458
1809
if conflicts != 0:
1519
1871
RegistryOption.from_kwargs('file-deletion-strategy',
1520
1872
'The file deletion mode to be used.',
1521
1873
title='Deletion Strategy', value_switches=True, enum_switch=False,
1522
safe='Only delete files if they can be'
1523
' safely recovered (default).',
1524
keep='Delete from bzr but leave the working copy.',
1525
force='Delete all the specified files, even if they can not be '
1526
'recovered and even if they are non-empty directories.')]
1874
safe='Backup changed files (default).',
1875
keep='Delete from brz but leave the working copy.',
1876
no_backup='Don\'t backup changed files.'),
1527
1878
aliases = ['rm', 'del']
1528
1879
encoding_type = 'replace'
1530
1881
def run(self, file_list, verbose=False, new=False,
1531
1882
file_deletion_strategy='safe'):
1532
tree, file_list = tree_files(file_list)
1884
tree, file_list = WorkingTree.open_containing_paths(file_list)
1534
1886
if file_list is not None:
1535
1887
file_list = [f for f in file_list]
1730
2098
to_transport.ensure_base()
1731
2099
except errors.NoSuchFile:
1732
2100
if not create_prefix:
1733
raise errors.BzrCommandError("Parent directory of %s"
2101
raise errors.BzrCommandError(gettext("Parent directory of %s"
1734
2102
" does not exist."
1735
2103
"\nYou may supply --create-prefix to create all"
1736
" leading parent directories."
2104
" leading parent directories.")
1738
2106
to_transport.create_prefix()
1741
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2109
a_controldir = controldir.ControlDir.open_from_transport(to_transport)
1742
2110
except errors.NotBranchError:
1743
2111
# really a NotBzrDir error...
1744
create_branch = bzrdir.BzrDir.create_branch_convenience
2112
create_branch = controldir.ControlDir.create_branch_convenience
2114
force_new_tree = False
2116
force_new_tree = None
1745
2117
branch = create_branch(to_transport.base, format=format,
1746
possible_transports=[to_transport])
1747
a_bzrdir = branch.bzrdir
2118
possible_transports=[to_transport],
2119
force_new_tree=force_new_tree)
2120
a_controldir = branch.controldir
1749
from bzrlib.transport.local import LocalTransport
1750
if a_bzrdir.has_branch():
2122
from .transport.local import LocalTransport
2123
if a_controldir.has_branch():
1751
2124
if (isinstance(to_transport, LocalTransport)
1752
and not a_bzrdir.has_workingtree()):
2125
and not a_controldir.has_workingtree()):
1753
2126
raise errors.BranchExistsWithoutWorkingTree(location)
1754
2127
raise errors.AlreadyBranchError(location)
1755
branch = a_bzrdir.create_branch()
1756
a_bzrdir.create_workingtree()
2128
branch = a_controldir.create_branch()
2129
if not no_tree and not a_controldir.has_workingtree():
2130
a_controldir.create_workingtree()
1757
2131
if append_revisions_only:
1759
2133
branch.set_append_revisions_only(True)
1760
2134
except errors.UpgradeRequired:
1761
raise errors.BzrCommandError('This branch format cannot be set'
1762
' to append-revisions-only. Try --default.')
2135
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2136
' to append-revisions-only. Try --default.'))
1763
2137
if not is_quiet():
1764
from bzrlib.info import describe_layout, describe_format
2138
from .info import describe_layout, describe_format
1766
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
2140
tree = a_controldir.open_workingtree(recommend_upgrade=False)
1767
2141
except (errors.NoWorkingTree, errors.NotLocalUrl):
1769
2143
repository = branch.repository
1770
2144
layout = describe_layout(repository, branch, tree).lower()
1771
format = describe_format(a_bzrdir, repository, branch, tree)
1772
self.outf.write("Created a %s (format: %s)\n" % (layout, format))
2145
format = describe_format(a_controldir, repository, branch, tree)
2146
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1773
2148
if repository.is_shared():
1774
2149
#XXX: maybe this can be refactored into transport.path_or_url()
1775
url = repository.bzrdir.root_transport.external_url()
2150
url = repository.controldir.root_transport.external_url()
1777
2152
url = urlutils.local_path_from_url(url)
1778
2153
except errors.InvalidURL:
1780
self.outf.write("Using shared repository: %s\n" % url)
2155
self.outf.write(gettext("Using shared repository: %s\n") % url)
1783
2158
class cmd_init_repository(Command):
1825
2200
def run(self, location, format=None, no_trees=False):
1826
2201
if format is None:
1827
format = bzrdir.format_registry.make_bzrdir('default')
2202
format = controldir.format_registry.make_controldir('default')
1829
2204
if location is None:
1832
2207
to_transport = transport.get_transport(location)
1833
to_transport.ensure_base()
1835
newdir = format.initialize_on_transport(to_transport)
1836
repo = newdir.create_repository(shared=True)
1837
repo.set_make_working_trees(not no_trees)
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()))
1838
2215
if not is_quiet():
1839
from bzrlib.info import show_bzrdir_info
1840
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2216
from .info import show_bzrdir_info
2217
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1843
2220
class cmd_diff(Command):
1863
2247
Shows the difference in the working tree versus the last commit::
1867
2251
Difference between the working tree and revision 1::
1871
2255
Difference between revision 3 and revision 1::
1875
2259
Difference between revision 3 and revision 1 for branch xxx::
1879
To see the changes introduced in revision X::
2263
The changes introduced by revision 2 (equivalent to -r1..2)::
2267
To see the changes introduced by revision X::
1883
2271
Note that in the case of a merge, the -c option shows the changes
1884
2272
compared to the left hand parent. To see the changes against
1885
2273
another parent, use::
1887
bzr diff -r<chosen_parent>..X
1889
The changes introduced by revision 2 (equivalent to -r1..2)::
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)
1893
2282
Show just the differences for file NEWS::
1897
2286
Show the differences in working tree xxx for file NEWS::
1901
2290
Show the differences from branch xxx to this working tree:
1905
2294
Show the differences between two branches for file NEWS::
1907
bzr diff --old xxx --new yyy NEWS
1909
Same as 'bzr diff' but prefix paths with old/ and new/::
1911
bzr diff --prefix old/:new/
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
1913
2306
_see_also = ['status']
1914
2307
takes_args = ['file*']
1921
2314
'two values separated by a colon. (eg "old/:new/").'),
1923
2316
help='Branch/tree to compare from.',
1927
2320
help='Branch/tree to compare to.',
1932
2325
Option('using',
1933
2326
help='Use this command to compare files.',
1936
2329
RegistryOption('format',
1937
2331
help='Diff format to use.',
1938
lazy_registry=('bzrlib.diff', 'format_registry'),
1939
value_switches=False, title='Diff format'),
2332
lazy_registry=('breezy.diff', 'format_registry'),
2333
title='Diff format'),
2335
help='How many lines of context to show.',
1941
2339
aliases = ['di', 'dif']
1942
2340
encoding_type = 'exact'
1944
2342
@display_command
1945
2343
def run(self, revision=None, file_list=None, diff_options=None,
1946
prefix=None, old=None, new=None, using=None, format=None):
1947
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
2344
prefix=None, old=None, new=None, using=None, format=None,
2346
from .diff import (get_trees_and_branches_to_diff_locked,
1948
2347
show_diff_trees)
1950
if (prefix is None) or (prefix == '0'):
1951
2350
# diff -p0 format
2353
elif prefix == '1' or prefix is None:
1955
2354
old_label = 'old/'
1956
2355
new_label = 'new/'
1957
2356
elif ':' in prefix:
1958
2357
old_label, new_label = prefix.split(":")
1960
raise errors.BzrCommandError(
2359
raise errors.BzrCommandError(gettext(
1961
2360
'--prefix expects two values separated by a colon'
1962
' (eg "old/:new/")')
2361
' (eg "old/:new/")'))
1964
2363
if revision and len(revision) > 2:
1965
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1966
' one or two revision specifiers')
2364
raise errors.BzrCommandError(gettext('brz diff --revision takes exactly'
2365
' one or two revision specifiers'))
1968
2367
if using is not None and format is not None:
1969
raise errors.BzrCommandError('--using and --format are mutually '
2368
raise errors.BzrCommandError(gettext(
2369
'{0} and {1} are mutually exclusive').format(
2370
'--using', '--format'))
1972
2372
(old_tree, new_tree,
1973
2373
old_branch, new_branch,
1974
2374
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1975
2375
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()
1976
2378
return show_diff_trees(old_tree, new_tree, sys.stdout,
1977
2379
specific_files=specific_files,
1978
2380
external_diff_options=diff_options,
1979
2381
old_label=old_label, new_label=new_label,
1980
extra_trees=extra_trees, using=using,
2382
extra_trees=extra_trees,
2383
path_encoding=path_encoding,
2384
using=using, context=context,
1981
2385
format_cls=format)
2217
2625
top = log -l10 --line
2218
2626
show = log -v -p
2220
``bzr tip`` will then show the latest revision while ``bzr top``
2628
``brz tip`` will then show the latest revision while ``brz top``
2221
2629
will show the last 10 mainline revisions. To see the details of a
2222
particular revision X, ``bzr show -rX``.
2630
particular revision X, ``brz show -rX``.
2224
2632
If you are interested in looking deeper into a particular merge X,
2225
use ``bzr log -n0 -rX``.
2633
use ``brz log -n0 -rX``.
2227
``bzr log -v`` on a branch with lots of history is currently
2635
``brz log -v`` on a branch with lots of history is currently
2228
2636
very slow. A fix for this issue is currently under development.
2229
2637
With or without that fix, it is recommended that a revision range
2230
2638
be given when using the -v option.
2232
bzr has a generic full-text matching plugin, bzr-search, that can be
2640
brz has a generic full-text matching plugin, brz-search, that can be
2233
2641
used to find revisions matching user names, commit messages, etc.
2234
2642
Among other features, this plugin can find all revisions containing
2235
2643
a list of words but not others.
2278
2686
Option('show-diff',
2279
2687
short_name='p',
2280
2688
help='Show changes made in each revision as a patch.'),
2281
Option('include-merges',
2689
Option('include-merged',
2282
2690
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.'),
2283
2695
Option('exclude-common-ancestry',
2284
2696
help='Display only the revisions that are not part'
2285
' of both ancestries (require -rX..Y)'
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 '
2288
2723
encoding_type = 'replace'
2655
3121
Patterns prefixed with '!!' act as regular ignore patterns, but have
2656
3122
precedence over the '!' exception patterns.
2658
Note: ignore patterns containing shell wildcards must be quoted from
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.
2662
3133
Ignore the top level Makefile::
2664
bzr ignore ./Makefile
3135
brz ignore ./Makefile
2666
3137
Ignore .class files in all directories...::
2668
bzr ignore "*.class"
3139
brz ignore "*.class"
2670
3141
...but do not ignore "special.class"::
2672
bzr ignore "!special.class"
2674
Ignore .o files under the lib directory::
2676
bzr ignore "lib/**/*.o"
2678
Ignore .o files under the lib directory::
2680
bzr ignore "RE:lib/.*\.o"
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"
2682
3157
Ignore everything but the "debian" toplevel directory::
2684
bzr ignore "RE:(?!debian/).*"
3159
brz ignore "RE:(?!debian/).*"
2686
3161
Ignore everything except the "local" toplevel directory,
2687
but always ignore "*~" autosave files, even under local/::
3162
but always ignore autosave files ending in ~, even under local/::
2690
bzr ignore "!./local"
3165
brz ignore "!./local"
2694
3169
_see_also = ['status', 'ignored', 'patterns']
2695
3170
takes_args = ['name_pattern*']
2696
3171
takes_options = ['directory',
2697
3172
Option('default-rules',
2698
help='Display the default ignore rules that bzr uses.')
3173
help='Display the default ignore rules that brz uses.')
2701
3176
def run(self, name_pattern_list=None, default_rules=None,
2702
3177
directory=u'.'):
2703
from bzrlib import ignores
3178
from breezy import ignores
2704
3179
if default_rules is not None:
2705
3180
# dump the default rules and exit
2706
3181
for pattern in ignores.USER_DEFAULTS:
2707
3182
self.outf.write("%s\n" % pattern)
2709
3184
if not name_pattern_list:
2710
raise errors.BzrCommandError("ignore requires at least one "
2711
"NAME_PATTERN or --default-rules.")
3185
raise errors.BzrCommandError(gettext("ignore requires at least one "
3186
"NAME_PATTERN or --default-rules."))
2712
3187
name_pattern_list = [globbing.normalize_pattern(p)
2713
3188
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('')
2714
3201
for name_pattern in name_pattern_list:
2715
3202
if (name_pattern[0] == '/' or
2716
3203
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2717
raise errors.BzrCommandError(
2718
"NAME_PATTERN should not be an absolute path")
3204
raise errors.BzrCommandError(gettext(
3205
"NAME_PATTERN should not be an absolute path"))
2719
3206
tree, relpath = WorkingTree.open_containing(directory)
2720
3207
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2721
3208
ignored = globbing.Globster(name_pattern_list)
3210
self.add_cleanup(tree.lock_read().unlock)
2724
3211
for entry in tree.list_files():
2726
3213
if id is not None:
2727
3214
filename = entry[0]
2728
3215
if ignored.match(filename):
2729
3216
matches.append(filename)
2731
3217
if len(matches) > 0:
2732
self.outf.write("Warning: the following files are version controlled and"
2733
" match your ignore pattern:\n%s"
3218
self.outf.write(gettext("Warning: the following files are version "
3219
"controlled and match your ignore pattern:\n%s"
2734
3220
"\nThese files will continue to be version controlled"
2735
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3221
" unless you 'brz remove' them.\n") % ("\n".join(matches),))
2738
3224
class cmd_ignored(Command):
2825
3312
Option('per-file-timestamps',
2826
3313
help='Set modification time of files to that of the last '
2827
3314
'revision in which it was changed.'),
3315
Option('uncommitted',
3316
help='Export the working tree contents rather than that of the '
2829
3319
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2830
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2831
from bzrlib.export import export
3320
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3322
from .export import export
2833
3324
if branch_or_subdir is None:
2834
tree = WorkingTree.open_containing(directory)[0]
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"))
2838
b, subdir = Branch.open_containing(branch_or_subdir)
2841
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3338
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2843
export(rev_tree, dest, format, root, subdir, filtered=filters,
3340
export(export_tree, dest, format, root, subdir, filtered=filters,
2844
3341
per_file_timestamps=per_file_timestamps)
2845
except errors.NoSuchExportFormat, e:
2846
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3342
except errors.NoSuchExportFormat as e:
3343
raise errors.BzrCommandError(
3344
gettext('Unsupported export format: %s') % e.format)
2849
3347
class cmd_cat(Command):
2887
3385
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
2889
3391
if name_from_revision:
2890
3392
# Try in revision if requested
2891
3393
if old_file_id is None:
2892
raise errors.BzrCommandError(
2893
"%r is not present in revision %s" % (
3394
raise errors.BzrCommandError(gettext(
3395
"{0!r} is not present in revision {1}").format(
2894
3396
filename, rev_tree.get_revision_id()))
2896
content = rev_tree.get_file_text(old_file_id)
3398
actual_file_id = old_file_id
2898
3400
cur_file_id = tree.path2id(relpath)
2900
if cur_file_id is not None:
2901
# Then try with the actual file id
2903
content = rev_tree.get_file_text(cur_file_id)
2905
except errors.NoSuchId:
2906
# The actual file id didn't exist at that time
2908
if not found and old_file_id is not None:
2909
# Finally try with the old file id
2910
content = rev_tree.get_file_text(old_file_id)
2913
# Can't be found anywhere
2914
raise errors.BzrCommandError(
2915
"%r is not present in revision %s" % (
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(
2916
3408
filename, rev_tree.get_revision_id()))
2918
from bzrlib.filters import (
2919
ContentFilterContext,
2920
filtered_output_bytes,
2922
filters = rev_tree._content_filter_stack(relpath)
2923
chunks = content.splitlines(True)
2924
content = filtered_output_bytes(chunks, filters,
2925
ContentFilterContext(relpath, rev_tree))
2927
self.outf.writelines(content)
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)
2930
self.outf.write(content)
3415
content = rev_tree.get_file_text(actual_file_id)
3417
self.outf.write(content)
2933
3420
class cmd_local_time_offset(Command):
2981
3468
A common mistake is to forget to add a new file or directory before
2982
3469
running the commit command. The --strict option checks for unknown
2983
3470
files and aborts the commit if any are found. More advanced pre-commit
2984
checks can be implemented by defining hooks. See ``bzr help hooks``
3471
checks can be implemented by defining hooks. See ``brz help hooks``
2987
3474
:Things to note:
2989
3476
If you accidentially commit the wrong changes or make a spelling
2990
3477
mistake in the commit message say, you can use the uncommit command
2991
to undo it. See ``bzr help uncommit`` for details.
3478
to undo it. See ``brz help uncommit`` for details.
2993
3480
Hooks can also be configured to run after a commit. This allows you
2994
3481
to trigger updates to external systems like bug trackers. The --fixes
2995
3482
option can be used to record the association between a revision and
2996
one or more bugs. See ``bzr help bugs`` for details.
2998
A selective commit may fail in some cases where the committed
2999
tree would be invalid. Consider::
3004
bzr commit foo -m "committing foo"
3005
bzr mv foo/bar foo/baz
3008
bzr commit foo/bar -m "committing bar but not baz"
3010
In the example above, the last commit will fail by design. This gives
3011
the user the opportunity to decide whether they want to commit the
3012
rename at the same time, separately first, or not at all. (As a general
3013
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3483
one or more bugs. See ``brz help bugs`` for details.
3015
# TODO: Run hooks on tree to-be-committed, and after commit.
3017
# TODO: Strict commit that fails if there are deleted files.
3018
# (what does "deleted files" mean ??)
3020
# TODO: Give better message for -s, --summary, used by tla people
3022
# XXX: verbose currently does nothing
3024
3486
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3025
3487
takes_args = ['selected*']
3026
3488
takes_options = [
3027
3489
ListOption('exclude', type=str, short_name='x',
3028
3490
help="Do not consider changes made to a given path."),
3029
Option('message', type=unicode,
3491
Option('message', type=text_type,
3030
3492
short_name='m',
3031
3493
help="Description of the new revision."),
3057
3519
Option('show-diff', short_name='p',
3058
3520
help='When no message is supplied, show the diff along'
3059
3521
' 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 '
3061
3527
aliases = ['ci', 'checkin']
3063
3529
def _iter_bug_fix_urls(self, fixes, branch):
3530
default_bugtracker = None
3064
3531
# Configure the properties for bug fixing attributes.
3065
3532
for fixed_bug in fixes:
3066
3533
tokens = fixed_bug.split(':')
3067
if len(tokens) != 2:
3068
raise errors.BzrCommandError(
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(
3069
3550
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3070
"See \"bzr help bugs\" for more information on this "
3071
"feature.\nCommit refused." % fixed_bug)
3072
tag, bug_id = tokens
3551
"See \"brz help bugs\" for more information on this "
3552
"feature.\nCommit refused.") % fixed_bug)
3554
tag, bug_id = tokens
3074
3556
yield bugtracker.get_bug_url(tag, branch, bug_id)
3075
3557
except errors.UnknownBugTrackerAbbreviation:
3076
raise errors.BzrCommandError(
3077
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3078
except errors.MalformedBugIdentifier, e:
3079
raise errors.BzrCommandError(
3080
"%s\nCommit refused." % (str(e),))
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),))
3082
3564
def run(self, message=None, file=None, verbose=False, selected_list=None,
3083
3565
unchanged=False, strict=False, local=False, fixes=None,
3084
author=None, show_diff=False, exclude=None, commit_time=None):
3085
from bzrlib.errors import (
3566
author=None, show_diff=False, exclude=None, commit_time=None,
3568
from .errors import (
3086
3569
PointlessCommit,
3087
3570
ConflictsInTree,
3088
3571
StrictCommitFailed
3090
from bzrlib.msgeditor import (
3573
from .msgeditor import (
3091
3574
edit_commit_message_encoded,
3092
3575
generate_commit_message_template,
3093
make_commit_message_template_encoded
3576
make_commit_message_template_encoded,
3096
3580
commit_stamp = offset = None
3097
3581
if commit_time is not None:
3099
3583
commit_stamp, offset = timestamp.parse_patch_date(commit_time)
3100
except ValueError, e:
3101
raise errors.BzrCommandError(
3102
"Could not parse --commit-time: " + str(e))
3104
# TODO: Need a blackbox test for invoking the external editor; may be
3105
# slightly problematic to run this cross-platform.
3107
# TODO: do more checks that the commit will succeed before
3108
# spending the user's valuable time typing a commit message.
3584
except ValueError as e:
3585
raise errors.BzrCommandError(gettext(
3586
"Could not parse --commit-time: " + str(e)))
3110
3588
properties = {}
3112
tree, selected_list = tree_files(selected_list)
3590
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3113
3591
if selected_list == ['']:
3114
3592
# workaround - commit of root of tree should be exactly the same
3115
3593
# as just default commit in that tree, and succeed even though
3186
3672
reporter=None, verbose=verbose, revprops=properties,
3187
3673
authors=author, timestamp=commit_stamp,
3188
3674
timezone=offset,
3189
exclude=safe_relpath_files(tree, exclude))
3675
exclude=tree.safe_relpath_files(exclude),
3190
3677
except PointlessCommit:
3191
raise errors.BzrCommandError("No changes to commit."
3192
" Use --unchanged to commit anyhow.")
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."))
3193
3681
except ConflictsInTree:
3194
raise errors.BzrCommandError('Conflicts detected in working '
3195
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3682
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3683
'tree. Use "brz conflicts" to list, "brz resolve FILE" to'
3197
3685
except StrictCommitFailed:
3198
raise errors.BzrCommandError("Commit refused because there are"
3199
" unknown files in the working tree.")
3200
except errors.BoundBranchOutOfDate, e:
3201
e.extra_help = ("\n"
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"
3202
3690
'To commit to master branch, run update and then commit.\n'
3203
3691
'You can also pass --local to commit to continue working '
3278
3766
class cmd_upgrade(Command):
3279
__doc__ = """Upgrade branch storage to current format.
3281
The check command or bzr developers may sometimes advise you to run
3282
this command. When the default format has changed you may also be warned
3283
during other operations to upgrade.
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/.
3286
_see_also = ['check']
3799
_see_also = ['check', 'reconcile', 'formats']
3287
3800
takes_args = ['url?']
3288
3801
takes_options = [
3289
RegistryOption('format',
3290
help='Upgrade to a specific format. See "bzr help'
3291
' formats" for details.',
3292
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3293
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3294
value_switches=True, title='Branch format'),
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."),
3297
def run(self, url='.', format=None):
3298
from bzrlib.upgrade import upgrade
3299
upgrade(url, 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
3302
3825
class cmd_whoami(Command):
3303
__doc__ = """Show or set bzr user id.
3826
__doc__ = """Show or set brz user id.
3306
3829
Show the email of the current user::
3310
3833
Set the current user::
3312
bzr whoami "Frank Chu <fchu@example.com>"
3835
brz whoami "Frank Chu <fchu@example.com>"
3314
takes_options = [ Option('email',
3837
takes_options = [ 'directory',
3315
3839
help='Display email address only.'),
3316
3840
Option('branch',
3317
3841
help='Set identity for the current branch instead of '
3321
3845
encoding_type = 'replace'
3323
3847
@display_command
3324
def run(self, email=False, branch=False, name=None):
3848
def run(self, email=False, branch=False, name=None, directory=None):
3325
3849
if name is None:
3326
# use branch if we're inside one; otherwise global config
3328
c = Branch.open_containing('.')[0].get_config()
3329
except errors.NotBranchError:
3330
c = config.GlobalConfig()
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')
3332
self.outf.write(c.user_email() + '\n')
3860
self.outf.write(_mod_config.extract_email_address(identity)
3334
self.outf.write(c.username() + '\n')
3863
self.outf.write(identity + '\n')
3867
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3337
3870
# display a warning if an email address isn't included in the given name.
3339
config.extract_email_address(name)
3340
except errors.NoEmailInUsername, e:
3872
_mod_config.extract_email_address(name)
3873
except errors.NoEmailInUsername as e:
3341
3874
warning('"%s" does not seem to contain an email address. '
3342
3875
'This is allowed, but not recommended.', name)
3344
3877
# use global config unless --branch given
3346
c = Branch.open_containing('.')[0].get_config()
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()
3348
c = config.GlobalConfig()
3349
c.set_user_option('email', name)
3886
c = _mod_config.GlobalStack()
3887
c.set('email', name)
3352
3890
class cmd_nick(Command):
3353
3891
__doc__ = """Print or set the branch nickname.
3355
If unset, the tree root directory name is used as the nickname.
3356
To print the current nickname, execute with no argument.
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.
3358
3897
Bound branches use the nickname of its master branch unless it is set
3415
3954
def remove_alias(self, alias_name):
3416
3955
if alias_name is None:
3417
raise errors.BzrCommandError(
3418
'bzr alias --remove expects an alias to remove.')
3956
raise errors.BzrCommandError(gettext(
3957
'brz alias --remove expects an alias to remove.'))
3419
3958
# If alias is not found, print something like:
3420
3959
# unalias: foo: not found
3421
c = config.GlobalConfig()
3960
c = _mod_config.GlobalConfig()
3422
3961
c.unset_alias(alias_name)
3424
3963
@display_command
3425
3964
def print_aliases(self):
3426
3965
"""Print out the defined aliases in a similar format to bash."""
3427
aliases = config.GlobalConfig().get_aliases()
3428
for key, value in sorted(aliases.iteritems()):
3429
self.outf.write('bzr alias %s="%s"\n' % (key, value))
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))
3431
3970
@display_command
3432
3971
def print_alias(self, alias_name):
3433
from bzrlib.commands import get_alias
3972
from .commands import get_alias
3434
3973
alias = get_alias(alias_name)
3435
3974
if alias is None:
3436
self.outf.write("bzr alias: %s: not found\n" % alias_name)
3975
self.outf.write("brz alias: %s: not found\n" % alias_name)
3438
3977
self.outf.write(
3439
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3978
'brz alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3441
3980
def set_alias(self, alias_name, alias_command):
3442
3981
"""Save the alias in the global config."""
3443
c = config.GlobalConfig()
3982
c = _mod_config.GlobalConfig()
3444
3983
c.set_alias(alias_name, alias_command)
3478
4017
Tests that need working space on disk use a common temporary directory,
3479
4018
typically inside $TMPDIR or /tmp.
3481
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
4020
If you set BRZ_TEST_PDB=1 when running selftest, failing tests will drop
3482
4021
into a pdb postmortem session.
4023
The --coverage=DIRNAME global option produces a report with covered code
3485
4027
Run only tests relating to 'ignore'::
3489
4031
Disable plugins and list tests as they're run::
3491
bzr --no-plugins selftest -v
4033
brz --no-plugins selftest -v
3493
4035
# NB: this is used from the class without creating an instance, which is
3494
4036
# why it does not have a self parameter.
3495
4037
def get_transport_type(typestring):
3496
4038
"""Parse and return a transport specifier."""
3497
4039
if typestring == "sftp":
3498
from bzrlib.tests import stub_sftp
4040
from .tests import stub_sftp
3499
4041
return stub_sftp.SFTPAbsoluteServer
3500
if typestring == "memory":
3501
from bzrlib.tests import test_server
4042
elif typestring == "memory":
4043
from .tests import test_server
3502
4044
return memory.MemoryServer
3503
if typestring == "fakenfs":
3504
from bzrlib.tests import test_server
4045
elif typestring == "fakenfs":
4046
from .tests import test_server
3505
4047
return test_server.FakeNFSServer
3506
4048
msg = "No known transport type %s. Supported types are: sftp\n" %\
3536
4076
help='List the tests instead of running them.'),
3537
4077
RegistryOption('parallel',
3538
4078
help="Run the test suite in parallel.",
3539
lazy_registry=('bzrlib.tests', 'parallel_registry'),
4079
lazy_registry=('breezy.tests', 'parallel_registry'),
3540
4080
value_switches=False,
3542
4082
Option('randomize', type=str, argname="SEED",
3543
4083
help='Randomize the order of tests using the given'
3544
4084
' seed or "now" for the current time.'),
3545
Option('exclude', type=str, argname="PATTERN",
3547
help='Exclude tests that match this regular'
4085
ListOption('exclude', type=str, argname="PATTERN",
4087
help='Exclude tests that match this regular'
3549
4089
Option('subunit',
3550
4090
help='Output test progress via subunit.'),
3551
4091
Option('strict', help='Fail on missing dependencies or '
3568
4111
def run(self, testspecs_list=None, verbose=False, one=False,
3569
4112
transport=None, benchmark=None,
3570
lsprof_timed=None, cache_dir=None,
3571
4114
first=False, list_only=False,
3572
4115
randomize=None, exclude=None, strict=False,
3573
4116
load_list=None, debugflag=None, starting_with=None, subunit=False,
3574
parallel=None, lsprof_tests=False):
3575
from bzrlib.tests import selftest
3576
import bzrlib.benchmarks as benchmarks
3577
from bzrlib.benchmarks import tree_creator
3579
# Make deprecation warnings visible, unless -Werror is set
3580
symbol_versioning.activate_deprecation_warnings(override=False)
3582
if cache_dir is not None:
3583
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
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()
3584
4130
if testspecs_list is not None:
3585
4131
pattern = '|'.join(testspecs_list)
3590
from bzrlib.tests import SubUnitBzrRunner
4136
from .tests import SubUnitBzrRunner
3591
4137
except ImportError:
3592
raise errors.BzrCommandError("subunit not available. subunit "
3593
"needs to be installed to use --subunit.")
4138
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4139
"needs to be installed to use --subunit."))
3594
4140
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3595
4141
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3596
4142
# stdout, which would corrupt the subunit stream.
3597
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
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):
3599
4149
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3601
4151
self.additional_selftest_args.setdefault(
3602
4152
'suite_decorators', []).append(parallel)
3604
test_suite_factory = benchmarks.test_suite
3605
# Unless user explicitly asks for quiet, be verbose in benchmarks
3606
verbose = not is_quiet()
3607
# TODO: should possibly lock the history file...
3608
benchfile = open(".perf_history", "at", buffering=1)
3609
self.add_cleanup(benchfile.close)
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
3611
test_suite_factory = None
4161
exclude_pattern = '(' + '|'.join(exclude) + ')'
4163
self._disable_fsync()
3613
4164
selftest_kwargs = {"verbose": verbose,
3614
4165
"pattern": pattern,
3615
4166
"stop_on_failure": one,
3617
4168
"test_suite_factory": test_suite_factory,
3618
4169
"lsprof_timed": lsprof_timed,
3619
4170
"lsprof_tests": lsprof_tests,
3620
"bench_history": benchfile,
3621
4171
"matching_tests_first": first,
3622
4172
"list_only": list_only,
3623
4173
"random_seed": randomize,
3624
"exclude_pattern": exclude,
4174
"exclude_pattern": exclude_pattern,
3625
4175
"strict": strict,
3626
4176
"load_list": load_list,
3627
4177
"debug_flags": debugflag,
3628
4178
"starting_with": starting_with
3630
4180
selftest_kwargs.update(self.additional_selftest_args)
3631
result = selftest(**selftest_kwargs)
4182
# Make deprecation warnings visible, unless -Werror is set
4183
cleanup = symbol_versioning.activate_deprecation_warnings(
4186
result = tests.selftest(**selftest_kwargs)
3632
4189
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
3635
4201
class cmd_version(Command):
3636
__doc__ = """Show version of bzr."""
4202
__doc__ = """Show version of brz."""
3638
4204
encoding_type = 'replace'
3639
4205
takes_options = [
3689
4255
The source of the merge can be specified either in the form of a branch,
3690
4256
or in the form of a path to a file containing a merge directive generated
3691
with bzr send. If neither is specified, the default is the upstream branch
3692
or the branch most recently merged using --remember.
3694
When merging a branch, by default the tip will be merged. To pick a different
3695
revision, pass --revision. If you specify two values, the first will be used as
3696
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3697
available revisions, like this is commonly referred to as "cherrypicking".
3699
Revision numbers are always relative to the branch being merged.
3701
By default, bzr will try to merge in all new work from the other
3702
branch, automatically determining an appropriate base. If this
3703
fails, you may need to give an explicit base.
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.
3705
4280
Merge will do its best to combine the changes in two branches, but there
3706
4281
are some kinds of problems only a human can fix. When it encounters those,
3707
4282
it will mark a conflict. A conflict means that you need to fix something,
3708
before you should commit.
3710
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3712
If there is no default branch set, the first merge will set it. After
3713
that, you can omit the branch to use the default. To change the
3714
default, use --remember. The value will only be saved if the remote
3715
location can be accessed.
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.
3717
4292
The results of the merge are placed into the destination working
3718
directory, where they can be reviewed (with bzr diff), tested, and then
4293
directory, where they can be reviewed (with brz diff), tested, and then
3719
4294
committed to record the result of the merge.
3721
4296
merge refuses to run if there are any uncommitted changes, unless
3722
--force is given. The --force option can also be used to create a
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
3723
4300
merge revision which has more than two parents.
3725
4302
If one would like to merge changes from the working tree of the other
3849
4430
self.sanity_check_merger(merger)
3850
4431
if (merger.base_rev_id == merger.other_rev_id and
3851
4432
merger.other_rev_id is not None):
3852
note('Nothing to do.')
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.'))
4442
if pull and not preview:
3855
4443
if merger.interesting_files is not None:
3856
raise errors.BzrCommandError('Cannot pull individual files')
4444
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3857
4445
if (merger.base_rev_id == tree.last_revision()):
3858
4446
result = tree.pull(merger.other_branch, False,
3859
4447
merger.other_rev_id)
3860
4448
result.report(self.outf)
3862
4450
if merger.this_basis is None:
3863
raise errors.BzrCommandError(
4451
raise errors.BzrCommandError(gettext(
3864
4452
"This branch has no commits."
3865
" (perhaps you would prefer 'bzr pull')")
4453
" (perhaps you would prefer 'brz pull')"))
3867
4455
return self._do_preview(merger)
3868
4456
elif interactive:
3964
4553
if other_revision_id is None:
3965
4554
other_revision_id = _mod_revision.ensure_null(
3966
4555
other_branch.last_revision())
3967
# Remember where we merge from
3968
if ((remember or tree.branch.get_submit_branch() is None) and
3969
user_location is not None):
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)))):
3970
4565
tree.branch.set_submit_branch(other_branch.base)
3971
_merge_tags_if_possible(other_branch, tree.branch)
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)
3972
4569
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3973
4570
other_revision_id, base_revision_id, other_branch, base_branch)
3974
4571
if other_path != '':
4137
4735
class cmd_revert(Command):
4138
__doc__ = """Revert files to a previous revision.
4737
Set files in the working tree back to the contents of a previous revision.
4140
4739
Giving a list of files will revert only those files. Otherwise, all files
4141
4740
will be reverted. If the revision is not specified with '--revision', the
4142
last committed revision is used.
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.
4144
4745
To remove only some changes, without reverting to a prior version, use
4145
merge instead. For example, "merge . --revision -2..-3" will remove the
4146
changes introduced by -2, without affecting the changes introduced by -1.
4147
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
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
4149
By default, any files that have been manually changed will be backed up
4150
first. (Files changed only by merge are not backed up.) Backup files have
4151
'.~#~' appended to their name, where # is a number.
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.
4153
4759
When you provide files, you can use their current pathname or the pathname
4154
4760
from the target revision. So you can use revert to "undelete" a file by
4391
5009
if remote_extra and not mine_only:
4392
5010
if printed_local is True:
4393
5011
message("\n\n\n")
4394
message("You are missing %d revision(s):\n" %
5012
message(ngettext("You are missing %d revision:\n",
5013
"You are missing %d revisions:\n",
5014
len(remote_extra)) %
4395
5015
len(remote_extra))
5016
if remote_branch.supports_tags():
5017
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4396
5018
for revision in iter_log_revisions(remote_extra,
4397
5019
remote_branch.repository,
4399
5022
lf.log_revision(revision)
4400
5023
status_code = 1
4402
5025
if mine_only and not local_extra:
4403
5026
# We checked local, and found nothing extra
4404
message('This branch is up to date.\n')
5027
message(gettext('This branch has no new revisions.\n'))
4405
5028
elif theirs_only and not remote_extra:
4406
5029
# We checked remote, and found nothing extra
4407
message('Other branch is up to date.\n')
5030
message(gettext('Other branch has no new revisions.\n'))
4408
5031
elif not (mine_only or theirs_only or local_extra or
4410
5033
# We checked both branches, and neither one had extra
4412
message("Branches are up to date.\n")
5035
message(gettext("Branches are up to date.\n"))
4413
5036
self.cleanup_now()
4414
5037
if not status_code and parent is None and other_branch is not None:
4415
5038
self.add_cleanup(local_branch.lock_write().unlock)
4564
5174
self.add_cleanup(branch.lock_read().unlock)
4565
5175
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4566
5176
self.add_cleanup(tree.lock_read().unlock)
5177
if wt is not None and revision is None:
4568
5178
file_id = wt.path2id(relpath)
4570
5180
file_id = tree.path2id(relpath)
4571
5181
if file_id is None:
4572
5182
raise errors.NotVersionedError(filename)
4573
file_version = tree.inventory[file_id].revision
4574
5183
if wt is not None and revision is None:
4575
5184
# If there is a tree and we're not annotating historical
4576
5185
# versions, annotate the working tree's content.
4577
5186
annotate_file_tree(wt, file_id, self.outf, long, all,
4578
5187
show_ids=show_ids)
4580
annotate_file(branch, file_version, file_id, long, all, self.outf,
5189
annotate_file_tree(tree, file_id, self.outf, long, all,
5190
show_ids=show_ids, branch=branch)
4584
5193
class cmd_re_sign(Command):
4669
5278
location = b.get_old_bound_location()
4670
5279
except errors.UpgradeRequired:
4671
raise errors.BzrCommandError('No location supplied. '
4672
'This format does not remember old locations.')
5280
raise errors.BzrCommandError(gettext('No location supplied. '
5281
'This format does not remember old locations.'))
4674
5283
if location is None:
4675
5284
if b.get_bound_location() is not None:
4676
raise errors.BzrCommandError('Branch is already bound')
5285
raise errors.BzrCommandError(
5286
gettext('Branch is already bound'))
4678
raise errors.BzrCommandError('No location supplied '
4679
'and no previous location known')
5288
raise errors.BzrCommandError(
5289
gettext('No location supplied'
5290
' and no previous location known'))
4680
5291
b_other = Branch.open(location)
4682
5293
b.bind(b_other)
4683
5294
except errors.DivergedBranches:
4684
raise errors.BzrCommandError('These branches have diverged.'
4685
' Try merging, and then bind again.')
5295
raise errors.BzrCommandError(gettext('These branches have diverged.'
5296
' Try merging, and then bind again.'))
4686
5297
if b.get_config().has_explicit_nickname():
4687
5298
b.nick = b_other.nick
4754
5366
self.add_cleanup(tree.lock_write().unlock)
4756
5368
self.add_cleanup(b.lock_write().unlock)
4757
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5369
return self._run(b, tree, dry_run, verbose, revision, force,
4759
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4760
from bzrlib.log import log_formatter, show_log
4761
from bzrlib.uncommit import uncommit
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
4763
5377
last_revno, last_rev_id = b.last_revision_info()
4792
5406
end_revision=last_revno)
4795
self.outf.write('Dry-run, pretending to remove'
4796
' the above revisions.\n')
5409
self.outf.write(gettext('Dry-run, pretending to remove'
5410
' the above revisions.\n'))
4798
self.outf.write('The above revision(s) will be removed.\n')
5412
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4801
if not ui.ui_factory.get_boolean('Are you sure'):
4802
self.outf.write('Canceled')
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'))
4805
5422
mutter('Uncommitting from {%s} to {%s}',
4806
5423
last_rev_id, rev_id)
4807
5424
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4808
revno=revno, local=local)
4809
self.outf.write('You can restore the old tip by running:\n'
4810
' bzr pull . -r revid:%s\n' % last_rev_id)
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)
4813
5430
class cmd_break_lock(Command):
4814
__doc__ = """Break a dead lock on a repository, branch or working directory.
5431
__doc__ = """Break a dead lock.
5433
This command breaks a lock on a repository, branch, working directory or
4816
5436
CAUTION: Locks should only be broken when you are sure that the process
4817
5437
holding the lock has been stopped.
4819
You can get information on what locks are open via the 'bzr info
5439
You can get information on what locks are open via the 'brz info
4820
5440
[location]' command.
4824
bzr break-lock bzr+ssh://example.com/bzr/foo
5444
brz break-lock brz+ssh://example.com/brz/foo
5445
brz break-lock --conf ~/.bazaar
4826
5448
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.'),
4828
def run(self, location=None, show=False):
5456
def run(self, location=None, config=False, force=False):
4829
5457
if location is None:
4830
5458
location = u'.'
4831
control, relpath = bzrdir.BzrDir.open_containing(location)
4833
control.break_lock()
4834
except NotImplementedError:
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:
4838
5474
class cmd_wait_until_signalled(Command):
4839
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5475
__doc__ = """Test helper for test_start_and_stop_brz_subprocess_send_signal.
4841
5477
This just prints a line to signal when it is ready, then blocks on stdin.
4859
5495
help='Serve on stdin/out for use from inetd or sshd.'),
4860
5496
RegistryOption('protocol',
4861
5497
help="Protocol to serve.",
4862
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5498
lazy_registry=('breezy.transport', 'transport_server_registry'),
4863
5499
value_switches=True),
5501
help='Listen for connections on nominated address.', type=str),
4865
help='Listen for connections on nominated port of the form '
4866
'[hostname:]portnumber. Passing 0 as the port number will '
4867
'result in a dynamically allocated port. The default port '
4868
'depends on the protocol.',
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.',
4870
5507
custom_help('directory',
4871
5508
help='Serve contents of this directory.'),
4872
5509
Option('allow-writes',
4873
5510
help='By default the server is a readonly server. Supplying '
4874
5511
'--allow-writes enables write access to the contents of '
4875
'the served directory and below. Note that ``bzr serve`` '
5512
'the served directory and below. Note that ``brz serve`` '
4876
5513
'does not perform authentication, so unless some form of '
4877
5514
'external authentication is arranged supplying this '
4878
5515
'option leads to global uncontrolled write access to your '
5518
Option('client-timeout', type=float,
5519
help='Override the default idle client timeout (5min).'),
4883
def get_host_and_port(self, port):
4884
"""Return the host and port to run the smart server on.
4886
If 'port' is None, None will be returned for the host and port.
4888
If 'port' has a colon in it, the string before the colon will be
4889
interpreted as the host.
4891
:param port: A string of the port to run the server on.
4892
:return: A tuple of (host, port), where 'host' is a host name or IP,
4893
and port is an integer TCP/IP port.
4896
if port is not None:
4898
host, port = port.split(':')
4902
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4904
from bzrlib.transport import get_transport, transport_server_registry
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
4905
5525
if directory is None:
4906
directory = os.getcwd()
5526
directory = osutils.getcwd()
4907
5527
if protocol is None:
4908
protocol = transport_server_registry.get()
4909
host, port = self.get_host_and_port(port)
4910
url = urlutils.local_path_to_url(directory)
5528
protocol = transport.transport_server_registry.get()
5529
url = transport.location_to_url(directory)
4911
5530
if not allow_writes:
4912
5531
url = 'readonly+' + url
4913
transport = get_transport(url)
4914
protocol(transport, host, port, inet)
5532
t = transport.get_transport_from_url(url)
5533
protocol(t, listen, port, inet, client_timeout)
4917
5536
class cmd_join(Command):
4940
5559
containing_tree = WorkingTree.open_containing(parent_dir)[0]
4941
5560
repo = containing_tree.branch.repository
4942
5561
if not repo.supports_rich_root():
4943
raise errors.BzrCommandError(
5562
raise errors.BzrCommandError(gettext(
4944
5563
"Can't join trees because %s doesn't support rich root data.\n"
4945
"You can use bzr upgrade on the repository."
5564
"You can use brz upgrade on the repository.")
4949
5568
containing_tree.add_reference(sub_tree)
4950
except errors.BadReferenceTarget, e:
5569
except errors.BadReferenceTarget as e:
4951
5570
# XXX: Would be better to just raise a nicely printable
4952
5571
# exception from the real origin. Also below. mbp 20070306
4953
raise errors.BzrCommandError("Cannot join %s. %s" %
5572
raise errors.BzrCommandError(
5573
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4957
5576
containing_tree.subsume(sub_tree)
4958
except errors.BadSubsumeSource, e:
4959
raise errors.BzrCommandError("Cannot join %s. %s" %
5577
except errors.BadSubsumeSource as e:
5578
raise errors.BzrCommandError(
5579
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4963
5582
class cmd_split(Command):
5172
5800
help='Branch to generate the submission from, '
5173
5801
'rather than the one containing the working directory.',
5174
5802
short_name='f',
5176
5804
Option('output', short_name='o',
5177
5805
help='Write merge directive to this file or directory; '
5178
5806
'use - for stdout.',
5180
5808
Option('strict',
5181
5809
help='Refuse to send if there are uncommitted changes in'
5182
5810
' the working tree, --no-strict disables the check.'),
5183
5811
Option('mail-to', help='Mail the request to this address.',
5187
Option('body', help='Body for the email.', type=unicode),
5815
Option('body', help='Body for the email.', type=text_type),
5188
5816
RegistryOption('format',
5189
5817
help='Use the specified output format.',
5190
lazy_registry=('bzrlib.send', 'format_registry')),
5818
lazy_registry=('breezy.send', 'format_registry')),
5193
5821
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5194
no_patch=False, revision=None, remember=False, output=None,
5822
no_patch=False, revision=None, remember=None, output=None,
5195
5823
format=None, mail_to=None, message=None, body=None,
5196
5824
strict=None, **kwargs):
5197
from bzrlib.send import send
5825
from .send import send
5198
5826
return send(submit_branch, revision, public_branch, remember,
5199
5827
format, no_bundle, no_patch, output,
5200
5828
kwargs.get('from', '.'), mail_to, message, body,
5321
5949
self.add_cleanup(branch.lock_write().unlock)
5323
5951
if tag_name is None:
5324
raise errors.BzrCommandError("No tag specified to delete.")
5952
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5325
5953
branch.tags.delete_tag(tag_name)
5326
self.outf.write('Deleted tag %s.\n' % tag_name)
5954
note(gettext('Deleted tag %s.') % tag_name)
5329
5957
if len(revision) != 1:
5330
raise errors.BzrCommandError(
5958
raise errors.BzrCommandError(gettext(
5331
5959
"Tags can only be placed on a single revision, "
5333
5961
revision_id = revision[0].as_revision_id(branch)
5335
5963
revision_id = branch.last_revision()
5336
5964
if tag_name is None:
5337
5965
tag_name = branch.automatic_tag_name(revision_id)
5338
5966
if tag_name is None:
5339
raise errors.BzrCommandError(
5340
"Please specify a tag name.")
5341
if (not force) and branch.tags.has_tag(tag_name):
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):
5342
5974
raise errors.TagAlreadyExists(tag_name)
5343
branch.tags.set_tag(tag_name, revision_id)
5344
self.outf.write('Created tag %s.\n' % 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)
5347
5985
class cmd_tags(Command):
5354
5992
takes_options = [
5355
5993
custom_help('directory',
5356
5994
help='Branch whose tags should be displayed.'),
5357
RegistryOption.from_kwargs('sort',
5995
RegistryOption('sort',
5358
5996
'Sort tags by different criteria.', title='Sorting',
5359
alpha='Sort tags lexicographically (default).',
5360
time='Sort tags chronologically.',
5997
lazy_registry=('breezy.tag', 'tag_sort_methods')
5366
6003
@display_command
6004
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6005
from .tag import tag_sort_methods
5373
6006
branch, relpath = Branch.open_containing(directory)
5375
tags = branch.tags.get_tag_dict().items()
6008
tags = list(viewitems(branch.tags.get_tag_dict()))
5379
6012
self.add_cleanup(branch.lock_read().unlock)
5381
graph = branch.repository.get_graph()
5382
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5383
revid1, revid2 = rev1.rev_id, rev2.rev_id
5384
# only show revisions between revid1 and revid2 (inclusive)
5385
tags = [(tag, revid) for tag, revid in tags if
5386
graph.is_between(revid, revid1, revid2)]
5389
elif sort == 'time':
5391
for tag, revid in tags:
5393
revobj = branch.repository.get_revision(revid)
5394
except errors.NoSuchRevision:
5395
timestamp = sys.maxint # place them at the end
5397
timestamp = revobj.timestamp
5398
timestamps[revid] = timestamp
5399
tags.sort(key=lambda x: timestamps[x[1]])
6014
# Restrict to the specified range
6015
tags = self._tags_for_range(branch, revision)
6017
sort = tag_sort_methods.get()
5400
6019
if not show_ids:
5401
6020
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
6021
for index, (tag, revid) in enumerate(tags):
5413
6034
for tag, revspec in tags:
5414
6035
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])
5417
6064
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
6065
__doc__ = """Reconfigure the type of a brz directory.
5420
6067
A target configuration must be specified.
5432
6079
takes_args = ['location?']
5433
6080
takes_options = [
5434
6081
RegistryOption.from_kwargs(
5436
title='Target type',
5437
help='The type to reconfigure the directory to.',
6084
help='The relation between branch and tree.',
5438
6085
value_switches=True, enum_switch=False,
5439
6086
branch='Reconfigure to be an unbound branch with no working tree.',
5440
6087
tree='Reconfigure to be an unbound branch with a working tree.',
5441
6088
checkout='Reconfigure to be a bound branch with a working tree.',
5442
6089
lightweight_checkout='Reconfigure to be a lightweight'
5443
6090
' 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,
5444
6097
standalone='Reconfigure to be a standalone branch '
5445
6098
'(i.e. stop using shared repository).',
5446
6099
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,
5447
6106
with_trees='Reconfigure repository to create '
5448
6107
'working trees on branches by default.',
5449
6108
with_no_trees='Reconfigure repository to not create '
5476
6135
# At the moment you can use --stacked-on and a different
5477
6136
# reconfiguration shape at the same time; there seems no good reason
5479
if target_type is None:
6138
if (tree_type is None and
6139
repository_type is None and
6140
repository_trees is None):
5480
6141
if stacked_on or unstacked:
5483
raise errors.BzrCommandError('No target configuration '
5485
elif target_type == 'branch':
6144
raise errors.BzrCommandError(gettext('No target configuration '
6146
reconfiguration = None
6147
if tree_type == 'branch':
5486
6148
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5487
elif target_type == 'tree':
6149
elif tree_type == 'tree':
5488
6150
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5489
elif target_type == 'checkout':
6151
elif tree_type == 'checkout':
5490
6152
reconfiguration = reconfigure.Reconfigure.to_checkout(
5491
6153
directory, bind_to)
5492
elif target_type == 'lightweight-checkout':
6154
elif tree_type == 'lightweight-checkout':
5493
6155
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5494
6156
directory, bind_to)
5495
elif target_type == 'use-shared':
6158
reconfiguration.apply(force)
6159
reconfiguration = None
6160
if repository_type == 'use-shared':
5496
6161
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5497
elif target_type == 'standalone':
6162
elif repository_type == 'standalone':
5498
6163
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5499
elif target_type == 'with-trees':
6165
reconfiguration.apply(force)
6166
reconfiguration = None
6167
if repository_trees == 'with-trees':
5500
6168
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5501
6169
directory, True)
5502
elif target_type == 'with-no-trees':
6170
elif repository_trees == 'with-no-trees':
5503
6171
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5504
6172
directory, False)
5505
reconfiguration.apply(force)
6174
reconfiguration.apply(force)
6175
reconfiguration = None
5508
6178
class cmd_switch(Command):
5531
6201
takes_args = ['to_location?']
5532
takes_options = [Option('force',
6202
takes_options = ['directory',
5533
6204
help='Switch even if local commits will be lost.'),
5535
6206
Option('create-branch', short_name='b',
5536
6207
help='Create the target branch from this one before'
5537
6208
' switching to it.'),
6210
help='Store and restore uncommitted changes in the'
5540
6214
def run(self, to_location=None, force=False, create_branch=False,
5542
from bzrlib import switch
6215
revision=None, directory=u'.', store=False):
6216
from . import switch
6217
tree_location = directory
5544
6218
revision = _get_one_revision('switch', revision)
5545
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6219
possible_transports = []
6220
control_dir = controldir.ControlDir.open_containing(tree_location,
6221
possible_transports=possible_transports)[0]
5546
6222
if to_location is None:
5547
6223
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
6224
raise errors.BzrCommandError(gettext('You must supply either a'
6225
' revision or a location'))
6226
to_location = tree_location
5552
branch = control_dir.open_branch()
6228
branch = control_dir.open_branch(
6229
possible_transports=possible_transports)
5553
6230
had_explicit_nick = branch.get_config().has_explicit_nickname()
5554
6231
except errors.NotBranchError:
5556
6233
had_explicit_nick = False
5557
6234
if create_branch:
5558
6235
if branch is None:
5559
raise errors.BzrCommandError('cannot create branch without'
5561
to_location = directory_service.directories.dereference(
5563
if '/' not in to_location and '\\' not in to_location:
5564
# This path is meant to be relative to the existing branch
5565
this_url = self._get_branch_location(control_dir)
5566
to_location = urlutils.join(this_url, '..', to_location)
5567
to_branch = branch.bzrdir.sprout(to_location,
5568
possible_transports=[branch.bzrdir.root_transport],
5569
source_branch=branch).open_branch()
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()
5572
to_branch = Branch.open(to_location)
6245
to_branch = Branch.open(to_location,
6246
possible_transports=possible_transports)
5573
6247
except errors.NotBranchError:
5574
this_url = self._get_branch_location(control_dir)
5575
to_branch = Branch.open(
5576
urlutils.join(this_url, '..', to_location))
6248
to_branch = open_sibling_branch(control_dir, to_location,
6249
possible_transports=possible_transports)
5577
6250
if revision is not None:
5578
6251
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
6252
switch.switch(control_dir, to_branch, force, revision_id=revision,
6253
store_uncommitted=store)
5580
6254
if had_explicit_nick:
5581
6255
branch = control_dir.open_branch() #get the new branch!
5582
6256
branch.nick = to_branch.nick
5583
note('Switched to branch: %s',
6257
note(gettext('Switched to branch: %s'),
5584
6258
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5586
def _get_branch_location(self, control_dir):
5587
"""Return location of branch for this control dir."""
5589
this_branch = control_dir.open_branch()
5590
# This may be a heavy checkout, where we want the master branch
5591
master_location = this_branch.get_bound_location()
5592
if master_location is not None:
5593
return master_location
5594
# If not, use a local sibling
5595
return this_branch.base
5596
except errors.NotBranchError:
5597
format = control_dir.find_branch_format()
5598
if getattr(format, 'get_reference', None) is not None:
5599
return format.get_reference(control_dir)
5601
return control_dir.root_transport.base
5604
6262
class cmd_view(Command):
5691
tree, file_list = tree_files(file_list, apply_view=False)
6349
tree, file_list = WorkingTree.open_containing_paths(file_list,
5692
6351
current_view, view_dict = tree.views.get_view_info()
5693
6352
if name is None:
5694
6353
name = current_view
5697
raise errors.BzrCommandError(
5698
"Both --delete and a file list specified")
6356
raise errors.BzrCommandError(gettext(
6357
"Both --delete and a file list specified"))
5700
raise errors.BzrCommandError(
5701
"Both --delete and --switch specified")
6359
raise errors.BzrCommandError(gettext(
6360
"Both --delete and --switch specified"))
5703
6362
tree.views.set_view_info(None, {})
5704
self.outf.write("Deleted all views.\n")
6363
self.outf.write(gettext("Deleted all views.\n"))
5705
6364
elif name is None:
5706
raise errors.BzrCommandError("No current view to delete")
6365
raise errors.BzrCommandError(gettext("No current view to delete"))
5708
6367
tree.views.delete_view(name)
5709
self.outf.write("Deleted '%s' view.\n" % name)
6368
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5712
raise errors.BzrCommandError(
5713
"Both --switch and a file list specified")
6371
raise errors.BzrCommandError(gettext(
6372
"Both --switch and a file list specified"))
5715
raise errors.BzrCommandError(
5716
"Both --switch and --all specified")
6374
raise errors.BzrCommandError(gettext(
6375
"Both --switch and --all specified"))
5717
6376
elif switch == 'off':
5718
6377
if current_view is None:
5719
raise errors.BzrCommandError("No current view to disable")
6378
raise errors.BzrCommandError(gettext("No current view to disable"))
5720
6379
tree.views.set_view_info(None, view_dict)
5721
self.outf.write("Disabled '%s' view.\n" % (current_view))
6380
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5723
6382
tree.views.set_view_info(switch, view_dict)
5724
6383
view_str = views.view_display_str(tree.views.lookup_view())
5725
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6384
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5728
self.outf.write('Views defined:\n')
6387
self.outf.write(gettext('Views defined:\n'))
5729
6388
for view in sorted(view_dict):
5730
6389
if view == current_view:
5734
6393
view_str = views.view_display_str(view_dict[view])
5735
6394
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5737
self.outf.write('No views defined.\n')
6396
self.outf.write(gettext('No views defined.\n'))
5738
6397
elif file_list:
5739
6398
if name is None:
5740
6399
# No name given and no current view set
5742
6401
elif name == 'off':
5743
raise errors.BzrCommandError(
5744
"Cannot change the 'off' pseudo view")
6402
raise errors.BzrCommandError(gettext(
6403
"Cannot change the 'off' pseudo view"))
5745
6404
tree.views.set_view(name, sorted(file_list))
5746
6405
view_str = views.view_display_str(tree.views.lookup_view())
5747
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6406
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5749
6408
# list the files
5750
6409
if name is None:
5751
6410
# No name given and no current view set
5752
self.outf.write('No current view.\n')
6411
self.outf.write(gettext('No current view.\n'))
5754
6413
view_str = views.view_display_str(tree.views.lookup_view(name))
5755
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6414
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5758
6417
class cmd_hooks(Command):
5786
6445
Remove the branch at repo/trunk::
5788
bzr remove-branch repo/trunk
6447
brz remove-branch repo/trunk
5792
6451
takes_args = ["location?"]
6453
takes_options = ['directory',
6454
Option('force', help='Remove branch even if it is the active branch.')]
5794
6456
aliases = ["rmbranch"]
5796
def run(self, location=None):
5797
if location is None:
5799
branch = Branch.open_containing(location)[0]
5800
branch.bzrdir.destroy_branch()
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)
5803
6472
class cmd_shelve(Command):
5804
6473
__doc__ = """Temporarily set aside some changes from the current tree.
5824
6493
You can put multiple items on the shelf, and by default, 'unshelve' will
5825
6494
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.
5828
6509
takes_args = ['file*']
5830
6511
takes_options = [
5832
6514
Option('all', help='Shelve all changes.'),
5834
6516
RegistryOption('writer', 'Method to use for writing diffs.',
5835
bzrlib.option.diff_writer_registry,
6517
breezy.option.diff_writer_registry,
5836
6518
value_switches=True, enum_switch=False),
5838
6520
Option('list', help='List shelved changes.'),
5839
6521
Option('destroy',
5840
6522
help='Destroy removed changes instead of shelving them.'),
5842
_see_also = ['unshelve']
6524
_see_also = ['unshelve', 'configuration']
5844
6526
def run(self, revision=None, all=False, file_list=None, message=None,
5845
writer=None, list=False, destroy=False):
6527
writer=None, list=False, destroy=False, directory=None):
5847
return self.run_for_list()
5848
from bzrlib.shelf_ui import Shelver
6529
return self.run_for_list(directory=directory)
6530
from .shelf_ui import Shelver
5849
6531
if writer is None:
5850
writer = bzrlib.option.diff_writer_registry.get()
6532
writer = breezy.option.diff_writer_registry.get()
5852
6534
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
6535
file_list, message, destroy=destroy, directory=directory)
5924
6609
takes_options = ['directory',
5925
6610
Option('ignored', help='Delete all ignored files.'),
5926
Option('detritus', help='Delete conflict files, merge'
6611
Option('detritus', help='Delete conflict files, merge and revert'
5927
6612
' backups, and failed selftest dirs.'),
5928
6613
Option('unknown',
5929
help='Delete files unknown to bzr (default).'),
6614
help='Delete files unknown to brz (default).'),
5930
6615
Option('dry-run', help='Show files to delete instead of'
5931
6616
' deleting them.'),
5932
6617
Option('force', help='Do not prompt before deleting.')]
5933
6618
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5934
6619
force=False, directory=u'.'):
5935
from bzrlib.clean_tree import clean_tree
6620
from .clean_tree import clean_tree
5936
6621
if not (unknown or ignored or detritus):
5988
6673
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(".")
5991
6741
def _register_lazy_builtins():
5992
6742
# register lazy builtins from other modules; called at startup and should
5993
6743
# be only called once.
5994
6744
for (name, aliases, module_name) in [
5995
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5996
('cmd_dpush', [], 'bzrlib.foreign'),
5997
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5998
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5999
('cmd_conflicts', [], 'bzrlib.conflicts'),
6000
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
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'),
6002
6757
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
breezy/builtins.py
