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.bzr import (
63
from breezy.branch import Branch
64
from breezy.conflicts import ConflictList
65
from breezy.transport import memory
66
from breezy.revisionspec import RevisionSpec, RevisionInfo
67
from breezy.smtp_connection import SMTPConnection
68
from breezy.workingtree import WorkingTree
69
from breezy.i18n import gettext, ngettext
63
from bzrlib.commands import (
72
from .commands import (
65
74
builtin_command_registry,
68
from bzrlib.option import (
73
82
_parse_revision_str,
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
90
from .trace import mutter, note, warning, is_quiet, get_verbosity_level
93
def _get_branch_location(control_dir, possible_transports=None):
94
"""Return location of branch for this control dir."""
96
target = control_dir.get_branch_reference()
97
except errors.NotBranchError:
98
return control_dir.root_transport.base
99
if target is not None:
101
this_branch = control_dir.open_branch(
102
possible_transports=possible_transports)
103
# This may be a heavy checkout, where we want the master branch
104
master_location = this_branch.get_bound_location()
105
if master_location is not None:
106
return master_location
107
# If not, use a local sibling
108
return this_branch.base
111
def _is_colocated(control_dir, possible_transports=None):
112
"""Check if the branch in control_dir is colocated.
114
:param control_dir: Control directory
115
:return: Tuple with boolean indicating whether the branch is colocated
116
and the full URL to the actual branch
118
# This path is meant to be relative to the existing branch
119
this_url = _get_branch_location(control_dir,
120
possible_transports=possible_transports)
121
# Perhaps the target control dir supports colocated branches?
123
root = controldir.ControlDir.open(this_url,
124
possible_transports=possible_transports)
125
except errors.NotBranchError:
126
return (False, this_url)
129
wt = control_dir.open_workingtree()
130
except (errors.NoWorkingTree, errors.NotLocalUrl):
131
return (False, this_url)
134
root._format.colocated_branches and
135
control_dir.control_url == root.control_url,
139
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
140
"""Lookup the location for a new sibling branch.
142
:param control_dir: Control directory to find sibling branches from
143
:param location: Name of the new branch
144
:return: Full location to the new branch
146
location = directory_service.directories.dereference(location)
147
if '/' not in location and '\\' not in location:
148
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
151
return urlutils.join_segment_parameters(this_url,
152
{"branch": urlutils.escape(location)})
154
return urlutils.join(this_url, '..', urlutils.escape(location))
158
def open_sibling_branch(control_dir, location, possible_transports=None):
159
"""Open a branch, possibly a sibling of another.
161
:param control_dir: Control directory relative to which to lookup the
163
:param location: Location to look up
164
:return: branch to open
167
# Perhaps it's a colocated branch?
168
return control_dir.open_branch(location,
169
possible_transports=possible_transports)
170
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
171
this_url = _get_branch_location(control_dir)
174
this_url, '..', urlutils.escape(location)))
177
def open_nearby_branch(near=None, location=None, possible_transports=None):
178
"""Open a nearby branch.
180
:param near: Optional location of container from which to open branch
181
:param location: Location of the branch
182
:return: Branch instance
188
return Branch.open(location,
189
possible_transports=possible_transports)
190
except errors.NotBranchError:
192
cdir = controldir.ControlDir.open(near,
193
possible_transports=possible_transports)
194
return open_sibling_branch(cdir, location,
195
possible_transports=possible_transports)
198
def iter_sibling_branches(control_dir, possible_transports=None):
199
"""Iterate over the siblings of a branch.
201
:param control_dir: Control directory for which to look up the siblings
202
:return: Iterator over tuples with branch name and branch object
206
reference = control_dir.get_branch_reference()
207
except errors.NotBranchError:
208
# There is no active branch, just return the colocated branches.
209
for name, branch in viewitems(control_dir.get_branches()):
212
if reference is not None:
213
ref_branch = Branch.open(reference,
214
possible_transports=possible_transports)
217
if ref_branch is None or ref_branch.name:
218
if ref_branch is not None:
219
control_dir = ref_branch.controldir
220
for name, branch in viewitems(control_dir.get_branches()):
223
repo = ref_branch.controldir.find_repository()
224
for branch in repo.find_branches(using=True):
225
name = urlutils.relative_url(repo.user_url,
226
branch.user_url).rstrip("/")
88
230
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
295
def _get_view_info_for_change_reporter(tree):
224
296
"""Get the view information from a tree for change reporting."""
364
446
def run(self, revision_id=None, revision=None, directory=u'.'):
365
447
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')
448
raise errors.BzrCommandError(gettext('You can only supply one of'
449
' revision_id or --revision'))
368
450
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
451
raise errors.BzrCommandError(gettext('You must supply either'
452
' --revision or a revision_id'))
454
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
373
456
revisions = b.repository.revisions
374
457
if revisions is None:
375
raise errors.BzrCommandError('Repository %r does not support '
376
'access to raw revision texts')
458
raise errors.BzrCommandError(gettext('Repository %r does not support '
459
'access to raw revision texts'))
378
461
b.repository.lock_read()
380
463
# TODO: jam 20060112 should cat-revision always output utf-8?
381
464
if revision_id is not None:
382
revision_id = osutils.safe_revision_id(revision_id, warn=False)
465
revision_id = cache_utf8.encode(revision_id)
384
467
self.print_revision(revisions, revision_id)
385
468
except errors.NoSuchRevision:
386
msg = "The repository %s contains no revision %s." % (
469
msg = gettext("The repository {0} contains no revision {1}.").format(
387
470
b.repository.base, revision_id)
388
471
raise errors.BzrCommandError(msg)
389
472
elif revision is not None:
390
473
for rev in revision:
392
475
raise errors.BzrCommandError(
393
'You cannot specify a NULL revision.')
476
gettext('You cannot specify a NULL revision.'))
394
477
rev_id = rev.as_revision_id(b)
395
478
self.print_revision(revisions, rev_id)
499
585
location_list=['.']
501
587
for location in location_list:
502
d = bzrdir.BzrDir.open(location)
588
d = controldir.ControlDir.open(location)
505
591
working = d.open_workingtree()
506
592
except errors.NoWorkingTree:
507
raise errors.BzrCommandError("No working tree to remove")
593
raise errors.BzrCommandError(gettext("No working tree to remove"))
508
594
except errors.NotLocalUrl:
509
raise errors.BzrCommandError("You cannot remove the working tree"
595
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
596
" of a remote path"))
512
598
if (working.has_changes()):
513
599
raise errors.UncommittedChanges(working)
600
if working.get_shelf_manager().last_shelf() is not None:
601
raise errors.ShelvedChanges(working)
515
603
if working.user_url != working.branch.user_url:
516
raise errors.BzrCommandError("You cannot remove the working tree"
517
" from a lightweight checkout")
604
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
605
" from a lightweight checkout"))
519
607
d.destroy_workingtree()
610
class cmd_repair_workingtree(Command):
611
__doc__ = """Reset the working tree state file.
613
This is not meant to be used normally, but more as a way to recover from
614
filesystem corruption, etc. This rebuilds the working inventory back to a
615
'known good' state. Any new modifications (adding a file, renaming, etc)
616
will be lost, though modified files will still be detected as such.
618
Most users will want something more like "brz revert" or "brz update"
619
unless the state file has become corrupted.
621
By default this attempts to recover the current state by looking at the
622
headers of the state file. If the state file is too corrupted to even do
623
that, you can supply --revision to force the state of the tree.
626
takes_options = ['revision', 'directory',
628
help='Reset the tree even if it doesn\'t appear to be'
633
def run(self, revision=None, directory='.', force=False):
634
tree, _ = WorkingTree.open_containing(directory)
635
self.add_cleanup(tree.lock_tree_write().unlock)
639
except errors.BzrError:
640
pass # There seems to be a real error here, so we'll reset
643
raise errors.BzrCommandError(gettext(
644
'The tree does not appear to be corrupt. You probably'
645
' want "brz revert" instead. Use "--force" if you are'
646
' sure you want to reset the working tree.'))
650
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
652
tree.reset_state(revision_ids)
653
except errors.BzrError as e:
654
if revision_ids is None:
655
extra = (gettext(', the header appears corrupt, try passing -r -1'
656
' to set the state to the last commit'))
659
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
522
662
class cmd_revno(Command):
523
663
__doc__ = """Show current revision number.
528
668
_see_also = ['info']
529
669
takes_args = ['location?']
530
670
takes_options = [
531
Option('tree', help='Show revno of working tree'),
671
Option('tree', help='Show revno of working tree.'),
535
def run(self, tree=False, location=u'.'):
676
def run(self, tree=False, location=u'.', revision=None):
677
if revision is not None and tree:
678
raise errors.BzrCommandError(gettext("--tree and --revision can "
679
"not be used together"))
538
683
wt = WorkingTree.open_containing(location)[0]
539
684
self.add_cleanup(wt.lock_read().unlock)
540
685
except (errors.NoWorkingTree, errors.NotLocalUrl):
541
686
raise errors.NoWorkingTree(location)
542
688
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
690
b = Branch.open_containing(location)[0]
550
691
self.add_cleanup(b.lock_read().unlock)
693
if len(revision) != 1:
694
raise errors.BzrCommandError(gettext(
695
"Revision numbers only make sense for single "
696
"revisions, not ranges"))
697
revid = revision[0].as_revision_id(b)
699
revid = b.last_revision()
701
revno_t = b.revision_id_to_dotted_revno(revid)
702
except errors.NoSuchRevision:
704
revno = ".".join(str(n) for n in revno_t)
552
705
self.cleanup_now()
553
self.outf.write(str(revno) + '\n')
706
self.outf.write(revno + '\n')
556
709
class cmd_revision_info(Command):
826
1014
return self.run_auto(names_list, after, dry_run)
828
raise errors.BzrCommandError('--dry-run requires --auto.')
1016
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
829
1017
if names_list is None:
831
1019
if len(names_list) < 2:
832
raise errors.BzrCommandError("missing file argument")
833
tree, rel_names = tree_files(names_list, canonicalize=False)
1020
raise errors.BzrCommandError(gettext("missing file argument"))
1021
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1022
for file_name in rel_names[0:-1]:
1024
raise errors.BzrCommandError(gettext("can not move root of branch"))
834
1025
self.add_cleanup(tree.lock_tree_write().unlock)
835
1026
self._run(tree, names_list, rel_names, after)
837
1028
def run_auto(self, names_list, after, dry_run):
838
1029
if names_list is not None and len(names_list) > 1:
839
raise errors.BzrCommandError('Only one path may be specified to'
1030
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='.')
1033
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1035
work_tree, file_list = WorkingTree.open_containing_paths(
1036
names_list, default_directory='.')
845
1037
self.add_cleanup(work_tree.lock_tree_write().unlock)
846
1038
rename_map.RenameMap.guess_renames(work_tree, dry_run)
1060
1276
considered diverged if the destination branch's most recent commit is one
1061
1277
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
1279
If branches have diverged, you can use 'brz push --overwrite' to replace
1064
1280
the other branch completely, discarding its unmerged changes.
1066
1282
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.
1283
do a merge (see brz help merge) from the other branch, and commit that.
1068
1284
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.
1286
If there is no default push location set, the first push will set it (use
1287
--no-remember to avoid setting it). After that, you can omit the
1288
location to use the default. To change the default, use --remember. The
1289
value will only be saved if the remote location can be accessed.
1291
The --verbose option will display the revisions pushed using the log_format
1292
configuration option. You can use a different format by overriding it with
1293
-Olog_format=<other_format>.
1076
1296
_see_also = ['pull', 'update', 'working-trees']
1093
1313
help='Create a stacked branch that refers to another branch '
1094
1314
'for the commit history. Only the work not present in the '
1095
1315
'referenced branch is included in the branch created.',
1097
1317
Option('strict',
1098
1318
help='Refuse to push if there are uncommitted changes in'
1099
1319
' the working tree, --no-strict disables the check.'),
1321
help="Don't populate the working tree, even for protocols"
1322
" that support it."),
1323
Option('overwrite-tags',
1324
help="Overwrite tags only."),
1101
1326
takes_args = ['location?']
1102
1327
encoding_type = 'replace'
1104
def run(self, location=None, remember=False, overwrite=False,
1329
def run(self, location=None, remember=None, overwrite=False,
1105
1330
create_prefix=False, verbose=False, revision=None,
1106
1331
use_existing_dir=False, directory=None, stacked_on=None,
1107
stacked=False, strict=None):
1108
from bzrlib.push import _show_push_branch
1332
stacked=False, strict=None, no_tree=False,
1333
overwrite_tags=False):
1334
from .push import _show_push_branch
1337
overwrite = ["history", "tags"]
1338
elif overwrite_tags:
1339
overwrite = ["tags"]
1110
1343
if directory is None:
1111
1344
directory = '.'
1112
1345
# Get the source branch
1113
1346
(tree, br_from,
1114
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1347
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1115
1348
# Get the tip's revision_id
1116
1349
revision = _get_one_revision('push', revision)
1117
1350
if revision is not None:
1138
1371
# error by the feedback given to them. RBC 20080227.
1139
1372
stacked_on = parent_url
1140
1373
if not stacked_on:
1141
raise errors.BzrCommandError(
1142
"Could not determine branch to refer to.")
1374
raise errors.BzrCommandError(gettext(
1375
"Could not determine branch to refer to."))
1144
1377
# Get the destination location
1145
1378
if location is None:
1146
1379
stored_loc = br_from.get_push_location()
1147
1380
if stored_loc is None:
1148
raise errors.BzrCommandError(
1149
"No push location known or specified.")
1381
parent_loc = br_from.get_parent()
1383
raise errors.BzrCommandError(gettext(
1384
"No push location known or specified. To push to the "
1385
"parent branch (at %s), use 'brz push :parent'." %
1386
urlutils.unescape_for_display(parent_loc,
1387
self.outf.encoding)))
1389
raise errors.BzrCommandError(gettext(
1390
"No push location known or specified."))
1151
1392
display_url = urlutils.unescape_for_display(stored_loc,
1152
1393
self.outf.encoding)
1153
self.outf.write("Using saved push location: %s\n" % display_url)
1394
note(gettext("Using saved push location: %s") % display_url)
1154
1395
location = stored_loc
1156
1397
_show_push_branch(br_from, revision_id, location, self.outf,
1157
1398
verbose=verbose, overwrite=overwrite, remember=remember,
1158
1399
stacked_on=stacked_on, create_prefix=create_prefix,
1159
use_existing_dir=use_existing_dir)
1400
use_existing_dir=use_existing_dir, no_tree=no_tree)
1162
1403
class cmd_branch(Command):
1197
1440
help="Bind new branch to from location."),
1199
aliases = ['get', 'clone']
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
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1450
if not (hardlink or files_from):
1451
# accelerator_tree is usually slower because you have to read N
1452
# files (no readahead, lots of seeks, etc), but allow the user to
1453
# explicitly request it
1454
accelerator_tree = None
1455
if files_from is not None and files_from != from_location:
1456
accelerator_tree = WorkingTree.open(files_from)
1208
1457
revision = _get_one_revision('branch', revision)
1209
1458
self.add_cleanup(br_from.lock_read().unlock)
1210
1459
if revision is not None:
1216
1465
revision_id = br_from.last_revision()
1217
1466
if to_location is None:
1218
to_location = urlutils.derive_to_location(from_location)
1467
to_location = getattr(br_from, "name", None)
1469
to_location = urlutils.derive_to_location(from_location)
1219
1470
to_transport = transport.get_transport(to_location)
1221
1472
to_transport.mkdir('.')
1222
1473
except errors.FileExists:
1223
if not use_existing_dir:
1224
raise errors.BzrCommandError('Target directory "%s" '
1225
'already exists.' % to_location)
1475
to_dir = controldir.ControlDir.open_from_transport(
1477
except errors.NotBranchError:
1478
if not use_existing_dir:
1479
raise errors.BzrCommandError(gettext('Target directory "%s" '
1480
'already exists.') % to_location)
1228
bzrdir.BzrDir.open_from_transport(to_transport)
1485
to_dir.open_branch()
1229
1486
except errors.NotBranchError:
1232
1489
raise errors.AlreadyBranchError(to_location)
1233
1490
except errors.NoSuchFile:
1234
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1491
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)
1497
# preserve whatever source format we have.
1498
to_dir = br_from.controldir.sprout(
1499
to_transport.base, revision_id,
1500
possible_transports=[to_transport],
1501
accelerator_tree=accelerator_tree, hardlink=hardlink,
1502
stacked=stacked, force_new_repo=standalone,
1503
create_tree_if_local=not no_tree, source_branch=br_from)
1504
branch = to_dir.open_branch(
1505
possible_transports=[
1506
br_from.controldir.root_transport, to_transport])
1507
except errors.NoSuchRevision:
1508
to_transport.delete_tree('.')
1509
msg = gettext("The branch {0} has no revision {1}.").format(
1510
from_location, revision)
1511
raise errors.BzrCommandError(msg)
1514
to_repo = to_dir.open_repository()
1515
except errors.NoRepositoryPresent:
1516
to_repo = to_dir.create_repository()
1517
to_repo.fetch(br_from.repository, revision_id=revision_id)
1518
branch = br_from.sprout(to_dir, revision_id=revision_id)
1519
br_from.tags.merge_to(branch.tags)
1252
1521
# If the source branch is stacked, the new branch may
1253
1522
# be stacked whether we asked for that explicitly or not.
1254
1523
# We therefore need a try/except here and not just 'if stacked:'
1256
note('Created new stacked branch referring to %s.' %
1525
note(gettext('Created new stacked branch referring to %s.') %
1257
1526
branch.get_stacked_on_url())
1258
1527
except (errors.NotStacked, errors.UnstackableBranchFormat,
1259
errors.UnstackableRepositoryFormat), e:
1260
note('Branched %d revision(s).' % branch.revno())
1528
errors.UnstackableRepositoryFormat) as e:
1529
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1262
1531
# Bind to the parent
1263
1532
parent_branch = Branch.open(from_location)
1264
1533
branch.bind(parent_branch)
1265
note('New branch bound to %s' % from_location)
1534
note(gettext('New branch bound to %s') % from_location)
1267
1536
# Switch to the new branch
1268
1537
wt, _ = WorkingTree.open_containing('.')
1269
_mod_switch.switch(wt.bzrdir, branch)
1270
note('Switched to branch: %s',
1538
_mod_switch.switch(wt.controldir, branch)
1539
note(gettext('Switched to branch: %s'),
1271
1540
urlutils.unescape_for_display(branch.base, 'utf-8'))
1543
class cmd_branches(Command):
1544
__doc__ = """List the branches available at the current location.
1546
This command will print the names of all the branches at the current
1550
takes_args = ['location?']
1552
Option('recursive', short_name='R',
1553
help='Recursively scan for branches rather than '
1554
'just looking in the specified location.')]
1556
def run(self, location=".", recursive=False):
1558
t = transport.get_transport(location)
1559
if not t.listable():
1560
raise errors.BzrCommandError(
1561
"Can't scan this type of location.")
1562
for b in controldir.ControlDir.find_branches(t):
1563
self.outf.write("%s\n" % urlutils.unescape_for_display(
1564
urlutils.relative_url(t.base, b.base),
1565
self.outf.encoding).rstrip("/"))
1567
dir = controldir.ControlDir.open_containing(location)[0]
1569
active_branch = dir.open_branch(name="")
1570
except errors.NotBranchError:
1571
active_branch = None
1573
for name, branch in iter_sibling_branches(dir):
1576
active = (active_branch is not None and
1577
active_branch.base == branch.base)
1578
names[name] = active
1579
# Only mention the current branch explicitly if it's not
1580
# one of the colocated branches
1581
if not any(viewvalues(names)) and active_branch is not None:
1582
self.outf.write("* %s\n" % gettext("(default)"))
1583
for name in sorted(names):
1584
active = names[name]
1589
self.outf.write("%s %s\n" % (
1590
prefix, name.encode(self.outf.encoding)))
1274
1593
class cmd_checkout(Command):
1275
1594
__doc__ = """Create a new checkout of an existing branch.
1378
1695
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
1696
__doc__ = """Update a working tree to a new revision.
1698
This will perform a merge of the destination revision (the tip of the
1699
branch, or the specified revision) into the working tree, and then make
1700
that revision the basis revision for the working tree.
1702
You can use this to visit an older revision, or to update a working tree
1703
that is out of date from its branch.
1705
If there are any uncommitted changes in the tree, they will be carried
1706
across and remain as uncommitted changes after the update. To discard
1707
these changes, use 'brz revert'. The uncommitted changes may conflict
1708
with the changes brought in by the change in basis revision.
1710
If the tree's branch is bound to a master branch, brz will also update
1389
1711
the branch from the master.
1713
You cannot update just a single file or directory, because each Bazaar
1714
working tree has just a single basis revision. If you want to restore a
1715
file that has been removed locally, use 'brz revert' instead of 'brz
1716
update'. If you want to restore a file to its state in a previous
1717
revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write
1718
out the old content of that file to a new location.
1720
The 'dir' argument, if given, must be the location of the root of a
1721
working tree to update. By default, the working tree that contains the
1722
current working directory is used.
1392
1725
_see_also = ['pull', 'working-trees', 'status-flags']
1393
1726
takes_args = ['dir?']
1394
takes_options = ['revision']
1727
takes_options = ['revision',
1729
help="Show base revision text in conflicts."),
1395
1731
aliases = ['up']
1397
def run(self, dir='.', revision=None):
1733
def run(self, dir=None, revision=None, show_base=None):
1398
1734
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]
1735
raise errors.brzCommandError(gettext(
1736
"brz update --revision takes exactly one revision"))
1738
tree = WorkingTree.open_containing('.')[0]
1740
tree, relpath = WorkingTree.open_containing(dir)
1743
raise errors.BzrCommandError(gettext(
1744
"brz update can only update a whole tree, "
1745
"not a file or subdirectory"))
1402
1746
branch = tree.branch
1403
1747
possible_transports = []
1404
1748
master = branch.get_master_branch(
1440
1784
change_reporter,
1441
1785
possible_transports=possible_transports,
1442
1786
revision=revision_id,
1444
except errors.NoSuchRevision, e:
1445
raise errors.BzrCommandError(
1788
show_base=show_base)
1789
except errors.NoSuchRevision as e:
1790
raise errors.BzrCommandError(gettext(
1446
1791
"branch has no revision %s\n"
1447
"bzr update --revision only works"
1448
" for a revision in the branch history"
1792
"brz update --revision only works"
1793
" for a revision in the branch history")
1449
1794
% (e.revision))
1450
1795
revno = tree.branch.revision_id_to_dotted_revno(
1451
1796
_mod_revision.ensure_null(tree.last_revision()))
1452
note('Updated to revision %s of branch %s' %
1453
('.'.join(map(str, revno)), branch_location))
1797
note(gettext('Updated to revision {0} of branch {1}').format(
1798
'.'.join(map(str, revno)), branch_location))
1454
1799
parent_ids = tree.get_parent_ids()
1455
1800
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'.")
1801
note(gettext('Your local commits will now show as pending merges with '
1802
"'brz status', and can be committed with 'brz commit'."))
1458
1803
if conflicts != 0:
1519
1865
RegistryOption.from_kwargs('file-deletion-strategy',
1520
1866
'The file deletion mode to be used.',
1521
1867
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.')]
1868
safe='Backup changed files (default).',
1869
keep='Delete from brz but leave the working copy.',
1870
no_backup='Don\'t backup changed files.'),
1527
1872
aliases = ['rm', 'del']
1528
1873
encoding_type = 'replace'
1530
1875
def run(self, file_list, verbose=False, new=False,
1531
1876
file_deletion_strategy='safe'):
1532
tree, file_list = tree_files(file_list)
1878
tree, file_list = WorkingTree.open_containing_paths(file_list)
1534
1880
if file_list is not None:
1535
1881
file_list = [f for f in file_list]
1730
2092
to_transport.ensure_base()
1731
2093
except errors.NoSuchFile:
1732
2094
if not create_prefix:
1733
raise errors.BzrCommandError("Parent directory of %s"
2095
raise errors.BzrCommandError(gettext("Parent directory of %s"
1734
2096
" does not exist."
1735
2097
"\nYou may supply --create-prefix to create all"
1736
" leading parent directories."
2098
" leading parent directories.")
1738
2100
to_transport.create_prefix()
1741
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2103
a_controldir = controldir.ControlDir.open_from_transport(to_transport)
1742
2104
except errors.NotBranchError:
1743
2105
# really a NotBzrDir error...
1744
create_branch = bzrdir.BzrDir.create_branch_convenience
2106
create_branch = controldir.ControlDir.create_branch_convenience
2108
force_new_tree = False
2110
force_new_tree = None
1745
2111
branch = create_branch(to_transport.base, format=format,
1746
possible_transports=[to_transport])
1747
a_bzrdir = branch.bzrdir
2112
possible_transports=[to_transport],
2113
force_new_tree=force_new_tree)
2114
a_controldir = branch.controldir
1749
from bzrlib.transport.local import LocalTransport
1750
if a_bzrdir.has_branch():
2116
from .transport.local import LocalTransport
2117
if a_controldir.has_branch():
1751
2118
if (isinstance(to_transport, LocalTransport)
1752
and not a_bzrdir.has_workingtree()):
2119
and not a_controldir.has_workingtree()):
1753
2120
raise errors.BranchExistsWithoutWorkingTree(location)
1754
2121
raise errors.AlreadyBranchError(location)
1755
branch = a_bzrdir.create_branch()
1756
a_bzrdir.create_workingtree()
2122
branch = a_controldir.create_branch()
2123
if not no_tree and not a_controldir.has_workingtree():
2124
a_controldir.create_workingtree()
1757
2125
if append_revisions_only:
1759
2127
branch.set_append_revisions_only(True)
1760
2128
except errors.UpgradeRequired:
1761
raise errors.BzrCommandError('This branch format cannot be set'
1762
' to append-revisions-only. Try --default.')
2129
raise errors.BzrCommandError(gettext('This branch format cannot be set'
2130
' to append-revisions-only. Try --default.'))
1763
2131
if not is_quiet():
1764
from bzrlib.info import describe_layout, describe_format
2132
from .info import describe_layout, describe_format
1766
tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
2134
tree = a_controldir.open_workingtree(recommend_upgrade=False)
1767
2135
except (errors.NoWorkingTree, errors.NotLocalUrl):
1769
2137
repository = branch.repository
1770
2138
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))
2139
format = describe_format(a_controldir, repository, branch, tree)
2140
self.outf.write(gettext("Created a {0} (format: {1})\n").format(
1773
2142
if repository.is_shared():
1774
2143
#XXX: maybe this can be refactored into transport.path_or_url()
1775
url = repository.bzrdir.root_transport.external_url()
2144
url = repository.controldir.root_transport.external_url()
1777
2146
url = urlutils.local_path_from_url(url)
1778
except errors.InvalidURL:
2147
except urlutils.InvalidURL:
1780
self.outf.write("Using shared repository: %s\n" % url)
2149
self.outf.write(gettext("Using shared repository: %s\n") % url)
1783
2152
class cmd_init_repository(Command):
1825
2194
def run(self, location, format=None, no_trees=False):
1826
2195
if format is None:
1827
format = bzrdir.format_registry.make_bzrdir('default')
2196
format = controldir.format_registry.make_controldir('default')
1829
2198
if location is None:
1832
2201
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)
2203
(repo, newdir, require_stacking, repository_policy) = (
2204
format.initialize_on_transport_ex(to_transport,
2205
create_prefix=True, make_working_trees=not no_trees,
2206
shared_repo=True, force_new_repo=True,
2207
use_existing_dir=True,
2208
repo_format_name=format.repository_format.get_format_string()))
1838
2209
if not is_quiet():
1839
from bzrlib.info import show_bzrdir_info
1840
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2210
from .info import show_bzrdir_info
2211
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1843
2214
class cmd_diff(Command):
1863
2241
Shows the difference in the working tree versus the last commit::
1867
2245
Difference between the working tree and revision 1::
1871
2249
Difference between revision 3 and revision 1::
1875
2253
Difference between revision 3 and revision 1 for branch xxx::
1879
To see the changes introduced in revision X::
2257
The changes introduced by revision 2 (equivalent to -r1..2)::
2261
To see the changes introduced by revision X::
1883
2265
Note that in the case of a merge, the -c option shows the changes
1884
2266
compared to the left hand parent. To see the changes against
1885
2267
another parent, use::
1887
bzr diff -r<chosen_parent>..X
1889
The changes introduced by revision 2 (equivalent to -r1..2)::
2269
brz diff -r<chosen_parent>..X
2271
The changes between the current revision and the previous revision
2272
(equivalent to -c-1 and -r-2..-1)
1893
2276
Show just the differences for file NEWS::
1897
2280
Show the differences in working tree xxx for file NEWS::
1901
2284
Show the differences from branch xxx to this working tree:
1905
2288
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/
2290
brz diff --old xxx --new yyy NEWS
2292
Same as 'brz diff' but prefix paths with old/ and new/::
2294
brz diff --prefix old/:new/
2296
Show the differences using a custom diff program with options::
2298
brz diff --using /usr/bin/diff --diff-options -wu
1913
2300
_see_also = ['status']
1914
2301
takes_args = ['file*']
1921
2308
'two values separated by a colon. (eg "old/:new/").'),
1923
2310
help='Branch/tree to compare from.',
1927
2314
help='Branch/tree to compare to.',
1932
2319
Option('using',
1933
2320
help='Use this command to compare files.',
1936
2323
RegistryOption('format',
1937
2325
help='Diff format to use.',
1938
lazy_registry=('bzrlib.diff', 'format_registry'),
1939
value_switches=False, title='Diff format'),
2326
lazy_registry=('breezy.diff', 'format_registry'),
2327
title='Diff format'),
2329
help='How many lines of context to show.',
1941
2333
aliases = ['di', 'dif']
1942
2334
encoding_type = 'exact'
1944
2336
@display_command
1945
2337
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,
2338
prefix=None, old=None, new=None, using=None, format=None,
2340
from .diff import (get_trees_and_branches_to_diff_locked,
1948
2341
show_diff_trees)
1950
if (prefix is None) or (prefix == '0'):
1951
2344
# diff -p0 format
2347
elif prefix == '1' or prefix is None:
1955
2348
old_label = 'old/'
1956
2349
new_label = 'new/'
1957
2350
elif ':' in prefix:
1958
2351
old_label, new_label = prefix.split(":")
1960
raise errors.BzrCommandError(
2353
raise errors.BzrCommandError(gettext(
1961
2354
'--prefix expects two values separated by a colon'
1962
' (eg "old/:new/")')
2355
' (eg "old/:new/")'))
1964
2357
if revision and len(revision) > 2:
1965
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1966
' one or two revision specifiers')
2358
raise errors.BzrCommandError(gettext('brz diff --revision takes exactly'
2359
' one or two revision specifiers'))
1968
2361
if using is not None and format is not None:
1969
raise errors.BzrCommandError('--using and --format are mutually '
2362
raise errors.BzrCommandError(gettext(
2363
'{0} and {1} are mutually exclusive').format(
2364
'--using', '--format'))
1972
2366
(old_tree, new_tree,
1973
2367
old_branch, new_branch,
1974
2368
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1975
2369
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2370
# GNU diff on Windows uses ANSI encoding for filenames
2371
path_encoding = osutils.get_diff_header_encoding()
1976
2372
return show_diff_trees(old_tree, new_tree, sys.stdout,
1977
2373
specific_files=specific_files,
1978
2374
external_diff_options=diff_options,
1979
2375
old_label=old_label, new_label=new_label,
1980
extra_trees=extra_trees, using=using,
2376
extra_trees=extra_trees,
2377
path_encoding=path_encoding,
2378
using=using, context=context,
1981
2379
format_cls=format)
2217
2619
top = log -l10 --line
2218
2620
show = log -v -p
2220
``bzr tip`` will then show the latest revision while ``bzr top``
2622
``brz tip`` will then show the latest revision while ``brz top``
2221
2623
will show the last 10 mainline revisions. To see the details of a
2222
particular revision X, ``bzr show -rX``.
2624
particular revision X, ``brz show -rX``.
2224
2626
If you are interested in looking deeper into a particular merge X,
2225
use ``bzr log -n0 -rX``.
2627
use ``brz log -n0 -rX``.
2227
``bzr log -v`` on a branch with lots of history is currently
2629
``brz log -v`` on a branch with lots of history is currently
2228
2630
very slow. A fix for this issue is currently under development.
2229
2631
With or without that fix, it is recommended that a revision range
2230
2632
be given when using the -v option.
2232
bzr has a generic full-text matching plugin, bzr-search, that can be
2634
brz has a generic full-text matching plugin, brz-search, that can be
2233
2635
used to find revisions matching user names, commit messages, etc.
2234
2636
Among other features, this plugin can find all revisions containing
2235
2637
a list of words but not others.
2278
2680
Option('show-diff',
2279
2681
short_name='p',
2280
2682
help='Show changes made in each revision as a patch.'),
2281
Option('include-merges',
2683
Option('include-merged',
2282
2684
help='Show merged revisions like --levels 0 does.'),
2685
Option('include-merges', hidden=True,
2686
help='Historical alias for --include-merged.'),
2687
Option('omit-merges',
2688
help='Do not report commits with more than one parent.'),
2283
2689
Option('exclude-common-ancestry',
2284
2690
help='Display only the revisions that are not part'
2285
' of both ancestries (require -rX..Y)'
2691
' of both ancestries (require -rX..Y).'
2693
Option('signatures',
2694
help='Show digital signature validity.'),
2697
help='Show revisions whose properties match this '
2700
ListOption('match-message',
2701
help='Show revisions whose message matches this '
2704
ListOption('match-committer',
2705
help='Show revisions whose committer matches this '
2708
ListOption('match-author',
2709
help='Show revisions whose authors match this '
2712
ListOption('match-bugs',
2713
help='Show revisions whose bugs match this '
2288
2717
encoding_type = 'replace'
2655
3115
Patterns prefixed with '!!' act as regular ignore patterns, but have
2656
3116
precedence over the '!' exception patterns.
2658
Note: ignore patterns containing shell wildcards must be quoted from
3120
* Ignore patterns containing shell wildcards must be quoted from
3123
* Ignore patterns starting with "#" act as comments in the ignore file.
3124
To ignore patterns that begin with that character, use the "RE:" prefix.
2662
3127
Ignore the top level Makefile::
2664
bzr ignore ./Makefile
3129
brz ignore ./Makefile
2666
3131
Ignore .class files in all directories...::
2668
bzr ignore "*.class"
3133
brz ignore "*.class"
2670
3135
...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"
3137
brz ignore "!special.class"
3139
Ignore files whose name begins with the "#" character::
3143
Ignore .o files under the lib directory::
3145
brz ignore "lib/**/*.o"
3147
Ignore .o files under the lib directory::
3149
brz ignore "RE:lib/.*\.o"
2682
3151
Ignore everything but the "debian" toplevel directory::
2684
bzr ignore "RE:(?!debian/).*"
3153
brz ignore "RE:(?!debian/).*"
2686
3155
Ignore everything except the "local" toplevel directory,
2687
but always ignore "*~" autosave files, even under local/::
3156
but always ignore autosave files ending in ~, even under local/::
2690
bzr ignore "!./local"
3159
brz ignore "!./local"
2694
3163
_see_also = ['status', 'ignored', 'patterns']
2695
3164
takes_args = ['name_pattern*']
2696
3165
takes_options = ['directory',
2697
3166
Option('default-rules',
2698
help='Display the default ignore rules that bzr uses.')
3167
help='Display the default ignore rules that brz uses.')
2701
3170
def run(self, name_pattern_list=None, default_rules=None,
2702
3171
directory=u'.'):
2703
from bzrlib import ignores
3172
from breezy import ignores
2704
3173
if default_rules is not None:
2705
3174
# dump the default rules and exit
2706
3175
for pattern in ignores.USER_DEFAULTS:
2707
3176
self.outf.write("%s\n" % pattern)
2709
3178
if not name_pattern_list:
2710
raise errors.BzrCommandError("ignore requires at least one "
2711
"NAME_PATTERN or --default-rules.")
3179
raise errors.BzrCommandError(gettext("ignore requires at least one "
3180
"NAME_PATTERN or --default-rules."))
2712
3181
name_pattern_list = [globbing.normalize_pattern(p)
2713
3182
for p in name_pattern_list]
3184
bad_patterns_count = 0
3185
for p in name_pattern_list:
3186
if not globbing.Globster.is_pattern_valid(p):
3187
bad_patterns_count += 1
3188
bad_patterns += ('\n %s' % p)
3190
msg = (ngettext('Invalid ignore pattern found. %s',
3191
'Invalid ignore patterns found. %s',
3192
bad_patterns_count) % bad_patterns)
3193
ui.ui_factory.show_error(msg)
3194
raise lazy_regex.InvalidPattern('')
2714
3195
for name_pattern in name_pattern_list:
2715
3196
if (name_pattern[0] == '/' or
2716
3197
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2717
raise errors.BzrCommandError(
2718
"NAME_PATTERN should not be an absolute path")
3198
raise errors.BzrCommandError(gettext(
3199
"NAME_PATTERN should not be an absolute path"))
2719
3200
tree, relpath = WorkingTree.open_containing(directory)
2720
3201
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2721
3202
ignored = globbing.Globster(name_pattern_list)
3204
self.add_cleanup(tree.lock_read().unlock)
2724
3205
for entry in tree.list_files():
2726
3207
if id is not None:
2727
3208
filename = entry[0]
2728
3209
if ignored.match(filename):
2729
3210
matches.append(filename)
2731
3211
if len(matches) > 0:
2732
self.outf.write("Warning: the following files are version controlled and"
2733
" match your ignore pattern:\n%s"
3212
self.outf.write(gettext("Warning: the following files are version "
3213
"controlled and match your ignore pattern:\n%s"
2734
3214
"\nThese files will continue to be version controlled"
2735
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3215
" unless you 'brz remove' them.\n") % ("\n".join(matches),))
2738
3218
class cmd_ignored(Command):
2825
3306
Option('per-file-timestamps',
2826
3307
help='Set modification time of files to that of the last '
2827
3308
'revision in which it was changed.'),
3309
Option('uncommitted',
3310
help='Export the working tree contents rather than that of the '
2829
3313
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
3314
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3316
from .export import export
2833
3318
if branch_or_subdir is None:
2834
tree = WorkingTree.open_containing(directory)[0]
3319
branch_or_subdir = directory
3321
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3323
if tree is not None:
3324
self.add_cleanup(tree.lock_read().unlock)
3328
raise errors.BzrCommandError(
3329
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)
3332
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2843
export(rev_tree, dest, format, root, subdir, filtered=filters,
3334
export(export_tree, dest, format, root, subdir, filtered=filters,
2844
3335
per_file_timestamps=per_file_timestamps)
2845
except errors.NoSuchExportFormat, e:
2846
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3336
except errors.NoSuchExportFormat as e:
3337
raise errors.BzrCommandError(
3338
gettext('Unsupported export format: %s') % e.format)
2849
3341
class cmd_cat(Command):
2887
3379
old_file_id = rev_tree.path2id(relpath)
3381
# TODO: Split out this code to something that generically finds the
3382
# best id for a path across one or more trees; it's like
3383
# find_ids_across_trees but restricted to find just one. -- mbp
2889
3385
if name_from_revision:
2890
3386
# Try in revision if requested
2891
3387
if old_file_id is None:
2892
raise errors.BzrCommandError(
2893
"%r is not present in revision %s" % (
3388
raise errors.BzrCommandError(gettext(
3389
"{0!r} is not present in revision {1}").format(
2894
3390
filename, rev_tree.get_revision_id()))
2896
content = rev_tree.get_file_text(old_file_id)
3392
actual_file_id = old_file_id
2898
3394
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" % (
3395
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3396
actual_file_id = cur_file_id
3397
elif old_file_id is not None:
3398
actual_file_id = old_file_id
3400
raise errors.BzrCommandError(gettext(
3401
"{0!r} is not present in revision {1}").format(
2916
3402
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)
3404
from .filter_tree import ContentFilterTree
3405
filter_tree = ContentFilterTree(rev_tree,
3406
rev_tree._content_filter_stack)
3407
content = filter_tree.get_file_text(actual_file_id)
2930
self.outf.write(content)
3409
content = rev_tree.get_file_text(actual_file_id)
3411
self.outf.write(content)
2933
3414
class cmd_local_time_offset(Command):
2981
3462
A common mistake is to forget to add a new file or directory before
2982
3463
running the commit command. The --strict option checks for unknown
2983
3464
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``
3465
checks can be implemented by defining hooks. See ``brz help hooks``
2987
3468
:Things to note:
2989
3470
If you accidentially commit the wrong changes or make a spelling
2990
3471
mistake in the commit message say, you can use the uncommit command
2991
to undo it. See ``bzr help uncommit`` for details.
3472
to undo it. See ``brz help uncommit`` for details.
2993
3474
Hooks can also be configured to run after a commit. This allows you
2994
3475
to trigger updates to external systems like bug trackers. The --fixes
2995
3476
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.)
3477
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
3480
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3025
3481
takes_args = ['selected*']
3026
3482
takes_options = [
3027
3483
ListOption('exclude', type=str, short_name='x',
3028
3484
help="Do not consider changes made to a given path."),
3029
Option('message', type=unicode,
3485
Option('message', type=text_type,
3030
3486
short_name='m',
3031
3487
help="Description of the new revision."),
3057
3513
Option('show-diff', short_name='p',
3058
3514
help='When no message is supplied, show the diff along'
3059
3515
' with the status summary in the message editor.'),
3517
help='When committing to a foreign version control '
3518
'system do not push data that can not be natively '
3061
3521
aliases = ['ci', 'checkin']
3063
3523
def _iter_bug_fix_urls(self, fixes, branch):
3524
default_bugtracker = None
3064
3525
# Configure the properties for bug fixing attributes.
3065
3526
for fixed_bug in fixes:
3066
3527
tokens = fixed_bug.split(':')
3067
if len(tokens) != 2:
3068
raise errors.BzrCommandError(
3528
if len(tokens) == 1:
3529
if default_bugtracker is None:
3530
branch_config = branch.get_config_stack()
3531
default_bugtracker = branch_config.get(
3533
if default_bugtracker is None:
3534
raise errors.BzrCommandError(gettext(
3535
"No tracker specified for bug %s. Use the form "
3536
"'tracker:id' or specify a default bug tracker "
3537
"using the `bugtracker` option.\nSee "
3538
"\"brz help bugs\" for more information on this "
3539
"feature. Commit refused.") % fixed_bug)
3540
tag = default_bugtracker
3542
elif len(tokens) != 2:
3543
raise errors.BzrCommandError(gettext(
3069
3544
"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
3545
"See \"brz help bugs\" for more information on this "
3546
"feature.\nCommit refused.") % fixed_bug)
3548
tag, bug_id = tokens
3074
3550
yield bugtracker.get_bug_url(tag, branch, bug_id)
3075
except errors.UnknownBugTrackerAbbreviation:
3076
raise errors.BzrCommandError(
3077
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3078
except errors.MalformedBugIdentifier, e:
3079
raise errors.BzrCommandError(
3080
"%s\nCommit refused." % (str(e),))
3551
except bugtracker.UnknownBugTrackerAbbreviation:
3552
raise errors.BzrCommandError(gettext(
3553
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3554
except bugtracker.MalformedBugIdentifier as e:
3555
raise errors.BzrCommandError(gettext(
3556
"%s\nCommit refused.") % (str(e),))
3082
3558
def run(self, message=None, file=None, verbose=False, selected_list=None,
3083
3559
unchanged=False, strict=False, local=False, fixes=None,
3084
author=None, show_diff=False, exclude=None, commit_time=None):
3085
from bzrlib.errors import (
3560
author=None, show_diff=False, exclude=None, commit_time=None,
3562
from .errors import (
3086
3563
PointlessCommit,
3087
3564
ConflictsInTree,
3088
3565
StrictCommitFailed
3090
from bzrlib.msgeditor import (
3567
from .msgeditor import (
3091
3568
edit_commit_message_encoded,
3092
3569
generate_commit_message_template,
3093
make_commit_message_template_encoded
3570
make_commit_message_template_encoded,
3096
3574
commit_stamp = offset = None
3097
3575
if commit_time is not None:
3099
3577
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.
3578
except ValueError as e:
3579
raise errors.BzrCommandError(gettext(
3580
"Could not parse --commit-time: " + str(e)))
3110
3582
properties = {}
3112
tree, selected_list = tree_files(selected_list)
3584
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3113
3585
if selected_list == ['']:
3114
3586
# workaround - commit of root of tree should be exactly the same
3115
3587
# as just default commit in that tree, and succeed even though
3186
3666
reporter=None, verbose=verbose, revprops=properties,
3187
3667
authors=author, timestamp=commit_stamp,
3188
3668
timezone=offset,
3189
exclude=safe_relpath_files(tree, exclude))
3669
exclude=tree.safe_relpath_files(exclude),
3190
3671
except PointlessCommit:
3191
raise errors.BzrCommandError("No changes to commit."
3192
" Use --unchanged to commit anyhow.")
3672
raise errors.BzrCommandError(gettext("No changes to commit."
3673
" Please 'brz add' the files you want to commit, or use"
3674
" --unchanged to force an empty commit."))
3193
3675
except ConflictsInTree:
3194
raise errors.BzrCommandError('Conflicts detected in working '
3195
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3676
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3677
'tree. Use "brz conflicts" to list, "brz resolve FILE" to'
3197
3679
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"
3680
raise errors.BzrCommandError(gettext("Commit refused because there are"
3681
" unknown files in the working tree."))
3682
except errors.BoundBranchOutOfDate as e:
3683
e.extra_help = (gettext("\n"
3202
3684
'To commit to master branch, run update and then commit.\n'
3203
3685
'You can also pass --local to commit to continue working '
3278
3760
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.
3761
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3763
When the default format has changed after a major new release of
3764
Bazaar, you may be informed during certain operations that you
3765
should upgrade. Upgrading to a newer format may improve performance
3766
or make new features available. It may however limit interoperability
3767
with older repositories or with older versions of Bazaar.
3769
If you wish to upgrade to a particular format rather than the
3770
current default, that can be specified using the --format option.
3771
As a consequence, you can use the upgrade command this way to
3772
"downgrade" to an earlier format, though some conversions are
3773
a one way process (e.g. changing from the 1.x default to the
3774
2.x default) so downgrading is not always possible.
3776
A backup.bzr.~#~ directory is created at the start of the conversion
3777
process (where # is a number). By default, this is left there on
3778
completion. If the conversion fails, delete the new .bzr directory
3779
and rename this one back in its place. Use the --clean option to ask
3780
for the backup.bzr directory to be removed on successful conversion.
3781
Alternatively, you can delete it by hand if everything looks good
3784
If the location given is a shared repository, dependent branches
3785
are also converted provided the repository converts successfully.
3786
If the conversion of a branch fails, remaining branches are still
3789
For more information on upgrades, see the Bazaar Upgrade Guide,
3790
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3286
_see_also = ['check']
3793
_see_also = ['check', 'reconcile', 'formats']
3287
3794
takes_args = ['url?']
3288
3795
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'),
3796
RegistryOption('format',
3797
help='Upgrade to a specific format. See "brz help'
3798
' formats" for details.',
3799
lazy_registry=('breezy.controldir', 'format_registry'),
3800
converter=lambda name: controldir.format_registry.make_controldir(name),
3801
value_switches=True, title='Branch format'),
3803
help='Remove the backup.bzr directory if successful.'),
3805
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)
3808
def run(self, url='.', format=None, clean=False, dry_run=False):
3809
from .upgrade import upgrade
3810
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3812
if len(exceptions) == 1:
3813
# Compatibility with historical behavior
3302
3819
class cmd_whoami(Command):
3303
__doc__ = """Show or set bzr user id.
3820
__doc__ = """Show or set brz user id.
3306
3823
Show the email of the current user::
3310
3827
Set the current user::
3312
bzr whoami "Frank Chu <fchu@example.com>"
3829
brz whoami "Frank Chu <fchu@example.com>"
3314
takes_options = [ Option('email',
3831
takes_options = [ 'directory',
3315
3833
help='Display email address only.'),
3316
3834
Option('branch',
3317
3835
help='Set identity for the current branch instead of '
3321
3839
encoding_type = 'replace'
3323
3841
@display_command
3324
def run(self, email=False, branch=False, name=None):
3842
def run(self, email=False, branch=False, name=None, directory=None):
3325
3843
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()
3844
if directory is None:
3845
# use branch if we're inside one; otherwise global config
3847
c = Branch.open_containing(u'.')[0].get_config_stack()
3848
except errors.NotBranchError:
3849
c = _mod_config.GlobalStack()
3851
c = Branch.open(directory).get_config_stack()
3852
identity = c.get('email')
3332
self.outf.write(c.user_email() + '\n')
3854
self.outf.write(_mod_config.extract_email_address(identity)
3334
self.outf.write(c.username() + '\n')
3857
self.outf.write(identity + '\n')
3861
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3337
3864
# 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:
3866
_mod_config.extract_email_address(name)
3867
except _mod_config.NoEmailInUsername as e:
3341
3868
warning('"%s" does not seem to contain an email address. '
3342
3869
'This is allowed, but not recommended.', name)
3344
3871
# use global config unless --branch given
3346
c = Branch.open_containing('.')[0].get_config()
3873
if directory is None:
3874
c = Branch.open_containing(u'.')[0].get_config_stack()
3876
b = Branch.open(directory)
3877
self.add_cleanup(b.lock_write().unlock)
3878
c = b.get_config_stack()
3348
c = config.GlobalConfig()
3349
c.set_user_option('email', name)
3880
c = _mod_config.GlobalStack()
3881
c.set('email', name)
3352
3884
class cmd_nick(Command):
3353
3885
__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.
3887
If unset, the colocated branch name is used for colocated branches, and
3888
the branch directory name is used for other branches. To print the
3889
current nickname, execute with no argument.
3358
3891
Bound branches use the nickname of its master branch unless it is set
3415
3948
def remove_alias(self, alias_name):
3416
3949
if alias_name is None:
3417
raise errors.BzrCommandError(
3418
'bzr alias --remove expects an alias to remove.')
3950
raise errors.BzrCommandError(gettext(
3951
'brz alias --remove expects an alias to remove.'))
3419
3952
# If alias is not found, print something like:
3420
3953
# unalias: foo: not found
3421
c = config.GlobalConfig()
3954
c = _mod_config.GlobalConfig()
3422
3955
c.unset_alias(alias_name)
3424
3957
@display_command
3425
3958
def print_aliases(self):
3426
3959
"""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))
3960
aliases = _mod_config.GlobalConfig().get_aliases()
3961
for key, value in sorted(viewitems(aliases)):
3962
self.outf.write('brz alias %s="%s"\n' % (key, value))
3431
3964
@display_command
3432
3965
def print_alias(self, alias_name):
3433
from bzrlib.commands import get_alias
3966
from .commands import get_alias
3434
3967
alias = get_alias(alias_name)
3435
3968
if alias is None:
3436
self.outf.write("bzr alias: %s: not found\n" % alias_name)
3969
self.outf.write("brz alias: %s: not found\n" % alias_name)
3438
3971
self.outf.write(
3439
'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3972
'brz alias %s="%s"\n' % (alias_name, ' '.join(alias)))
3441
3974
def set_alias(self, alias_name, alias_command):
3442
3975
"""Save the alias in the global config."""
3443
c = config.GlobalConfig()
3976
c = _mod_config.GlobalConfig()
3444
3977
c.set_alias(alias_name, alias_command)
3478
4011
Tests that need working space on disk use a common temporary directory,
3479
4012
typically inside $TMPDIR or /tmp.
3481
If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
4014
If you set BRZ_TEST_PDB=1 when running selftest, failing tests will drop
3482
4015
into a pdb postmortem session.
4017
The --coverage=DIRNAME global option produces a report with covered code
3485
4021
Run only tests relating to 'ignore'::
3489
4025
Disable plugins and list tests as they're run::
3491
bzr --no-plugins selftest -v
4027
brz --no-plugins selftest -v
3493
4029
# NB: this is used from the class without creating an instance, which is
3494
4030
# why it does not have a self parameter.
3495
4031
def get_transport_type(typestring):
3496
4032
"""Parse and return a transport specifier."""
3497
4033
if typestring == "sftp":
3498
from bzrlib.tests import stub_sftp
4034
from .tests import stub_sftp
3499
4035
return stub_sftp.SFTPAbsoluteServer
3500
if typestring == "memory":
3501
from bzrlib.tests import test_server
4036
elif typestring == "memory":
4037
from .tests import test_server
3502
4038
return memory.MemoryServer
3503
if typestring == "fakenfs":
3504
from bzrlib.tests import test_server
4039
elif typestring == "fakenfs":
4040
from .tests import test_server
3505
4041
return test_server.FakeNFSServer
3506
4042
msg = "No known transport type %s. Supported types are: sftp\n" %\
3536
4070
help='List the tests instead of running them.'),
3537
4071
RegistryOption('parallel',
3538
4072
help="Run the test suite in parallel.",
3539
lazy_registry=('bzrlib.tests', 'parallel_registry'),
4073
lazy_registry=('breezy.tests', 'parallel_registry'),
3540
4074
value_switches=False,
3542
4076
Option('randomize', type=str, argname="SEED",
3543
4077
help='Randomize the order of tests using the given'
3544
4078
' seed or "now" for the current time.'),
3545
Option('exclude', type=str, argname="PATTERN",
3547
help='Exclude tests that match this regular'
4079
ListOption('exclude', type=str, argname="PATTERN",
4081
help='Exclude tests that match this regular'
3549
4083
Option('subunit',
3550
4084
help='Output test progress via subunit.'),
3551
4085
Option('strict', help='Fail on missing dependencies or '
3568
4105
def run(self, testspecs_list=None, verbose=False, one=False,
3569
4106
transport=None, benchmark=None,
3570
lsprof_timed=None, cache_dir=None,
3571
4108
first=False, list_only=False,
3572
4109
randomize=None, exclude=None, strict=False,
3573
4110
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)
4111
parallel=None, lsprof_tests=False,
4114
# During selftest, disallow proxying, as it can cause severe
4115
# performance penalties and is only needed for thread
4116
# safety. The selftest command is assumed to not use threads
4117
# too heavily. The call should be as early as possible, as
4118
# error reporting for past duplicate imports won't have useful
4120
lazy_import.disallow_proxying()
3584
4124
if testspecs_list is not None:
3585
4125
pattern = '|'.join(testspecs_list)
3590
from bzrlib.tests import SubUnitBzrRunner
4130
from .tests import SubUnitBzrRunner
3591
4131
except ImportError:
3592
raise errors.BzrCommandError("subunit not available. subunit "
3593
"needs to be installed to use --subunit.")
4132
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4133
"needs to be installed to use --subunit."))
3594
4134
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3595
4135
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3596
4136
# stdout, which would corrupt the subunit stream.
3597
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4137
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4138
# following code can be deleted when it's sufficiently deployed
4139
# -- vila/mgz 20100514
4140
if (sys.platform == "win32"
4141
and getattr(sys.stdout, 'fileno', None) is not None):
3599
4143
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3601
4145
self.additional_selftest_args.setdefault(
3602
4146
'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)
4148
raise errors.BzrCommandError(gettext(
4149
"--benchmark is no longer supported from brz 2.2; "
4150
"use bzr-usertest instead"))
4151
test_suite_factory = None
4153
exclude_pattern = None
3611
test_suite_factory = None
4155
exclude_pattern = '(' + '|'.join(exclude) + ')'
4157
self._disable_fsync()
3613
4158
selftest_kwargs = {"verbose": verbose,
3614
4159
"pattern": pattern,
3615
4160
"stop_on_failure": one,
3617
4162
"test_suite_factory": test_suite_factory,
3618
4163
"lsprof_timed": lsprof_timed,
3619
4164
"lsprof_tests": lsprof_tests,
3620
"bench_history": benchfile,
3621
4165
"matching_tests_first": first,
3622
4166
"list_only": list_only,
3623
4167
"random_seed": randomize,
3624
"exclude_pattern": exclude,
4168
"exclude_pattern": exclude_pattern,
3625
4169
"strict": strict,
3626
4170
"load_list": load_list,
3627
4171
"debug_flags": debugflag,
3628
4172
"starting_with": starting_with
3630
4174
selftest_kwargs.update(self.additional_selftest_args)
3631
result = selftest(**selftest_kwargs)
4176
# Make deprecation warnings visible, unless -Werror is set
4177
cleanup = symbol_versioning.activate_deprecation_warnings(
4180
result = tests.selftest(**selftest_kwargs)
3632
4183
return int(not result)
4185
def _disable_fsync(self):
4186
"""Change the 'os' functionality to not synchronize."""
4187
self._orig_fsync = getattr(os, 'fsync', None)
4188
if self._orig_fsync is not None:
4189
os.fsync = lambda filedes: None
4190
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4191
if self._orig_fdatasync is not None:
4192
os.fdatasync = lambda filedes: None
3635
4195
class cmd_version(Command):
3636
__doc__ = """Show version of bzr."""
4196
__doc__ = """Show version of brz."""
3638
4198
encoding_type = 'replace'
3639
4199
takes_options = [
3689
4249
The source of the merge can be specified either in the form of a branch,
3690
4250
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.
4251
with brz send. If neither is specified, the default is the upstream branch
4252
or the branch most recently merged using --remember. The source of the
4253
merge may also be specified in the form of a path to a file in another
4254
branch: in this case, only the modifications to that file are merged into
4255
the current working tree.
4257
When merging from a branch, by default brz will try to merge in all new
4258
work from the other branch, automatically determining an appropriate base
4259
revision. If this fails, you may need to give an explicit base.
4261
To pick a different ending revision, pass "--revision OTHER". brz will
4262
try to merge in all new work up to and including revision OTHER.
4264
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4265
through OTHER, excluding BASE but including OTHER, will be merged. If this
4266
causes some revisions to be skipped, i.e. if the destination branch does
4267
not already contain revision BASE, such a merge is commonly referred to as
4268
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4269
cherrypicks. The changes look like a normal commit, and the history of the
4270
changes from the other branch is not stored in the commit.
4272
Revision numbers are always relative to the source branch.
3705
4274
Merge will do its best to combine the changes in two branches, but there
3706
4275
are some kinds of problems only a human can fix. When it encounters those,
3707
4276
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.
4277
before you can commit.
4279
Use brz resolve when you have fixed a problem. See also brz conflicts.
4281
If there is no default branch set, the first merge will set it (use
4282
--no-remember to avoid setting it). After that, you can omit the branch
4283
to use the default. To change the default, use --remember. The value will
4284
only be saved if the remote location can be accessed.
3717
4286
The results of the merge are placed into the destination working
3718
directory, where they can be reviewed (with bzr diff), tested, and then
4287
directory, where they can be reviewed (with brz diff), tested, and then
3719
4288
committed to record the result of the merge.
3721
4290
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
4291
--force is given. If --force is given, then the changes from the source
4292
will be merged with the current working tree, including any uncommitted
4293
changes in the tree. The --force option can also be used to create a
3723
4294
merge revision which has more than two parents.
3725
4296
If one would like to merge changes from the working tree of the other
3849
4424
self.sanity_check_merger(merger)
3850
4425
if (merger.base_rev_id == merger.other_rev_id and
3851
4426
merger.other_rev_id is not None):
3852
note('Nothing to do.')
4427
# check if location is a nonexistent file (and not a branch) to
4428
# disambiguate the 'Nothing to do'
4429
if merger.interesting_files:
4430
if not merger.other_tree.has_filename(
4431
merger.interesting_files[0]):
4432
note(gettext("merger: ") + str(merger))
4433
raise errors.PathsDoNotExist([location])
4434
note(gettext('Nothing to do.'))
4436
if pull and not preview:
3855
4437
if merger.interesting_files is not None:
3856
raise errors.BzrCommandError('Cannot pull individual files')
4438
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3857
4439
if (merger.base_rev_id == tree.last_revision()):
3858
4440
result = tree.pull(merger.other_branch, False,
3859
4441
merger.other_rev_id)
3860
4442
result.report(self.outf)
3862
4444
if merger.this_basis is None:
3863
raise errors.BzrCommandError(
4445
raise errors.BzrCommandError(gettext(
3864
4446
"This branch has no commits."
3865
" (perhaps you would prefer 'bzr pull')")
4447
" (perhaps you would prefer 'brz pull')"))
3867
4449
return self._do_preview(merger)
3868
4450
elif interactive:
3964
4547
if other_revision_id is None:
3965
4548
other_revision_id = _mod_revision.ensure_null(
3966
4549
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):
4550
# Remember where we merge from. We need to remember if:
4551
# - user specify a location (and we don't merge from the parent
4553
# - user ask to remember or there is no previous location set to merge
4554
# from and user didn't ask to *not* remember
4555
if (user_location is not None
4557
or (remember is None
4558
and tree.branch.get_submit_branch() is None)))):
3970
4559
tree.branch.set_submit_branch(other_branch.base)
3971
_merge_tags_if_possible(other_branch, tree.branch)
3972
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4560
# Merge tags (but don't set them in the master branch yet, the user
4561
# might revert this merge). Commit will propagate them.
4562
other_branch.tags.merge_to(tree.branch.tags, ignore_master=True)
4563
merger = _mod_merge.Merger.from_revision_ids(tree,
3973
4564
other_revision_id, base_revision_id, other_branch, base_branch)
3974
4565
if other_path != '':
3975
4566
allow_pending = False
4137
4729
class cmd_revert(Command):
4138
__doc__ = """Revert files to a previous revision.
4731
Set files in the working tree back to the contents of a previous revision.
4140
4733
Giving a list of files will revert only those files. Otherwise, all files
4141
4734
will be reverted. If the revision is not specified with '--revision', the
4142
last committed revision is used.
4735
working tree basis revision is used. A revert operation affects only the
4736
working tree, not any revision history like the branch and repository or
4737
the working tree basis revision.
4144
4739
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.
4740
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4741
will remove the changes introduced by the second last commit (-2), without
4742
affecting the changes introduced by the last commit (-1). To remove
4743
certain changes on a hunk-by-hunk basis, see the shelve command.
4744
To update the branch to a specific revision or the latest revision and
4745
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.
4748
Uncommitted changes to files that are reverted will be discarded.
4749
Howver, by default, any files that have been manually changed will be
4750
backed up first. (Files changed only by merge are not backed up.) Backup
4751
files have '.~#~' appended to their name, where # is a number.
4153
4753
When you provide files, you can use their current pathname or the pathname
4154
4754
from the target revision. So you can use revert to "undelete" a file by
4391
5003
if remote_extra and not mine_only:
4392
5004
if printed_local is True:
4393
5005
message("\n\n\n")
4394
message("You are missing %d revision(s):\n" %
5006
message(ngettext("You are missing %d revision:\n",
5007
"You are missing %d revisions:\n",
5008
len(remote_extra)) %
4395
5009
len(remote_extra))
5010
if remote_branch.supports_tags():
5011
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4396
5012
for revision in iter_log_revisions(remote_extra,
4397
5013
remote_branch.repository,
4399
5016
lf.log_revision(revision)
4400
5017
status_code = 1
4402
5019
if mine_only and not local_extra:
4403
5020
# We checked local, and found nothing extra
4404
message('This branch is up to date.\n')
5021
message(gettext('This branch has no new revisions.\n'))
4405
5022
elif theirs_only and not remote_extra:
4406
5023
# We checked remote, and found nothing extra
4407
message('Other branch is up to date.\n')
5024
message(gettext('Other branch has no new revisions.\n'))
4408
5025
elif not (mine_only or theirs_only or local_extra or
4410
5027
# We checked both branches, and neither one had extra
4412
message("Branches are up to date.\n")
5029
message(gettext("Branches are up to date.\n"))
4413
5030
self.cleanup_now()
4414
5031
if not status_code and parent is None and other_branch is not None:
4415
5032
self.add_cleanup(local_branch.lock_write().unlock)
4564
5168
self.add_cleanup(branch.lock_read().unlock)
4565
5169
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4566
5170
self.add_cleanup(tree.lock_read().unlock)
5171
if wt is not None and revision is None:
4568
5172
file_id = wt.path2id(relpath)
4570
5174
file_id = tree.path2id(relpath)
4571
5175
if file_id is None:
4572
5176
raise errors.NotVersionedError(filename)
4573
file_version = tree.inventory[file_id].revision
4574
5177
if wt is not None and revision is None:
4575
5178
# If there is a tree and we're not annotating historical
4576
5179
# versions, annotate the working tree's content.
4577
5180
annotate_file_tree(wt, file_id, self.outf, long, all,
4578
5181
show_ids=show_ids)
4580
annotate_file(branch, file_version, file_id, long, all, self.outf,
5183
annotate_file_tree(tree, file_id, self.outf, long, all,
5184
show_ids=show_ids, branch=branch)
4584
5187
class cmd_re_sign(Command):
4592
5195
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4593
5196
if revision_id_list is not None and revision is not None:
4594
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5197
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4595
5198
if revision_id_list is None and revision is None:
4596
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
5199
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
4597
5200
b = WorkingTree.open_containing(directory)[0].branch
4598
5201
self.add_cleanup(b.lock_write().unlock)
4599
5202
return self._run(b, revision_id_list, revision)
4601
5204
def _run(self, b, revision_id_list, revision):
4602
import bzrlib.gpg as gpg
4603
gpg_strategy = gpg.GPGStrategy(b.get_config())
5206
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4604
5207
if revision_id_list is not None:
4605
5208
b.repository.start_write_group()
4607
5210
for revision_id in revision_id_list:
5211
revision_id = cache_utf8.encode(revision_id)
4608
5212
b.repository.sign_revision(revision_id, gpg_strategy)
4610
5214
b.repository.abort_write_group()
4669
5273
location = b.get_old_bound_location()
4670
5274
except errors.UpgradeRequired:
4671
raise errors.BzrCommandError('No location supplied. '
4672
'This format does not remember old locations.')
5275
raise errors.BzrCommandError(gettext('No location supplied. '
5276
'This format does not remember old locations.'))
4674
5278
if location is None:
4675
5279
if b.get_bound_location() is not None:
4676
raise errors.BzrCommandError('Branch is already bound')
5280
raise errors.BzrCommandError(
5281
gettext('Branch is already bound'))
4678
raise errors.BzrCommandError('No location supplied '
4679
'and no previous location known')
5283
raise errors.BzrCommandError(
5284
gettext('No location supplied'
5285
' and no previous location known'))
4680
5286
b_other = Branch.open(location)
4682
5288
b.bind(b_other)
4683
5289
except errors.DivergedBranches:
4684
raise errors.BzrCommandError('These branches have diverged.'
4685
' Try merging, and then bind again.')
5290
raise errors.BzrCommandError(gettext('These branches have diverged.'
5291
' Try merging, and then bind again.'))
4686
5292
if b.get_config().has_explicit_nickname():
4687
5293
b.nick = b_other.nick
4754
5361
self.add_cleanup(tree.lock_write().unlock)
4756
5363
self.add_cleanup(b.lock_write().unlock)
4757
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5364
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
5367
def _run(self, b, tree, dry_run, verbose, revision, force, local,
5369
from .log import log_formatter, show_log
5370
from .uncommit import uncommit
4763
5372
last_revno, last_rev_id = b.last_revision_info()
4792
5401
end_revision=last_revno)
4795
self.outf.write('Dry-run, pretending to remove'
4796
' the above revisions.\n')
5404
self.outf.write(gettext('Dry-run, pretending to remove'
5405
' the above revisions.\n'))
4798
self.outf.write('The above revision(s) will be removed.\n')
5407
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')
5410
if not ui.ui_factory.confirm_action(
5411
gettext(u'Uncommit these revisions'),
5412
'breezy.builtins.uncommit',
5414
self.outf.write(gettext('Canceled\n'))
4805
5417
mutter('Uncommitting from {%s} to {%s}',
4806
5418
last_rev_id, rev_id)
4807
5419
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)
5420
revno=revno, local=local, keep_tags=keep_tags)
5421
self.outf.write(gettext('You can restore the old tip by running:\n'
5422
' brz pull . -r revid:%s\n') % last_rev_id)
4813
5425
class cmd_break_lock(Command):
4814
__doc__ = """Break a dead lock on a repository, branch or working directory.
5426
__doc__ = """Break a dead lock.
5428
This command breaks a lock on a repository, branch, working directory or
4816
5431
CAUTION: Locks should only be broken when you are sure that the process
4817
5432
holding the lock has been stopped.
4819
You can get information on what locks are open via the 'bzr info
5434
You can get information on what locks are open via the 'brz info
4820
5435
[location]' command.
4824
bzr break-lock bzr+ssh://example.com/bzr/foo
5439
brz break-lock brz+ssh://example.com/brz/foo
5440
brz break-lock --conf ~/.bazaar
4826
5443
takes_args = ['location?']
5446
help='LOCATION is the directory where the config lock is.'),
5448
help='Do not ask for confirmation before breaking the lock.'),
4828
def run(self, location=None, show=False):
5451
def run(self, location=None, config=False, force=False):
4829
5452
if location is None:
4830
5453
location = u'.'
4831
control, relpath = bzrdir.BzrDir.open_containing(location)
4833
control.break_lock()
4834
except NotImplementedError:
5455
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5457
{'breezy.lockdir.break': True})
5459
conf = _mod_config.LockableConfig(file_name=location)
5462
control, relpath = controldir.ControlDir.open_containing(location)
5464
control.break_lock()
5465
except NotImplementedError:
4838
5469
class cmd_wait_until_signalled(Command):
4839
__doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
5470
__doc__ = """Test helper for test_start_and_stop_brz_subprocess_send_signal.
4841
5472
This just prints a line to signal when it is ready, then blocks on stdin.
4859
5490
help='Serve on stdin/out for use from inetd or sshd.'),
4860
5491
RegistryOption('protocol',
4861
5492
help="Protocol to serve.",
4862
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
5493
lazy_registry=('breezy.transport', 'transport_server_registry'),
4863
5494
value_switches=True),
5496
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.',
5498
help='Listen for connections on nominated port. Passing 0 as '
5499
'the port number will result in a dynamically allocated '
5500
'port. The default port depends on the protocol.',
4870
5502
custom_help('directory',
4871
5503
help='Serve contents of this directory.'),
4872
5504
Option('allow-writes',
4873
5505
help='By default the server is a readonly server. Supplying '
4874
5506
'--allow-writes enables write access to the contents of '
4875
'the served directory and below. Note that ``bzr serve`` '
5507
'the served directory and below. Note that ``brz serve`` '
4876
5508
'does not perform authentication, so unless some form of '
4877
5509
'external authentication is arranged supplying this '
4878
5510
'option leads to global uncontrolled write access to your '
5513
Option('client-timeout', type=float,
5514
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
5517
def run(self, listen=None, port=None, inet=False, directory=None,
5518
allow_writes=False, protocol=None, client_timeout=None):
5519
from . import transport
4905
5520
if directory is None:
4906
directory = os.getcwd()
5521
directory = osutils.getcwd()
4907
5522
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)
5523
protocol = transport.transport_server_registry.get()
5524
url = transport.location_to_url(directory)
4911
5525
if not allow_writes:
4912
5526
url = 'readonly+' + url
4913
transport = get_transport(url)
4914
protocol(transport, host, port, inet)
5527
t = transport.get_transport_from_url(url)
5528
protocol(t, listen, port, inet, client_timeout)
4917
5531
class cmd_join(Command):
4940
5554
containing_tree = WorkingTree.open_containing(parent_dir)[0]
4941
5555
repo = containing_tree.branch.repository
4942
5556
if not repo.supports_rich_root():
4943
raise errors.BzrCommandError(
5557
raise errors.BzrCommandError(gettext(
4944
5558
"Can't join trees because %s doesn't support rich root data.\n"
4945
"You can use bzr upgrade on the repository."
5559
"You can use brz upgrade on the repository.")
4949
5563
containing_tree.add_reference(sub_tree)
4950
except errors.BadReferenceTarget, e:
5564
except errors.BadReferenceTarget as e:
4951
5565
# XXX: Would be better to just raise a nicely printable
4952
5566
# exception from the real origin. Also below. mbp 20070306
4953
raise errors.BzrCommandError("Cannot join %s. %s" %
5567
raise errors.BzrCommandError(
5568
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4957
5571
containing_tree.subsume(sub_tree)
4958
except errors.BadSubsumeSource, e:
4959
raise errors.BzrCommandError("Cannot join %s. %s" %
5572
except errors.BadSubsumeSource as e:
5573
raise errors.BzrCommandError(
5574
gettext("Cannot join {0}. {1}").format(tree, e.reason))
4963
5577
class cmd_split(Command):
5172
5795
help='Branch to generate the submission from, '
5173
5796
'rather than the one containing the working directory.',
5174
5797
short_name='f',
5176
5799
Option('output', short_name='o',
5177
5800
help='Write merge directive to this file or directory; '
5178
5801
'use - for stdout.',
5180
5803
Option('strict',
5181
5804
help='Refuse to send if there are uncommitted changes in'
5182
5805
' the working tree, --no-strict disables the check.'),
5183
5806
Option('mail-to', help='Mail the request to this address.',
5187
Option('body', help='Body for the email.', type=unicode),
5810
Option('body', help='Body for the email.', type=text_type),
5188
5811
RegistryOption('format',
5189
5812
help='Use the specified output format.',
5190
lazy_registry=('bzrlib.send', 'format_registry')),
5813
lazy_registry=('breezy.send', 'format_registry')),
5193
5816
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5194
no_patch=False, revision=None, remember=False, output=None,
5817
no_patch=False, revision=None, remember=None, output=None,
5195
5818
format=None, mail_to=None, message=None, body=None,
5196
5819
strict=None, **kwargs):
5197
from bzrlib.send import send
5820
from .send import send
5198
5821
return send(submit_branch, revision, public_branch, remember,
5199
5822
format, no_bundle, no_patch, output,
5200
5823
kwargs.get('from', '.'), mail_to, message, body,
5321
5944
self.add_cleanup(branch.lock_write().unlock)
5323
5946
if tag_name is None:
5324
raise errors.BzrCommandError("No tag specified to delete.")
5947
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5325
5948
branch.tags.delete_tag(tag_name)
5326
self.outf.write('Deleted tag %s.\n' % tag_name)
5949
note(gettext('Deleted tag %s.') % tag_name)
5329
5952
if len(revision) != 1:
5330
raise errors.BzrCommandError(
5953
raise errors.BzrCommandError(gettext(
5331
5954
"Tags can only be placed on a single revision, "
5333
5956
revision_id = revision[0].as_revision_id(branch)
5335
5958
revision_id = branch.last_revision()
5336
5959
if tag_name is None:
5337
5960
tag_name = branch.automatic_tag_name(revision_id)
5338
5961
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):
5962
raise errors.BzrCommandError(gettext(
5963
"Please specify a tag name."))
5965
existing_target = branch.tags.lookup_tag(tag_name)
5966
except errors.NoSuchTag:
5967
existing_target = None
5968
if not force and existing_target not in (None, revision_id):
5342
5969
raise errors.TagAlreadyExists(tag_name)
5343
branch.tags.set_tag(tag_name, revision_id)
5344
self.outf.write('Created tag %s.\n' % tag_name)
5970
if existing_target == revision_id:
5971
note(gettext('Tag %s already exists for that revision.') % tag_name)
5973
branch.tags.set_tag(tag_name, revision_id)
5974
if existing_target is None:
5975
note(gettext('Created tag %s.') % tag_name)
5977
note(gettext('Updated tag %s.') % tag_name)
5347
5980
class cmd_tags(Command):
5354
5987
takes_options = [
5355
5988
custom_help('directory',
5356
5989
help='Branch whose tags should be displayed.'),
5357
RegistryOption.from_kwargs('sort',
5990
RegistryOption('sort',
5358
5991
'Sort tags by different criteria.', title='Sorting',
5359
alpha='Sort tags lexicographically (default).',
5360
time='Sort tags chronologically.',
5992
lazy_registry=('breezy.tag', 'tag_sort_methods')
5366
5998
@display_command
5999
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6000
from .tag import tag_sort_methods
5373
6001
branch, relpath = Branch.open_containing(directory)
5375
tags = branch.tags.get_tag_dict().items()
6003
tags = list(viewitems(branch.tags.get_tag_dict()))
5379
6007
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]])
6009
# Restrict to the specified range
6010
tags = self._tags_for_range(branch, revision)
6012
sort = tag_sort_methods.get()
5400
6014
if not show_ids:
5401
6015
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
6016
for index, (tag, revid) in enumerate(tags):
5413
6029
for tag, revspec in tags:
5414
6030
self.outf.write('%-20s %s\n' % (tag, revspec))
6032
def _tags_for_range(self, branch, revision):
6034
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6035
revid1, revid2 = rev1.rev_id, rev2.rev_id
6036
# _get_revision_range will always set revid2 if it's not specified.
6037
# If revid1 is None, it means we want to start from the branch
6038
# origin which is always a valid ancestor. If revid1 == revid2, the
6039
# ancestry check is useless.
6040
if revid1 and revid1 != revid2:
6041
# FIXME: We really want to use the same graph than
6042
# branch.iter_merge_sorted_revisions below, but this is not
6043
# easily available -- vila 2011-09-23
6044
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6045
# We don't want to output anything in this case...
6047
# only show revisions between revid1 and revid2 (inclusive)
6048
tagged_revids = branch.tags.get_reverse_tag_dict()
6050
for r in branch.iter_merge_sorted_revisions(
6051
start_revision_id=revid2, stop_revision_id=revid1,
6052
stop_rule='include'):
6053
revid_tags = tagged_revids.get(r[0], None)
6055
found.extend([(tag, r[0]) for tag in revid_tags])
5417
6059
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
6060
__doc__ = """Reconfigure the type of a brz directory.
5420
6062
A target configuration must be specified.
5432
6074
takes_args = ['location?']
5433
6075
takes_options = [
5434
6076
RegistryOption.from_kwargs(
5436
title='Target type',
5437
help='The type to reconfigure the directory to.',
6079
help='The relation between branch and tree.',
5438
6080
value_switches=True, enum_switch=False,
5439
6081
branch='Reconfigure to be an unbound branch with no working tree.',
5440
6082
tree='Reconfigure to be an unbound branch with a working tree.',
5441
6083
checkout='Reconfigure to be a bound branch with a working tree.',
5442
6084
lightweight_checkout='Reconfigure to be a lightweight'
5443
6085
' checkout (with no local history).',
6087
RegistryOption.from_kwargs(
6089
title='Repository type',
6090
help='Location fo the repository.',
6091
value_switches=True, enum_switch=False,
5444
6092
standalone='Reconfigure to be a standalone branch '
5445
6093
'(i.e. stop using shared repository).',
5446
6094
use_shared='Reconfigure to use a shared repository.',
6096
RegistryOption.from_kwargs(
6098
title='Trees in Repository',
6099
help='Whether new branches in the repository have trees.',
6100
value_switches=True, enum_switch=False,
5447
6101
with_trees='Reconfigure repository to create '
5448
6102
'working trees on branches by default.',
5449
6103
with_no_trees='Reconfigure repository to not create '
5476
6130
# At the moment you can use --stacked-on and a different
5477
6131
# reconfiguration shape at the same time; there seems no good reason
5479
if target_type is None:
6133
if (tree_type is None and
6134
repository_type is None and
6135
repository_trees is None):
5480
6136
if stacked_on or unstacked:
5483
raise errors.BzrCommandError('No target configuration '
5485
elif target_type == 'branch':
6139
raise errors.BzrCommandError(gettext('No target configuration '
6141
reconfiguration = None
6142
if tree_type == 'branch':
5486
6143
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5487
elif target_type == 'tree':
6144
elif tree_type == 'tree':
5488
6145
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5489
elif target_type == 'checkout':
6146
elif tree_type == 'checkout':
5490
6147
reconfiguration = reconfigure.Reconfigure.to_checkout(
5491
6148
directory, bind_to)
5492
elif target_type == 'lightweight-checkout':
6149
elif tree_type == 'lightweight-checkout':
5493
6150
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5494
6151
directory, bind_to)
5495
elif target_type == 'use-shared':
6153
reconfiguration.apply(force)
6154
reconfiguration = None
6155
if repository_type == 'use-shared':
5496
6156
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5497
elif target_type == 'standalone':
6157
elif repository_type == 'standalone':
5498
6158
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5499
elif target_type == 'with-trees':
6160
reconfiguration.apply(force)
6161
reconfiguration = None
6162
if repository_trees == 'with-trees':
5500
6163
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5501
6164
directory, True)
5502
elif target_type == 'with-no-trees':
6165
elif repository_trees == 'with-no-trees':
5503
6166
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5504
6167
directory, False)
5505
reconfiguration.apply(force)
6169
reconfiguration.apply(force)
6170
reconfiguration = None
5508
6173
class cmd_switch(Command):
5531
6196
takes_args = ['to_location?']
5532
takes_options = [Option('force',
6197
takes_options = ['directory',
5533
6199
help='Switch even if local commits will be lost.'),
5535
6201
Option('create-branch', short_name='b',
5536
6202
help='Create the target branch from this one before'
5537
6203
' switching to it.'),
6205
help='Store and restore uncommitted changes in the'
5540
6209
def run(self, to_location=None, force=False, create_branch=False,
5542
from bzrlib import switch
6210
revision=None, directory=u'.', store=False):
6211
from . import switch
6212
tree_location = directory
5544
6213
revision = _get_one_revision('switch', revision)
5545
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6214
possible_transports = []
6215
control_dir = controldir.ControlDir.open_containing(tree_location,
6216
possible_transports=possible_transports)[0]
5546
6217
if to_location is None:
5547
6218
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
6219
raise errors.BzrCommandError(gettext('You must supply either a'
6220
' revision or a location'))
6221
to_location = tree_location
5552
branch = control_dir.open_branch()
6223
branch = control_dir.open_branch(
6224
possible_transports=possible_transports)
5553
6225
had_explicit_nick = branch.get_config().has_explicit_nickname()
5554
6226
except errors.NotBranchError:
5556
6228
had_explicit_nick = False
5557
6229
if create_branch:
5558
6230
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()
6231
raise errors.BzrCommandError(
6232
gettext('cannot create branch without source branch'))
6233
to_location = lookup_new_sibling_branch(control_dir, to_location,
6234
possible_transports=possible_transports)
6235
to_branch = branch.controldir.sprout(to_location,
6236
possible_transports=possible_transports,
6237
source_branch=branch).open_branch()
5572
to_branch = Branch.open(to_location)
6240
to_branch = Branch.open(to_location,
6241
possible_transports=possible_transports)
5573
6242
except errors.NotBranchError:
5574
this_url = self._get_branch_location(control_dir)
5575
to_branch = Branch.open(
5576
urlutils.join(this_url, '..', to_location))
6243
to_branch = open_sibling_branch(control_dir, to_location,
6244
possible_transports=possible_transports)
5577
6245
if revision is not None:
5578
6246
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
6247
switch.switch(control_dir, to_branch, force, revision_id=revision,
6248
store_uncommitted=store)
5580
6249
if had_explicit_nick:
5581
6250
branch = control_dir.open_branch() #get the new branch!
5582
6251
branch.nick = to_branch.nick
5583
note('Switched to branch: %s',
6252
note(gettext('Switched to branch: %s'),
5584
6253
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
6257
class cmd_view(Command):
5691
tree, file_list = tree_files(file_list, apply_view=False)
6344
tree, file_list = WorkingTree.open_containing_paths(file_list,
5692
6346
current_view, view_dict = tree.views.get_view_info()
5693
6347
if name is None:
5694
6348
name = current_view
5697
raise errors.BzrCommandError(
5698
"Both --delete and a file list specified")
6351
raise errors.BzrCommandError(gettext(
6352
"Both --delete and a file list specified"))
5700
raise errors.BzrCommandError(
5701
"Both --delete and --switch specified")
6354
raise errors.BzrCommandError(gettext(
6355
"Both --delete and --switch specified"))
5703
6357
tree.views.set_view_info(None, {})
5704
self.outf.write("Deleted all views.\n")
6358
self.outf.write(gettext("Deleted all views.\n"))
5705
6359
elif name is None:
5706
raise errors.BzrCommandError("No current view to delete")
6360
raise errors.BzrCommandError(gettext("No current view to delete"))
5708
6362
tree.views.delete_view(name)
5709
self.outf.write("Deleted '%s' view.\n" % name)
6363
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5712
raise errors.BzrCommandError(
5713
"Both --switch and a file list specified")
6366
raise errors.BzrCommandError(gettext(
6367
"Both --switch and a file list specified"))
5715
raise errors.BzrCommandError(
5716
"Both --switch and --all specified")
6369
raise errors.BzrCommandError(gettext(
6370
"Both --switch and --all specified"))
5717
6371
elif switch == 'off':
5718
6372
if current_view is None:
5719
raise errors.BzrCommandError("No current view to disable")
6373
raise errors.BzrCommandError(gettext("No current view to disable"))
5720
6374
tree.views.set_view_info(None, view_dict)
5721
self.outf.write("Disabled '%s' view.\n" % (current_view))
6375
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5723
6377
tree.views.set_view_info(switch, view_dict)
5724
6378
view_str = views.view_display_str(tree.views.lookup_view())
5725
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6379
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5728
self.outf.write('Views defined:\n')
6382
self.outf.write(gettext('Views defined:\n'))
5729
6383
for view in sorted(view_dict):
5730
6384
if view == current_view:
5734
6388
view_str = views.view_display_str(view_dict[view])
5735
6389
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5737
self.outf.write('No views defined.\n')
6391
self.outf.write(gettext('No views defined.\n'))
5738
6392
elif file_list:
5739
6393
if name is None:
5740
6394
# No name given and no current view set
5742
6396
elif name == 'off':
5743
raise errors.BzrCommandError(
5744
"Cannot change the 'off' pseudo view")
6397
raise errors.BzrCommandError(gettext(
6398
"Cannot change the 'off' pseudo view"))
5745
6399
tree.views.set_view(name, sorted(file_list))
5746
6400
view_str = views.view_display_str(tree.views.lookup_view())
5747
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6401
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5749
6403
# list the files
5750
6404
if name is None:
5751
6405
# No name given and no current view set
5752
self.outf.write('No current view.\n')
6406
self.outf.write(gettext('No current view.\n'))
5754
6408
view_str = views.view_display_str(tree.views.lookup_view(name))
5755
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6409
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5758
6412
class cmd_hooks(Command):
5786
6440
Remove the branch at repo/trunk::
5788
bzr remove-branch repo/trunk
6442
brz remove-branch repo/trunk
5792
6446
takes_args = ["location?"]
6448
takes_options = ['directory',
6449
Option('force', help='Remove branch even if it is the active branch.')]
5794
6451
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()
6453
def run(self, directory=None, location=None, force=False):
6454
br = open_nearby_branch(near=directory, location=location)
6455
if not force and br.controldir.has_workingtree():
6457
active_branch = br.controldir.open_branch(name="")
6458
except errors.NotBranchError:
6459
active_branch = None
6460
if (active_branch is not None and
6461
br.control_url == active_branch.control_url):
6462
raise errors.BzrCommandError(
6463
gettext("Branch is active. Use --force to remove it."))
6464
br.controldir.destroy_branch(br.name)
5803
6467
class cmd_shelve(Command):
5804
6468
__doc__ = """Temporarily set aside some changes from the current tree.
5824
6488
You can put multiple items on the shelf, and by default, 'unshelve' will
5825
6489
restore the most recently shelved changes.
6491
For complicated changes, it is possible to edit the changes in a separate
6492
editor program to decide what the file remaining in the working copy
6493
should look like. To do this, add the configuration option
6495
change_editor = PROGRAM @new_path @old_path
6497
where @new_path is replaced with the path of the new version of the
6498
file and @old_path is replaced with the path of the old version of
6499
the file. The PROGRAM should save the new file with the desired
6500
contents of the file in the working tree.
5828
6504
takes_args = ['file*']
5830
6506
takes_options = [
5832
6509
Option('all', help='Shelve all changes.'),
5834
6511
RegistryOption('writer', 'Method to use for writing diffs.',
5835
bzrlib.option.diff_writer_registry,
6512
breezy.option.diff_writer_registry,
5836
6513
value_switches=True, enum_switch=False),
5838
6515
Option('list', help='List shelved changes.'),
5839
6516
Option('destroy',
5840
6517
help='Destroy removed changes instead of shelving them.'),
5842
_see_also = ['unshelve']
6519
_see_also = ['unshelve', 'configuration']
5844
6521
def run(self, revision=None, all=False, file_list=None, message=None,
5845
writer=None, list=False, destroy=False):
6522
writer=None, list=False, destroy=False, directory=None):
5847
return self.run_for_list()
5848
from bzrlib.shelf_ui import Shelver
6524
return self.run_for_list(directory=directory)
6525
from .shelf_ui import Shelver
5849
6526
if writer is None:
5850
writer = bzrlib.option.diff_writer_registry.get()
6527
writer = breezy.option.diff_writer_registry.get()
5852
6529
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
6530
file_list, message, destroy=destroy, directory=directory)
5924
6604
takes_options = ['directory',
5925
6605
Option('ignored', help='Delete all ignored files.'),
5926
Option('detritus', help='Delete conflict files, merge'
6606
Option('detritus', help='Delete conflict files, merge and revert'
5927
6607
' backups, and failed selftest dirs.'),
5928
6608
Option('unknown',
5929
help='Delete files unknown to bzr (default).'),
6609
help='Delete files unknown to brz (default).'),
5930
6610
Option('dry-run', help='Show files to delete instead of'
5931
6611
' deleting them.'),
5932
6612
Option('force', help='Do not prompt before deleting.')]
5933
6613
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5934
6614
force=False, directory=u'.'):
5935
from bzrlib.clean_tree import clean_tree
6615
from .clean_tree import clean_tree
5936
6616
if not (unknown or ignored or detritus):
5988
6668
self.outf.write('%s %s\n' % (path, location))
6671
class cmd_export_pot(Command):
6672
__doc__ = """Export command helps and error messages in po format."""
6675
takes_options = [Option('plugin',
6676
help='Export help text from named command '\
6677
'(defaults to all built in commands).',
6679
Option('include-duplicates',
6680
help='Output multiple copies of the same msgid '
6681
'string if it appears more than once.'),
6684
def run(self, plugin=None, include_duplicates=False):
6685
from .export_pot import export_pot
6686
export_pot(self.outf, plugin, include_duplicates)
6689
class cmd_import(Command):
6690
__doc__ = """Import sources from a directory, tarball or zip file
6692
This command will import a directory, tarball or zip file into a bzr
6693
tree, replacing any versioned files already present. If a directory is
6694
specified, it is used as the target. If the directory does not exist, or
6695
is not versioned, it is created.
6697
Tarballs may be gzip or bzip2 compressed. This is autodetected.
6699
If the tarball or zip has a single root directory, that directory is
6700
stripped when extracting the tarball. This is not done for directories.
6703
takes_args = ['source', 'tree?']
6705
def run(self, source, tree=None):
6706
from .upstream_import import do_import
6707
do_import(source, tree)
6710
class cmd_fetch_ghosts(Command):
6711
__doc__ = """Attempt to retrieve ghosts from another branch.
6713
If the other branch is not supplied, the last-pulled branch is used.
6717
aliases = ['fetch-missing']
6718
takes_args = ['branch?']
6719
takes_options = [Option('no-fix', help="Skip additional synchonization.")]
6721
def run(self, branch=None, no_fix=False):
6722
from .fetch_ghosts import GhostFetcher
6723
installed, failed = GhostFetcher.from_cmdline(branch).run()
6724
if len(installed) > 0:
6725
self.outf.write("Installed:\n")
6726
for rev in installed:
6727
self.outf.write(rev + "\n")
6729
self.outf.write("Still missing:\n")
6731
self.outf.write(rev + "\n")
6732
if not no_fix and len(installed) > 0:
6733
cmd_reconcile().run(".")
5991
6736
def _register_lazy_builtins():
5992
6737
# register lazy builtins from other modules; called at startup and should
5993
6738
# be only called once.
5994
6739
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'),
6740
('cmd_bisect', [], 'breezy.bisect'),
6741
('cmd_bundle_info', [], 'breezy.bundle.commands'),
6742
('cmd_config', [], 'breezy.config'),
6743
('cmd_dpush', [], 'breezy.foreign'),
6744
('cmd_version_info', [], 'breezy.cmd_version_info'),
6745
('cmd_resolve', ['resolved'], 'breezy.conflicts'),
6746
('cmd_conflicts', [], 'breezy.conflicts'),
6747
('cmd_ping', [], 'breezy.bzr.smart.ping'),
6748
('cmd_sign_my_commits', [], 'breezy.commit_signature_commands'),
6749
('cmd_verify_signatures', [], 'breezy.commit_signature_commands'),
6750
('cmd_test_script', [], 'breezy.cmd_test_script'),
6002
6752
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
breezy/builtins.py
