73
78
_parse_revision_str,
75
80
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
86
def _get_branch_location(control_dir, possible_transports=None):
87
"""Return location of branch for this control dir."""
89
this_branch = control_dir.open_branch(
90
possible_transports=possible_transports)
91
# This may be a heavy checkout, where we want the master branch
92
master_location = this_branch.get_bound_location()
93
if master_location is not None:
94
return master_location
95
# If not, use a local sibling
96
return this_branch.base
97
except errors.NotBranchError:
98
format = control_dir.find_branch_format()
99
if getattr(format, 'get_reference', None) is not None:
100
return format.get_reference(control_dir)
102
return control_dir.root_transport.base
105
def _is_colocated(control_dir, possible_transports=None):
106
"""Check if the branch in control_dir is colocated.
108
:param control_dir: Control directory
109
:return: Boolean indicating whether
111
# This path is meant to be relative to the existing branch
112
this_url = _get_branch_location(control_dir,
113
possible_transports=possible_transports)
114
# Perhaps the target control dir supports colocated branches?
116
root = controldir.ControlDir.open(this_url,
117
possible_transports=possible_transports)
118
except errors.NotBranchError:
119
return (False, this_url)
122
wt = control_dir.open_workingtree()
123
except (errors.NoWorkingTree, errors.NotLocalUrl):
124
return (False, this_url)
127
root._format.colocated_branches and
128
control_dir.control_url == root.control_url,
132
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
133
"""Lookup the location for a new sibling branch.
135
:param control_dir: Control directory relative to which to look up
137
:param location: Name of the new branch
138
:return: Full location to the new branch
140
location = directory_service.directories.dereference(location)
141
if '/' not in location and '\\' not in location:
142
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
145
return urlutils.join_segment_parameters(this_url,
146
{"branch": urlutils.escape(location)})
148
return urlutils.join(this_url, '..', urlutils.escape(location))
152
def lookup_sibling_branch(control_dir, location, possible_transports=None):
153
"""Lookup sibling branch.
155
:param control_dir: Control directory relative to which to lookup the
157
:param location: Location to look up
158
:return: branch to open
161
# Perhaps it's a colocated branch?
162
return control_dir.open_branch(location,
163
possible_transports=possible_transports)
164
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
166
return Branch.open(location)
167
except errors.NotBranchError:
168
this_url = _get_branch_location(control_dir)
171
this_url, '..', urlutils.escape(location)))
174
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
175
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]))
177
return internal_tree_files(file_list, default_branch, canonicalize,
88
181
def tree_files_for_add(file_list):
172
268
: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)
270
return WorkingTree.open_containing_paths(
271
file_list, default_directory='.',
223
276
def _get_view_info_for_change_reporter(tree):
353
424
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
427
def run(self, revision_id=None, revision=None, directory=u'.'):
357
428
if revision_id is not None and revision is not None:
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
429
raise errors.BzrCommandError(gettext('You can only supply one of'
430
' revision_id or --revision'))
360
431
if revision_id is None and revision is None:
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
432
raise errors.BzrCommandError(gettext('You must supply either'
433
' --revision or a revision_id'))
435
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
437
revisions = b.repository.revisions
366
438
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
439
raise errors.BzrCommandError(gettext('Repository %r does not support '
440
'access to raw revision texts'))
370
442
b.repository.lock_read()
491
566
location_list=['.']
493
568
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
569
d = controldir.ControlDir.open(location)
497
572
working = d.open_workingtree()
498
573
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
574
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
575
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
576
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
577
" of a remote path"))
504
579
if (working.has_changes()):
505
580
raise errors.UncommittedChanges(working)
581
if working.get_shelf_manager().last_shelf() is not None:
582
raise errors.ShelvedChanges(working)
507
584
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
585
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
586
" from a lightweight checkout"))
511
588
d.destroy_workingtree()
591
class cmd_repair_workingtree(Command):
592
__doc__ = """Reset the working tree state file.
594
This is not meant to be used normally, but more as a way to recover from
595
filesystem corruption, etc. This rebuilds the working inventory back to a
596
'known good' state. Any new modifications (adding a file, renaming, etc)
597
will be lost, though modified files will still be detected as such.
599
Most users will want something more like "bzr revert" or "bzr update"
600
unless the state file has become corrupted.
602
By default this attempts to recover the current state by looking at the
603
headers of the state file. If the state file is too corrupted to even do
604
that, you can supply --revision to force the state of the tree.
607
takes_options = ['revision', 'directory',
609
help='Reset the tree even if it doesn\'t appear to be'
614
def run(self, revision=None, directory='.', force=False):
615
tree, _ = WorkingTree.open_containing(directory)
616
self.add_cleanup(tree.lock_tree_write().unlock)
620
except errors.BzrError:
621
pass # There seems to be a real error here, so we'll reset
624
raise errors.BzrCommandError(gettext(
625
'The tree does not appear to be corrupt. You probably'
626
' want "bzr revert" instead. Use "--force" if you are'
627
' sure you want to reset the working tree.'))
631
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
633
tree.reset_state(revision_ids)
634
except errors.BzrError, e:
635
if revision_ids is None:
636
extra = (gettext(', the header appears corrupt, try passing -r -1'
637
' to set the state to the last commit'))
640
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
643
class cmd_revno(Command):
515
644
__doc__ = """Show current revision number.
520
649
_see_also = ['info']
521
650
takes_args = ['location?']
522
651
takes_options = [
523
Option('tree', help='Show revno of working tree'),
652
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
657
def run(self, tree=False, location=u'.', revision=None):
658
if revision is not None and tree:
659
raise errors.BzrCommandError(gettext("--tree and --revision can "
660
"not be used together"))
530
664
wt = WorkingTree.open_containing(location)[0]
665
self.add_cleanup(wt.lock_read().unlock)
532
666
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
667
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
669
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
542
671
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
672
self.add_cleanup(b.lock_read().unlock)
674
if len(revision) != 1:
675
raise errors.BzrCommandError(gettext(
676
"Tags can only be placed on a single revision, "
678
revid = revision[0].as_revision_id(b)
680
revid = b.last_revision()
682
revno_t = b.revision_id_to_dotted_revno(revid)
683
except errors.NoSuchRevision:
685
revno = ".".join(str(n) for n in revno_t)
546
686
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
687
self.outf.write(revno + '\n')
550
690
class cmd_revision_info(Command):
704
846
takes_args = ['dir+']
850
help='No error if existing, make parent directories as needed.',
705
854
encoding_type = 'replace'
707
def run(self, dir_list):
709
wt, dd = WorkingTree.open_containing(d)
710
base = os.path.dirname(dd)
711
id = wt.path2id(base)
715
self.outf.write('added %s\n' % d)
857
def add_file_with_parents(cls, wt, relpath):
858
if wt.path2id(relpath) is not None:
860
cls.add_file_with_parents(wt, osutils.dirname(relpath))
864
def add_file_single(cls, wt, relpath):
867
def run(self, dir_list, parents=False):
869
add_file = self.add_file_with_parents
871
add_file = self.add_file_single
873
wt, relpath = WorkingTree.open_containing(dir)
878
if e.errno != errno.EEXIST:
717
raise errors.NotVersionedError(path=base)
882
add_file(wt, relpath)
884
self.outf.write(gettext('added %s\n') % dir)
720
887
class cmd_relpath(Command):
828
994
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
996
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
997
if names_list is None:
833
999
if len(names_list) < 2:
834
raise errors.BzrCommandError("missing file argument")
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
1000
raise errors.BzrCommandError(gettext("missing file argument"))
1001
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1002
for file_name in rel_names[0:-1]:
1004
raise errors.BzrCommandError(gettext("can not move root of branch"))
1005
self.add_cleanup(tree.lock_tree_write().unlock)
838
1006
self._run(tree, names_list, rel_names, after)
840
1008
def run_auto(self, names_list, after, dry_run):
841
1009
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
1010
raise errors.BzrCommandError(gettext('Only one path may be specified to'
845
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
1013
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1015
work_tree, file_list = WorkingTree.open_containing_paths(
1016
names_list, default_directory='.')
1017
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
1018
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
1020
def _run(self, tree, names_list, rel_names, after):
960
1132
takes_options = ['remember', 'overwrite', 'revision',
961
1133
custom_help('verbose',
962
1134
help='Show logs of pulled revisions.'),
1135
custom_help('directory',
964
1136
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
1137
'rather than the one containing the working directory.'),
970
1139
help="Perform a local pull in a bound "
971
1140
"branch. Local pulls are not applied to "
972
1141
"the master branch."
1144
help="Show base revision text in conflicts.")
975
1146
takes_args = ['location?']
976
1147
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1149
def run(self, location=None, remember=None, overwrite=False,
979
1150
revision=None, verbose=False,
980
directory=None, local=False):
1151
directory=None, local=False,
981
1153
# FIXME: too much stuff is in the command class
982
1154
revision_id = None
983
1155
mergeable = None
1110
1288
Option('strict',
1111
1289
help='Refuse to push if there are uncommitted changes in'
1112
1290
' the working tree, --no-strict disables the check.'),
1292
help="Don't populate the working tree, even for protocols"
1293
" that support it."),
1114
1295
takes_args = ['location?']
1115
1296
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1298
def run(self, location=None, remember=None, overwrite=False,
1118
1299
create_prefix=False, verbose=False, revision=None,
1119
1300
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1301
stacked=False, strict=None, no_tree=False):
1121
1302
from bzrlib.push import _show_push_branch
1123
1304
if directory is None:
1124
1305
directory = '.'
1125
1306
# Get the source branch
1126
1307
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1308
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1128
1309
# Get the tip's revision_id
1129
1310
revision = _get_one_revision('push', revision)
1130
1311
if revision is not None:
1151
1332
# error by the feedback given to them. RBC 20080227.
1152
1333
stacked_on = parent_url
1153
1334
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1335
raise errors.BzrCommandError(gettext(
1336
"Could not determine branch to refer to."))
1157
1338
# Get the destination location
1158
1339
if location is None:
1159
1340
stored_loc = br_from.get_push_location()
1160
1341
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1342
parent_loc = br_from.get_parent()
1344
raise errors.BzrCommandError(gettext(
1345
"No push location known or specified. To push to the "
1346
"parent branch (at %s), use 'bzr push :parent'." %
1347
urlutils.unescape_for_display(parent_loc,
1348
self.outf.encoding)))
1350
raise errors.BzrCommandError(gettext(
1351
"No push location known or specified."))
1164
1353
display_url = urlutils.unescape_for_display(stored_loc,
1165
1354
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1355
note(gettext("Using saved push location: %s") % display_url)
1167
1356
location = stored_loc
1169
1358
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1359
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1360
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1361
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1364
class cmd_branch(Command):
1214
1407
def run(self, from_location, to_location=None, revision=None,
1215
1408
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1409
use_existing_dir=False, switch=False, bind=False,
1217
1411
from bzrlib import switch as _mod_switch
1218
1412
from bzrlib.tag import _merge_tags_if_possible
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1413
if self.invoked_as in ['get', 'clone']:
1414
ui.ui_factory.show_user_warning(
1415
'deprecated_command',
1416
deprecated_name=self.invoked_as,
1417
recommended_name='branch',
1418
deprecated_in_version='2.4')
1419
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1421
if not (hardlink or files_from):
1422
# accelerator_tree is usually slower because you have to read N
1423
# files (no readahead, lots of seeks, etc), but allow the user to
1424
# explicitly request it
1425
accelerator_tree = None
1426
if files_from is not None and files_from != from_location:
1427
accelerator_tree = WorkingTree.open(files_from)
1221
1428
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1429
self.add_cleanup(br_from.lock_read().unlock)
1224
1430
if revision is not None:
1225
1431
revision_id = revision.as_revision_id(br_from)
1230
1436
revision_id = br_from.last_revision()
1231
1437
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1438
to_location = getattr(br_from, "name", None)
1440
to_location = urlutils.derive_to_location(from_location)
1233
1441
to_transport = transport.get_transport(to_location)
1235
1443
to_transport.mkdir('.')
1236
1444
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1446
to_dir = controldir.ControlDir.open_from_transport(
1448
except errors.NotBranchError:
1449
if not use_existing_dir:
1450
raise errors.BzrCommandError(gettext('Target directory "%s" '
1451
'already exists.') % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1456
to_dir.open_branch()
1243
1457
except errors.NotBranchError:
1246
1460
raise errors.AlreadyBranchError(to_location)
1247
1461
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1462
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1264
raise errors.BzrCommandError(msg)
1468
# preserve whatever source format we have.
1469
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1470
possible_transports=[to_transport],
1471
accelerator_tree=accelerator_tree,
1472
hardlink=hardlink, stacked=stacked,
1473
force_new_repo=standalone,
1474
create_tree_if_local=not no_tree,
1475
source_branch=br_from)
1476
branch = to_dir.open_branch(
1477
possible_transports=[
1478
br_from.bzrdir.root_transport, to_transport])
1479
except errors.NoSuchRevision:
1480
to_transport.delete_tree('.')
1481
msg = gettext("The branch {0} has no revision {1}.").format(
1482
from_location, revision)
1483
raise errors.BzrCommandError(msg)
1486
to_repo = to_dir.open_repository()
1487
except errors.NoRepositoryPresent:
1488
to_repo = to_dir.create_repository()
1489
to_repo.fetch(br_from.repository, revision_id=revision_id)
1490
branch = br_from.sprout(to_dir, revision_id=revision_id)
1265
1491
_merge_tags_if_possible(br_from, branch)
1266
1492
# If the source branch is stacked, the new branch may
1267
1493
# be stacked whether we asked for that explicitly or not.
1268
1494
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1496
note(gettext('Created new stacked branch referring to %s.') %
1271
1497
branch.get_stacked_on_url())
1272
1498
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
1499
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1500
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1502
# Bind to the parent
1277
1503
parent_branch = Branch.open(from_location)
1278
1504
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1505
note(gettext('New branch bound to %s') % from_location)
1281
1507
# Switch to the new branch
1282
1508
wt, _ = WorkingTree.open_containing('.')
1283
1509
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1510
note(gettext('Switched to branch: %s'),
1285
1511
urlutils.unescape_for_display(branch.base, 'utf-8'))
1514
class cmd_branches(Command):
1515
__doc__ = """List the branches available at the current location.
1517
This command will print the names of all the branches at the current
1521
takes_args = ['location?']
1523
Option('recursive', short_name='R',
1524
help='Recursively scan for branches rather than '
1525
'just looking in the specified location.')]
1527
def run(self, location=".", recursive=False):
1529
t = transport.get_transport(location)
1530
if not t.listable():
1531
raise errors.BzrCommandError(
1532
"Can't scan this type of location.")
1533
for b in controldir.ControlDir.find_branches(t):
1534
self.outf.write("%s\n" % urlutils.unescape_for_display(
1535
urlutils.relative_url(t.base, b.base),
1536
self.outf.encoding).rstrip("/"))
1538
dir = controldir.ControlDir.open_containing(location)[0]
1540
active_branch = dir.open_branch(name="")
1541
except errors.NotBranchError:
1542
active_branch = None
1543
branches = dir.get_branches()
1545
for name, branch in branches.iteritems():
1548
active = (active_branch is not None and
1549
active_branch.base == branch.base)
1550
names[name] = active
1551
# Only mention the current branch explicitly if it's not
1552
# one of the colocated branches
1553
if not any(names.values()) and active_branch is not None:
1554
self.outf.write("* %s\n" % gettext("(default)"))
1555
for name in sorted(names.keys()):
1556
active = names[name]
1561
self.outf.write("%s %s\n" % (
1562
prefix, name.encode(self.outf.encoding)))
1288
1565
class cmd_checkout(Command):
1289
1566
__doc__ = """Create a new checkout of an existing branch.
1389
1669
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1392
This will perform a merge into the working tree, and may generate
1393
conflicts. If you have any local changes, you will still
1394
need to commit them after the update for the update to be complete.
1396
If you want to discard your local changes, you can just do a
1397
'bzr revert' instead of 'bzr commit' after the update.
1399
If the tree's branch is bound to a master branch, it will also update
1670
__doc__ = """Update a working tree to a new revision.
1672
This will perform a merge of the destination revision (the tip of the
1673
branch, or the specified revision) into the working tree, and then make
1674
that revision the basis revision for the working tree.
1676
You can use this to visit an older revision, or to update a working tree
1677
that is out of date from its branch.
1679
If there are any uncommitted changes in the tree, they will be carried
1680
across and remain as uncommitted changes after the update. To discard
1681
these changes, use 'bzr revert'. The uncommitted changes may conflict
1682
with the changes brought in by the change in basis revision.
1684
If the tree's branch is bound to a master branch, bzr will also update
1400
1685
the branch from the master.
1687
You cannot update just a single file or directory, because each Bazaar
1688
working tree has just a single basis revision. If you want to restore a
1689
file that has been removed locally, use 'bzr revert' instead of 'bzr
1690
update'. If you want to restore a file to its state in a previous
1691
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1692
out the old content of that file to a new location.
1694
The 'dir' argument, if given, must be the location of the root of a
1695
working tree to update. By default, the working tree that contains the
1696
current working directory is used.
1403
1699
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1700
takes_args = ['dir?']
1405
takes_options = ['revision']
1701
takes_options = ['revision',
1703
help="Show base revision text in conflicts."),
1406
1705
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1707
def run(self, dir=None, revision=None, show_base=None):
1409
1708
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1412
tree = WorkingTree.open_containing(dir)[0]
1709
raise errors.BzrCommandError(gettext(
1710
"bzr update --revision takes exactly one revision"))
1712
tree = WorkingTree.open_containing('.')[0]
1714
tree, relpath = WorkingTree.open_containing(dir)
1717
raise errors.BzrCommandError(gettext(
1718
"bzr update can only update a whole tree, "
1719
"not a file or subdirectory"))
1413
1720
branch = tree.branch
1414
1721
possible_transports = []
1415
1722
master = branch.get_master_branch(
1416
1723
possible_transports=possible_transports)
1417
1724
if master is not None:
1419
1725
branch_location = master.base
1728
branch_location = tree.branch.base
1421
1729
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1730
self.add_cleanup(tree.unlock)
1424
1731
# get rid of the final '/' and be ready for display
1425
1732
branch_location = urlutils.unescape_for_display(
1451
1758
change_reporter,
1452
1759
possible_transports=possible_transports,
1453
1760
revision=revision_id,
1762
show_base=show_base)
1455
1763
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1764
raise errors.BzrCommandError(gettext(
1457
1765
"branch has no revision %s\n"
1458
1766
"bzr update --revision only works"
1459
" for a revision in the branch history"
1767
" for a revision in the branch history")
1460
1768
% (e.revision))
1461
1769
revno = tree.branch.revision_id_to_dotted_revno(
1462
1770
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1771
note(gettext('Updated to revision {0} of branch {1}').format(
1772
'.'.join(map(str, revno)), branch_location))
1465
1773
parent_ids = tree.get_parent_ids()
1466
1774
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1775
note(gettext('Your local commits will now show as pending merges with '
1776
"'bzr status', and can be committed with 'bzr commit'."))
1469
1777
if conflicts != 0:
1530
1839
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1840
'The file deletion mode to be used.',
1532
1841
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1842
safe='Backup changed files (default).',
1535
1843
keep='Delete from bzr but leave the working copy.',
1844
no_backup='Don\'t backup changed files.',
1536
1845
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1846
'recovered and even if they are non-empty directories. '
1847
'(deprecated, use no-backup)')]
1538
1848
aliases = ['rm', 'del']
1539
1849
encoding_type = 'replace'
1541
1851
def run(self, file_list, verbose=False, new=False,
1542
1852
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1853
if file_deletion_strategy == 'force':
1854
note(gettext("(The --force option is deprecated, rather use --no-backup "
1856
file_deletion_strategy = 'no-backup'
1858
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1860
if file_list is not None:
1546
1861
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1863
self.add_cleanup(tree.lock_write().unlock)
1550
1864
# Heuristics should probably all move into tree.remove_smart or
1742
2072
to_transport.ensure_base()
1743
2073
except errors.NoSuchFile:
1744
2074
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
2075
raise errors.BzrCommandError(gettext("Parent directory of %s"
1746
2076
" does not exist."
1747
2077
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
2078
" leading parent directories.")
1750
2080
to_transport.create_prefix()
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2083
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1754
2084
except errors.NotBranchError:
1755
2085
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
2086
create_branch = controldir.ControlDir.create_branch_convenience
2088
force_new_tree = False
2090
force_new_tree = None
1757
2091
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
2092
possible_transports=[to_transport],
2093
force_new_tree=force_new_tree)
1759
2094
a_bzrdir = branch.bzrdir
1761
2096
from bzrlib.transport.local import LocalTransport
1837
2174
def run(self, location, format=None, no_trees=False):
1838
2175
if format is None:
1839
format = bzrdir.format_registry.make_bzrdir('default')
2176
format = controldir.format_registry.make_bzrdir('default')
1841
2178
if location is None:
1844
2181
to_transport = transport.get_transport(location)
1845
to_transport.ensure_base()
1847
newdir = format.initialize_on_transport(to_transport)
1848
repo = newdir.create_repository(shared=True)
1849
repo.set_make_working_trees(not no_trees)
2183
(repo, newdir, require_stacking, repository_policy) = (
2184
format.initialize_on_transport_ex(to_transport,
2185
create_prefix=True, make_working_trees=not no_trees,
2186
shared_repo=True, force_new_repo=True,
2187
use_existing_dir=True,
2188
repo_format_name=format.repository_format.get_format_string()))
1850
2189
if not is_quiet():
1851
2190
from bzrlib.info import show_bzrdir_info
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2191
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1855
2194
class cmd_diff(Command):
1969
2325
elif ':' in prefix:
1970
2326
old_label, new_label = prefix.split(":")
1972
raise errors.BzrCommandError(
2328
raise errors.BzrCommandError(gettext(
1973
2329
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2330
' (eg "old/:new/")'))
1976
2332
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2333
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2334
' one or two revision specifiers'))
1980
2336
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2337
raise errors.BzrCommandError(gettext(
2338
'{0} and {1} are mutually exclusive').format(
2339
'--using', '--format'))
1984
2341
(old_tree, new_tree,
1985
2342
old_branch, new_branch,
1986
2343
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2344
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2345
# GNU diff on Windows uses ANSI encoding for filenames
2346
path_encoding = osutils.get_diff_header_encoding()
1988
2347
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2348
specific_files=specific_files,
1990
2349
external_diff_options=diff_options,
1991
2350
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2351
extra_trees=extra_trees,
2352
path_encoding=path_encoding,
1993
2354
format_cls=format)
2053
2410
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2411
takes_options = ['directory', 'null']
2060
2413
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2414
def run(self, null=False, directory=u'.'):
2415
wt = WorkingTree.open_containing(directory)[0]
2416
self.add_cleanup(wt.lock_read().unlock)
2065
2417
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2418
self.add_cleanup(basis.lock_read().unlock)
2068
2419
basis_inv = basis.inventory
2069
2420
inv = wt.inventory
2070
2421
for file_id in inv:
2071
if file_id in basis_inv:
2422
if basis_inv.has_id(file_id):
2073
2424
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2426
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2427
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2430
self.outf.write(path + '\0')
2297
2656
Option('show-diff',
2298
2657
short_name='p',
2299
2658
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2659
Option('include-merged',
2301
2660
help='Show merged revisions like --levels 0 does.'),
2661
Option('include-merges', hidden=True,
2662
help='Historical alias for --include-merged.'),
2663
Option('omit-merges',
2664
help='Do not report commits with more than one parent.'),
2302
2665
Option('exclude-common-ancestry',
2303
2666
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2667
' of both ancestries (require -rX..Y).'
2669
Option('signatures',
2670
help='Show digital signature validity.'),
2673
help='Show revisions whose properties match this '
2676
ListOption('match-message',
2677
help='Show revisions whose message matches this '
2680
ListOption('match-committer',
2681
help='Show revisions whose committer matches this '
2684
ListOption('match-author',
2685
help='Show revisions whose authors match this '
2688
ListOption('match-bugs',
2689
help='Show revisions whose bugs match this '
2307
2693
encoding_type = 'replace'
2327
2722
_get_info_for_log_files,
2329
2724
direction = (forward and 'forward') or 'reverse'
2725
if symbol_versioning.deprecated_passed(include_merges):
2726
ui.ui_factory.show_user_warning(
2727
'deprecated_command_option',
2728
deprecated_name='--include-merges',
2729
recommended_name='--include-merged',
2730
deprecated_in_version='2.5',
2731
command=self.invoked_as)
2732
if include_merged is None:
2733
include_merged = include_merges
2735
raise errors.BzrCommandError(gettext(
2736
'{0} and {1} are mutually exclusive').format(
2737
'--include-merges', '--include-merged'))
2738
if include_merged is None:
2739
include_merged = False
2330
2740
if (exclude_common_ancestry
2331
2741
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2742
raise errors.BzrCommandError(gettext(
2743
'--exclude-common-ancestry requires -r with two revisions'))
2335
2745
if levels is None:
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2748
raise errors.BzrCommandError(gettext(
2749
'{0} and {1} are mutually exclusive').format(
2750
'--levels', '--include-merged'))
2341
2752
if change is not None:
2342
2753
if len(change) > 1:
2343
2754
raise errors.RangeInChangeOption()
2344
2755
if revision is not None:
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2756
raise errors.BzrCommandError(gettext(
2757
'{0} and {1} are mutually exclusive').format(
2758
'--revision', '--change'))
2348
2760
revision = change
2528
2958
help='Recurse into subdirectories.'),
2529
2959
Option('from-root',
2530
2960
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2961
Option('unknown', short_name='u',
2962
help='Print unknown files.'),
2532
2963
Option('versioned', help='Print versioned files.',
2533
2964
short_name='V'),
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2965
Option('ignored', short_name='i',
2966
help='Print ignored files.'),
2967
Option('kind', short_name='k',
2539
2968
help='List entries of a particular kind: file, directory, symlink.',
2543
2974
@display_command
2544
2975
def run(self, revision=None, verbose=False,
2545
2976
recursive=False, from_root=False,
2546
2977
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2978
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2980
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2981
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
2983
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2984
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
2985
all = not (unknown or versioned or ignored)
2556
2987
selection = {'I':ignored, '?':unknown, 'V':versioned}
2725
3166
self.outf.write("%s\n" % pattern)
2727
3168
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3169
raise errors.BzrCommandError(gettext("ignore requires at least one "
3170
"NAME_PATTERN or --default-rules."))
2730
3171
name_pattern_list = [globbing.normalize_pattern(p)
2731
3172
for p in name_pattern_list]
3174
bad_patterns_count = 0
3175
for p in name_pattern_list:
3176
if not globbing.Globster.is_pattern_valid(p):
3177
bad_patterns_count += 1
3178
bad_patterns += ('\n %s' % p)
3180
msg = (ngettext('Invalid ignore pattern found. %s',
3181
'Invalid ignore patterns found. %s',
3182
bad_patterns_count) % bad_patterns)
3183
ui.ui_factory.show_error(msg)
3184
raise errors.InvalidPattern('')
2732
3185
for name_pattern in name_pattern_list:
2733
3186
if (name_pattern[0] == '/' or
2734
3187
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
raise errors.BzrCommandError(
2736
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
3188
raise errors.BzrCommandError(gettext(
3189
"NAME_PATTERN should not be an absolute path"))
3190
tree, relpath = WorkingTree.open_containing(directory)
2738
3191
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3192
ignored = globbing.Globster(name_pattern_list)
3194
self.add_cleanup(tree.lock_read().unlock)
2742
3195
for entry in tree.list_files():
2744
3197
if id is not None:
2745
3198
filename = entry[0]
2746
3199
if ignored.match(filename):
2747
3200
matches.append(filename)
2749
3201
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3202
self.outf.write(gettext("Warning: the following files are version "
3203
"controlled and match your ignore pattern:\n%s"
2752
3204
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3205
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2756
3208
class cmd_ignored(Command):
2842
3296
Option('per-file-timestamps',
2843
3297
help='Set modification time of files to that of the last '
2844
3298
'revision in which it was changed.'),
3299
Option('uncommitted',
3300
help='Export the working tree contents rather than that of the '
2846
3303
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
3304
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2848
3306
from bzrlib.export import export
2850
3308
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
3309
branch_or_subdir = directory
3311
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3313
if tree is not None:
3314
self.add_cleanup(tree.lock_read().unlock)
3318
raise errors.BzrCommandError(
3319
gettext("--uncommitted requires a working tree"))
2855
b, subdir = Branch.open_containing(branch_or_subdir)
2858
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3322
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3324
export(export_tree, dest, format, root, subdir, filtered=filters,
2861
3325
per_file_timestamps=per_file_timestamps)
2862
3326
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3327
raise errors.BzrCommandError(
3328
gettext('Unsupported export format: %s') % e.format)
2866
3331
class cmd_cat(Command):
2900
3364
if tree is None:
2901
3365
tree = b.basis_tree()
2902
3366
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3367
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3369
old_file_id = rev_tree.path2id(relpath)
3371
# TODO: Split out this code to something that generically finds the
3372
# best id for a path across one or more trees; it's like
3373
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3375
if name_from_revision:
2909
3376
# Try in revision if requested
2910
3377
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3378
raise errors.BzrCommandError(gettext(
3379
"{0!r} is not present in revision {1}").format(
2913
3380
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3382
actual_file_id = old_file_id
2917
3384
cur_file_id = tree.path2id(relpath)
2919
if cur_file_id is not None:
2920
# Then try with the actual file id
2922
content = rev_tree.get_file_text(cur_file_id)
2924
except errors.NoSuchId:
2925
# The actual file id didn't exist at that time
2927
if not found and old_file_id is not None:
2928
# Finally try with the old file id
2929
content = rev_tree.get_file_text(old_file_id)
2932
# Can't be found anywhere
2933
raise errors.BzrCommandError(
2934
"%r is not present in revision %s" % (
3385
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3386
actual_file_id = cur_file_id
3387
elif old_file_id is not None:
3388
actual_file_id = old_file_id
3390
raise errors.BzrCommandError(gettext(
3391
"{0!r} is not present in revision {1}").format(
2935
3392
filename, rev_tree.get_revision_id()))
2937
from bzrlib.filters import (
2938
ContentFilterContext,
2939
filtered_output_bytes,
2941
filters = rev_tree._content_filter_stack(relpath)
2942
chunks = content.splitlines(True)
2943
content = filtered_output_bytes(chunks, filters,
2944
ContentFilterContext(relpath, rev_tree))
2946
self.outf.writelines(content)
3394
from bzrlib.filter_tree import ContentFilterTree
3395
filter_tree = ContentFilterTree(rev_tree,
3396
rev_tree._content_filter_stack)
3397
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3399
content = rev_tree.get_file_text(actual_file_id)
3401
self.outf.write(content)
2952
3404
class cmd_local_time_offset(Command):
3013
3465
to trigger updates to external systems like bug trackers. The --fixes
3014
3466
option can be used to record the association between a revision and
3015
3467
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3034
# TODO: Run hooks on tree to-be-committed, and after commit.
3036
# TODO: Strict commit that fails if there are deleted files.
3037
# (what does "deleted files" mean ??)
3039
# TODO: Give better message for -s, --summary, used by tla people
3041
# XXX: verbose currently does nothing
3043
3470
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3471
takes_args = ['selected*']
3076
3503
Option('show-diff', short_name='p',
3077
3504
help='When no message is supplied, show the diff along'
3078
3505
' with the status summary in the message editor.'),
3507
help='When committing to a foreign version control '
3508
'system do not push data that can not be natively '
3080
3511
aliases = ['ci', 'checkin']
3082
3513
def _iter_bug_fix_urls(self, fixes, branch):
3514
default_bugtracker = None
3083
3515
# Configure the properties for bug fixing attributes.
3084
3516
for fixed_bug in fixes:
3085
3517
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3518
if len(tokens) == 1:
3519
if default_bugtracker is None:
3520
branch_config = branch.get_config()
3521
default_bugtracker = branch_config.get_user_option(
3523
if default_bugtracker is None:
3524
raise errors.BzrCommandError(gettext(
3525
"No tracker specified for bug %s. Use the form "
3526
"'tracker:id' or specify a default bug tracker "
3527
"using the `bugtracker` option.\nSee "
3528
"\"bzr help bugs\" for more information on this "
3529
"feature. Commit refused.") % fixed_bug)
3530
tag = default_bugtracker
3532
elif len(tokens) != 2:
3533
raise errors.BzrCommandError(gettext(
3088
3534
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
3535
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3536
"feature.\nCommit refused.") % fixed_bug)
3538
tag, bug_id = tokens
3093
3540
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
3541
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3542
raise errors.BzrCommandError(gettext(
3543
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3097
3544
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3545
raise errors.BzrCommandError(gettext(
3546
"%s\nCommit refused.") % (str(e),))
3101
3548
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3549
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3550
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3552
from bzrlib.errors import (
3105
3553
PointlessCommit,
3106
3554
ConflictsInTree,
3184
3630
# make_commit_message_template_encoded returns user encoding.
3185
3631
# We probably want to be using edit_commit_message instead to
3187
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3189
start_message=start_message)
3190
if my_message is None:
3191
raise errors.BzrCommandError("please specify a commit"
3192
" message with either --message or --file")
3193
if my_message == "":
3194
raise errors.BzrCommandError("empty commit message specified")
3633
my_message = set_commit_message(commit_obj)
3634
if my_message is None:
3635
start_message = generate_commit_message_template(commit_obj)
3636
my_message = edit_commit_message_encoded(text,
3637
start_message=start_message)
3638
if my_message is None:
3639
raise errors.BzrCommandError(gettext("please specify a commit"
3640
" message with either --message or --file"))
3641
if my_message == "":
3642
raise errors.BzrCommandError(gettext("Empty commit message specified."
3643
" Please specify a commit message with either"
3644
" --message or --file or leave a blank message"
3645
" with --message \"\"."))
3195
3646
return my_message
3197
3648
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3656
reporter=None, verbose=verbose, revprops=properties,
3206
3657
authors=author, timestamp=commit_stamp,
3207
3658
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3659
exclude=tree.safe_relpath_files(exclude),
3209
3661
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3662
raise errors.BzrCommandError(gettext("No changes to commit."
3663
" Please 'bzr add' the files you want to commit, or use"
3664
" --unchanged to force an empty commit."))
3212
3665
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3666
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3214
3667
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3216
3669
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3670
raise errors.BzrCommandError(gettext("Commit refused because there are"
3671
" unknown files in the working tree."))
3219
3672
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3673
e.extra_help = (gettext("\n"
3221
3674
'To commit to master branch, run update and then commit.\n'
3222
3675
'You can also pass --local to commit to continue working '
3297
3750
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
3300
The check command or bzr developers may sometimes advise you to run
3301
this command. When the default format has changed you may also be warned
3302
during other operations to upgrade.
3751
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3753
When the default format has changed after a major new release of
3754
Bazaar, you may be informed during certain operations that you
3755
should upgrade. Upgrading to a newer format may improve performance
3756
or make new features available. It may however limit interoperability
3757
with older repositories or with older versions of Bazaar.
3759
If you wish to upgrade to a particular format rather than the
3760
current default, that can be specified using the --format option.
3761
As a consequence, you can use the upgrade command this way to
3762
"downgrade" to an earlier format, though some conversions are
3763
a one way process (e.g. changing from the 1.x default to the
3764
2.x default) so downgrading is not always possible.
3766
A backup.bzr.~#~ directory is created at the start of the conversion
3767
process (where # is a number). By default, this is left there on
3768
completion. If the conversion fails, delete the new .bzr directory
3769
and rename this one back in its place. Use the --clean option to ask
3770
for the backup.bzr directory to be removed on successful conversion.
3771
Alternatively, you can delete it by hand if everything looks good
3774
If the location given is a shared repository, dependent branches
3775
are also converted provided the repository converts successfully.
3776
If the conversion of a branch fails, remaining branches are still
3779
For more information on upgrades, see the Bazaar Upgrade Guide,
3780
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3783
_see_also = ['check', 'reconcile', 'formats']
3306
3784
takes_args = ['url?']
3307
3785
takes_options = [
3308
RegistryOption('format',
3309
help='Upgrade to a specific format. See "bzr help'
3310
' formats" for details.',
3311
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3312
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3313
value_switches=True, title='Branch format'),
3786
RegistryOption('format',
3787
help='Upgrade to a specific format. See "bzr help'
3788
' formats" for details.',
3789
lazy_registry=('bzrlib.controldir', 'format_registry'),
3790
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3791
value_switches=True, title='Branch format'),
3793
help='Remove the backup.bzr directory if successful.'),
3795
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3798
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3799
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3800
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3802
if len(exceptions) == 1:
3803
# Compatibility with historical behavior
3321
3809
class cmd_whoami(Command):
3340
3829
encoding_type = 'replace'
3342
3831
@display_command
3343
def run(self, email=False, branch=False, name=None):
3832
def run(self, email=False, branch=False, name=None, directory=None):
3344
3833
if name is None:
3345
# use branch if we're inside one; otherwise global config
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3834
if directory is None:
3835
# use branch if we're inside one; otherwise global config
3837
c = Branch.open_containing(u'.')[0].get_config_stack()
3838
except errors.NotBranchError:
3839
c = _mod_config.GlobalStack()
3841
c = Branch.open(directory).get_config_stack()
3842
identity = c.get('email')
3351
self.outf.write(c.user_email() + '\n')
3844
self.outf.write(_mod_config.extract_email_address(identity)
3353
self.outf.write(c.username() + '\n')
3847
self.outf.write(identity + '\n')
3851
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3854
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3856
_mod_config.extract_email_address(name)
3359
3857
except errors.NoEmailInUsername, e:
3360
3858
warning('"%s" does not seem to contain an email address. '
3361
3859
'This is allowed, but not recommended.', name)
3363
3861
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3863
if directory is None:
3864
c = Branch.open_containing(u'.')[0].get_config_stack()
3866
c = Branch.open(directory).get_config_stack()
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3868
c = _mod_config.GlobalStack()
3869
c.set('email', name)
3371
3872
class cmd_nick(Command):
3372
3873
__doc__ = """Print or set the branch nickname.
3374
If unset, the tree root directory name is used as the nickname.
3375
To print the current nickname, execute with no argument.
3875
If unset, the colocated branch name is used for colocated branches, and
3876
the branch directory name is used for other branches. To print the
3877
current nickname, execute with no argument.
3377
3879
Bound branches use the nickname of its master branch unless it is set
3586
4093
def run(self, testspecs_list=None, verbose=False, one=False,
3587
4094
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
4096
first=False, list_only=False,
3590
4097
randomize=None, exclude=None, strict=False,
3591
4098
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
parallel=None, lsprof_tests=False):
3593
from bzrlib.tests import selftest
3594
import bzrlib.benchmarks as benchmarks
3595
from bzrlib.benchmarks import tree_creator
3597
# Make deprecation warnings visible, unless -Werror is set
3598
symbol_versioning.activate_deprecation_warnings(override=False)
3600
if cache_dir is not None:
3601
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
4099
parallel=None, lsprof_tests=False,
4102
# During selftest, disallow proxying, as it can cause severe
4103
# performance penalties and is only needed for thread
4104
# safety. The selftest command is assumed to not use threads
4105
# too heavily. The call should be as early as possible, as
4106
# error reporting for past duplicate imports won't have useful
4108
lazy_import.disallow_proxying()
4110
from bzrlib import tests
3602
4112
if testspecs_list is not None:
3603
4113
pattern = '|'.join(testspecs_list)
3608
4118
from bzrlib.tests import SubUnitBzrRunner
3609
4119
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
4120
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4121
"needs to be installed to use --subunit."))
3612
4122
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
4123
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
4124
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4125
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4126
# following code can be deleted when it's sufficiently deployed
4127
# -- vila/mgz 20100514
4128
if (sys.platform == "win32"
4129
and getattr(sys.stdout, 'fileno', None) is not None):
3617
4131
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
4133
self.additional_selftest_args.setdefault(
3620
4134
'suite_decorators', []).append(parallel)
3622
test_suite_factory = benchmarks.test_suite
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
verbose = not is_quiet()
3625
# TODO: should possibly lock the history file...
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
4136
raise errors.BzrCommandError(gettext(
4137
"--benchmark is no longer supported from bzr 2.2; "
4138
"use bzr-usertest instead"))
4139
test_suite_factory = None
4141
exclude_pattern = None
3629
test_suite_factory = None
4143
exclude_pattern = '(' + '|'.join(exclude) + ')'
4145
self._disable_fsync()
3631
4146
selftest_kwargs = {"verbose": verbose,
3632
4147
"pattern": pattern,
3633
4148
"stop_on_failure": one,
3635
4150
"test_suite_factory": test_suite_factory,
3636
4151
"lsprof_timed": lsprof_timed,
3637
4152
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
4153
"matching_tests_first": first,
3640
4154
"list_only": list_only,
3641
4155
"random_seed": randomize,
3642
"exclude_pattern": exclude,
4156
"exclude_pattern": exclude_pattern,
3643
4157
"strict": strict,
3644
4158
"load_list": load_list,
3645
4159
"debug_flags": debugflag,
3646
4160
"starting_with": starting_with
3648
4162
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
4164
# Make deprecation warnings visible, unless -Werror is set
4165
cleanup = symbol_versioning.activate_deprecation_warnings(
4168
result = tests.selftest(**selftest_kwargs)
3650
4171
return int(not result)
4173
def _disable_fsync(self):
4174
"""Change the 'os' functionality to not synchronize."""
4175
self._orig_fsync = getattr(os, 'fsync', None)
4176
if self._orig_fsync is not None:
4177
os.fsync = lambda filedes: None
4178
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4179
if self._orig_fdatasync is not None:
4180
os.fdatasync = lambda filedes: None
3653
4183
class cmd_version(Command):
3654
4184
__doc__ = """Show version of bzr."""
3709
4237
The source of the merge can be specified either in the form of a branch,
3710
4238
or in the form of a path to a file containing a merge directive generated
3711
4239
with bzr send. If neither is specified, the default is the upstream branch
3712
or the branch most recently merged using --remember.
3714
When merging a branch, by default the tip will be merged. To pick a different
3715
revision, pass --revision. If you specify two values, the first will be used as
3716
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3717
available revisions, like this is commonly referred to as "cherrypicking".
3719
Revision numbers are always relative to the branch being merged.
3721
By default, bzr will try to merge in all new work from the other
3722
branch, automatically determining an appropriate base. If this
3723
fails, you may need to give an explicit base.
4240
or the branch most recently merged using --remember. The source of the
4241
merge may also be specified in the form of a path to a file in another
4242
branch: in this case, only the modifications to that file are merged into
4243
the current working tree.
4245
When merging from a branch, by default bzr will try to merge in all new
4246
work from the other branch, automatically determining an appropriate base
4247
revision. If this fails, you may need to give an explicit base.
4249
To pick a different ending revision, pass "--revision OTHER". bzr will
4250
try to merge in all new work up to and including revision OTHER.
4252
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4253
through OTHER, excluding BASE but including OTHER, will be merged. If this
4254
causes some revisions to be skipped, i.e. if the destination branch does
4255
not already contain revision BASE, such a merge is commonly referred to as
4256
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4257
cherrypicks. The changes look like a normal commit, and the history of the
4258
changes from the other branch is not stored in the commit.
4260
Revision numbers are always relative to the source branch.
3725
4262
Merge will do its best to combine the changes in two branches, but there
3726
4263
are some kinds of problems only a human can fix. When it encounters those,
3727
4264
it will mark a conflict. A conflict means that you need to fix something,
3728
before you should commit.
4265
before you can commit.
3730
4267
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3732
If there is no default branch set, the first merge will set it. After
3733
that, you can omit the branch to use the default. To change the
3734
default, use --remember. The value will only be saved if the remote
3735
location can be accessed.
4269
If there is no default branch set, the first merge will set it (use
4270
--no-remember to avoid setting it). After that, you can omit the branch
4271
to use the default. To change the default, use --remember. The value will
4272
only be saved if the remote location can be accessed.
3737
4274
The results of the merge are placed into the destination working
3738
4275
directory, where they can be reviewed (with bzr diff), tested, and then
3739
4276
committed to record the result of the merge.
3741
4278
merge refuses to run if there are any uncommitted changes, unless
3742
--force is given. The --force option can also be used to create a
4279
--force is given. If --force is given, then the changes from the source
4280
will be merged with the current working tree, including any uncommitted
4281
changes in the tree. The --force option can also be used to create a
3743
4282
merge revision which has more than two parents.
3745
4284
If one would like to merge changes from the working tree of the other
3873
4412
self.sanity_check_merger(merger)
3874
4413
if (merger.base_rev_id == merger.other_rev_id and
3875
4414
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4415
# check if location is a nonexistent file (and not a branch) to
4416
# disambiguate the 'Nothing to do'
4417
if merger.interesting_files:
4418
if not merger.other_tree.has_filename(
4419
merger.interesting_files[0]):
4420
note(gettext("merger: ") + str(merger))
4421
raise errors.PathsDoNotExist([location])
4422
note(gettext('Nothing to do.'))
4424
if pull and not preview:
3879
4425
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4426
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4427
if (merger.base_rev_id == tree.last_revision()):
3882
4428
result = tree.pull(merger.other_branch, False,
3883
4429
merger.other_rev_id)
3884
4430
result.report(self.outf)
3886
4432
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4433
raise errors.BzrCommandError(gettext(
3888
4434
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4435
" (perhaps you would prefer 'bzr pull')"))
3891
4437
return self._do_preview(merger)
3892
4438
elif interactive:
3988
4536
if other_revision_id is None:
3989
4537
other_revision_id = _mod_revision.ensure_null(
3990
4538
other_branch.last_revision())
3991
# Remember where we merge from
3992
if ((remember or tree.branch.get_submit_branch() is None) and
3993
user_location is not None):
4539
# Remember where we merge from. We need to remember if:
4540
# - user specify a location (and we don't merge from the parent
4542
# - user ask to remember or there is no previous location set to merge
4543
# from and user didn't ask to *not* remember
4544
if (user_location is not None
4546
or (remember is None
4547
and tree.branch.get_submit_branch() is None)))):
3994
4548
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4549
# Merge tags (but don't set them in the master branch yet, the user
4550
# might revert this merge). Commit will propagate them.
4551
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4552
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4553
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4554
if other_path != '':
4340
4898
theirs_only=False,
4341
4899
log_format=None, long=False, short=False, line=False,
4342
4900
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4901
include_merged=None, revision=None, my_revision=None,
4903
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4344
4904
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4905
def message(s):
4346
4906
if not is_quiet():
4347
4907
self.outf.write(s)
4909
if symbol_versioning.deprecated_passed(include_merges):
4910
ui.ui_factory.show_user_warning(
4911
'deprecated_command_option',
4912
deprecated_name='--include-merges',
4913
recommended_name='--include-merged',
4914
deprecated_in_version='2.5',
4915
command=self.invoked_as)
4916
if include_merged is None:
4917
include_merged = include_merges
4919
raise errors.BzrCommandError(gettext(
4920
'{0} and {1} are mutually exclusive').format(
4921
'--include-merges', '--include-merged'))
4922
if include_merged is None:
4923
include_merged = False
4350
4925
mine_only = this
4430
5007
if mine_only and not local_extra:
4431
5008
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
5009
message(gettext('This branch has no new revisions.\n'))
4433
5010
elif theirs_only and not remote_extra:
4434
5011
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
5012
message(gettext('Other branch has no new revisions.\n'))
4436
5013
elif not (mine_only or theirs_only or local_extra or
4438
5015
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
5017
message(gettext("Branches are up to date.\n"))
4441
5018
self.cleanup_now()
4442
5019
if not status_code and parent is None and other_branch is not None:
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
5020
self.add_cleanup(local_branch.lock_write().unlock)
4445
5021
# handle race conditions - a parent might be set while we run.
4446
5022
if local_branch.get_parent() is None:
4447
5023
local_branch.set_parent(remote_branch.base)
4578
5137
Option('long', help='Show commit date in annotations.'),
4582
5142
encoding_type = 'exact'
4584
5144
@display_command
4585
5145
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5146
show_ids=False, directory=None):
5147
from bzrlib.annotate import (
4588
5150
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5151
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
5152
if wt is not None:
4592
self.add_cleanup(wt.unlock)
5153
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5155
self.add_cleanup(branch.lock_read().unlock)
4596
5156
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
5157
self.add_cleanup(tree.lock_read().unlock)
5158
if wt is not None and revision is None:
4600
5159
file_id = wt.path2id(relpath)
4602
5161
file_id = tree.path2id(relpath)
4603
5162
if file_id is None:
4604
5163
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
5164
if wt is not None and revision is None:
4607
5165
# If there is a tree and we're not annotating historical
4608
5166
# versions, annotate the working tree's content.
4609
5167
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
5168
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5170
annotate_file_tree(tree, file_id, self.outf, long, all,
5171
show_ids=show_ids, branch=branch)
4616
5174
class cmd_re_sign(Command):
4620
5178
hidden = True # is this right ?
4621
5179
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5180
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
5182
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5183
if revision_id_list is not None and revision is not None:
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5184
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5185
if revision_id_list is None and revision is None:
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
5186
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5187
b = WorkingTree.open_containing(directory)[0].branch
5188
self.add_cleanup(b.lock_write().unlock)
4632
5189
return self._run(b, revision_id_list, revision)
4634
5191
def _run(self, b, revision_id_list, revision):
4635
5192
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5193
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4637
5194
if revision_id_list is not None:
4638
5195
b.repository.start_write_group()
4694
5251
_see_also = ['checkouts', 'unbind']
4695
5252
takes_args = ['location?']
5253
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5255
def run(self, location=None, directory=u'.'):
5256
b, relpath = Branch.open_containing(directory)
4700
5257
if location is None:
4702
5259
location = b.get_old_bound_location()
4703
5260
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5261
raise errors.BzrCommandError(gettext('No location supplied. '
5262
'This format does not remember old locations.'))
4707
5264
if location is None:
4708
5265
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5266
raise errors.BzrCommandError(gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5268
raise errors.BzrCommandError(gettext('No location supplied '
5269
'and no previous location known'))
4713
5270
b_other = Branch.open(location)
4715
5272
b.bind(b_other)
4716
5273
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5274
raise errors.BzrCommandError(gettext('These branches have diverged.'
5275
' Try merging, and then bind again.'))
4719
5276
if b.get_config().has_explicit_nickname():
4720
5277
b.nick = b_other.nick
4784
5342
b = control.open_branch()
4786
5344
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5345
self.add_cleanup(tree.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5347
self.add_cleanup(b.lock_write().unlock)
5348
return self._run(b, tree, dry_run, verbose, revision, force,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5351
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4795
5353
from bzrlib.log import log_formatter, show_log
4796
5354
from bzrlib.uncommit import uncommit
4827
5385
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5388
self.outf.write(gettext('Dry-run, pretending to remove'
5389
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5391
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5394
if not ui.ui_factory.confirm_action(
5395
gettext(u'Uncommit these revisions'),
5396
'bzrlib.builtins.uncommit',
5398
self.outf.write(gettext('Canceled\n'))
4840
5401
mutter('Uncommitting from {%s} to {%s}',
4841
5402
last_rev_id, rev_id)
4842
5403
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
5404
revno=revno, local=local, keep_tags=keep_tags)
5405
self.outf.write(gettext('You can restore the old tip by running:\n'
5406
' bzr pull . -r revid:%s\n') % last_rev_id)
4848
5409
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5410
__doc__ = """Break a dead lock.
5412
This command breaks a lock on a repository, branch, working directory or
4851
5415
CAUTION: Locks should only be broken when you are sure that the process
4852
5416
holding the lock has been stopped.
4936
5517
return host, port
4938
5519
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5520
protocol=None, client_timeout=None):
5521
from bzrlib import transport
4941
5522
if directory is None:
4942
5523
directory = os.getcwd()
4943
5524
if protocol is None:
4944
protocol = transport_server_registry.get()
5525
protocol = transport.transport_server_registry.get()
4945
5526
host, port = self.get_host_and_port(port)
4946
url = urlutils.local_path_to_url(directory)
5527
url = transport.location_to_url(directory)
4947
5528
if not allow_writes:
4948
5529
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5530
t = transport.get_transport_from_url(url)
5532
protocol(t, host, port, inet, client_timeout)
5533
except TypeError, e:
5534
# We use symbol_versioning.deprecated_in just so that people
5535
# grepping can find it here.
5536
# symbol_versioning.deprecated_in((2, 5, 0))
5537
symbol_versioning.warn(
5538
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5539
'Most likely it needs to be updated to support a'
5540
' "timeout" parameter (added in bzr 2.5.0)'
5541
% (e, protocol.__module__, protocol),
5543
protocol(t, host, port, inet)
4953
5546
class cmd_join(Command):
5359
5957
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5958
self.add_cleanup(branch.lock_write().unlock)
5363
5960
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5961
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5962
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5963
note(gettext('Deleted tag %s.') % tag_name)
5369
5966
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5967
raise errors.BzrCommandError(gettext(
5371
5968
"Tags can only be placed on a single revision, "
5373
5970
revision_id = revision[0].as_revision_id(branch)
5375
5972
revision_id = branch.last_revision()
5376
5973
if tag_name is None:
5377
5974
tag_name = branch.automatic_tag_name(revision_id)
5378
5975
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5976
raise errors.BzrCommandError(gettext(
5977
"Please specify a tag name."))
5979
existing_target = branch.tags.lookup_tag(tag_name)
5980
except errors.NoSuchTag:
5981
existing_target = None
5982
if not force and existing_target not in (None, revision_id):
5382
5983
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5984
if existing_target == revision_id:
5985
note(gettext('Tag %s already exists for that revision.') % tag_name)
5987
branch.tags.set_tag(tag_name, revision_id)
5988
if existing_target is None:
5989
note(gettext('Created tag %s.') % tag_name)
5991
note(gettext('Updated tag %s.') % tag_name)
5387
5994
class cmd_tags(Command):
5393
6000
_see_also = ['tag']
5394
6001
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
6002
custom_help('directory',
6003
help='Branch whose tags should be displayed.'),
6004
RegistryOption('sort',
5401
6005
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
6006
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
6012
@display_command
6013
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6014
from bzrlib.tag import tag_sort_methods
5416
6015
branch, relpath = Branch.open_containing(directory)
5418
6017
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
6021
self.add_cleanup(branch.lock_read().unlock)
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
5433
elif sort == 'time':
5435
for tag, revid in tags:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
6023
# Restrict to the specified range
6024
tags = self._tags_for_range(branch, revision)
6026
sort = tag_sort_methods.get()
5444
6028
if not show_ids:
5445
6029
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
6030
for index, (tag, revid) in enumerate(tags):
5457
6043
for tag, revspec in tags:
5458
6044
self.outf.write('%-20s %s\n' % (tag, revspec))
6046
def _tags_for_range(self, branch, revision):
6048
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6049
revid1, revid2 = rev1.rev_id, rev2.rev_id
6050
# _get_revision_range will always set revid2 if it's not specified.
6051
# If revid1 is None, it means we want to start from the branch
6052
# origin which is always a valid ancestor. If revid1 == revid2, the
6053
# ancestry check is useless.
6054
if revid1 and revid1 != revid2:
6055
# FIXME: We really want to use the same graph than
6056
# branch.iter_merge_sorted_revisions below, but this is not
6057
# easily available -- vila 2011-09-23
6058
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6059
# We don't want to output anything in this case...
6061
# only show revisions between revid1 and revid2 (inclusive)
6062
tagged_revids = branch.tags.get_reverse_tag_dict()
6064
for r in branch.iter_merge_sorted_revisions(
6065
start_revision_id=revid2, stop_revision_id=revid1,
6066
stop_rule='include'):
6067
revid_tags = tagged_revids.get(r[0], None)
6069
found.extend([(tag, r[0]) for tag in revid_tags])
5461
6073
class cmd_reconfigure(Command):
5462
6074
__doc__ = """Reconfigure the type of a bzr directory.
5476
6088
takes_args = ['location?']
5477
6089
takes_options = [
5478
6090
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6093
help='The relation between branch and tree.',
5482
6094
value_switches=True, enum_switch=False,
5483
6095
branch='Reconfigure to be an unbound branch with no working tree.',
5484
6096
tree='Reconfigure to be an unbound branch with a working tree.',
5485
6097
checkout='Reconfigure to be a bound branch with a working tree.',
5486
6098
lightweight_checkout='Reconfigure to be a lightweight'
5487
6099
' checkout (with no local history).',
6101
RegistryOption.from_kwargs(
6103
title='Repository type',
6104
help='Location fo the repository.',
6105
value_switches=True, enum_switch=False,
5488
6106
standalone='Reconfigure to be a standalone branch '
5489
6107
'(i.e. stop using shared repository).',
5490
6108
use_shared='Reconfigure to use a shared repository.',
6110
RegistryOption.from_kwargs(
6112
title='Trees in Repository',
6113
help='Whether new branches in the repository have trees.',
6114
value_switches=True, enum_switch=False,
5491
6115
with_trees='Reconfigure repository to create '
5492
6116
'working trees on branches by default.',
5493
6117
with_no_trees='Reconfigure repository to not create '
5520
6144
# At the moment you can use --stacked-on and a different
5521
6145
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
6147
if (tree_type is None and
6148
repository_type is None and
6149
repository_trees is None):
5524
6150
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6153
raise errors.BzrCommandError(gettext('No target configuration '
6155
reconfiguration = None
6156
if tree_type == 'branch':
5530
6157
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
6158
elif tree_type == 'tree':
5532
6159
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
6160
elif tree_type == 'checkout':
5534
6161
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
6162
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
6163
elif tree_type == 'lightweight-checkout':
5537
6164
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
6165
directory, bind_to)
5539
elif target_type == 'use-shared':
6167
reconfiguration.apply(force)
6168
reconfiguration = None
6169
if repository_type == 'use-shared':
5540
6170
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
6171
elif repository_type == 'standalone':
5542
6172
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
6174
reconfiguration.apply(force)
6175
reconfiguration = None
6176
if repository_trees == 'with-trees':
5544
6177
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6178
directory, True)
5546
elif target_type == 'with-no-trees':
6179
elif repository_trees == 'with-no-trees':
5547
6180
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6181
directory, False)
5549
reconfiguration.apply(force)
6183
reconfiguration.apply(force)
6184
reconfiguration = None
5552
6187
class cmd_switch(Command):
5584
6220
def run(self, to_location=None, force=False, create_branch=False,
6221
revision=None, directory=u'.'):
5586
6222
from bzrlib import switch
6223
tree_location = directory
5588
6224
revision = _get_one_revision('switch', revision)
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6225
possible_transports = []
6226
control_dir = controldir.ControlDir.open_containing(tree_location,
6227
possible_transports=possible_transports)[0]
5590
6228
if to_location is None:
5591
6229
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6230
raise errors.BzrCommandError(gettext('You must supply either a'
6231
' revision or a location'))
6232
to_location = tree_location
5596
branch = control_dir.open_branch()
6234
branch = control_dir.open_branch(
6235
possible_transports=possible_transports)
5597
6236
had_explicit_nick = branch.get_config().has_explicit_nickname()
5598
6237
except errors.NotBranchError:
5600
6239
had_explicit_nick = False
5601
6240
if create_branch:
5602
6241
if branch is None:
5603
raise errors.BzrCommandError('cannot create branch without'
5605
to_location = directory_service.directories.dereference(
5607
if '/' not in to_location and '\\' not in to_location:
5608
# This path is meant to be relative to the existing branch
5609
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
6242
raise errors.BzrCommandError(
6243
gettext('cannot create branch without source branch'))
6244
to_location = lookup_new_sibling_branch(control_dir, to_location,
6245
possible_transports=possible_transports)
5611
6246
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
6247
possible_transports=possible_transports,
6248
source_branch=branch).open_branch()
5616
to_branch = Branch.open(to_location)
5617
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
6250
to_branch = lookup_sibling_branch(control_dir, to_location)
5621
6251
if revision is not None:
5622
6252
revision = revision.as_revision_id(to_branch)
5623
6253
switch.switch(control_dir, to_branch, force, revision_id=revision)
5624
6254
if had_explicit_nick:
5625
6255
branch = control_dir.open_branch() #get the new branch!
5626
6256
branch.nick = to_branch.nick
5627
note('Switched to branch: %s',
6257
note(gettext('Switched to branch: %s'),
5628
6258
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
def _get_branch_location(self, control_dir):
5631
"""Return location of branch for this control dir."""
5633
this_branch = control_dir.open_branch()
5634
# This may be a heavy checkout, where we want the master branch
5635
master_location = this_branch.get_bound_location()
5636
if master_location is not None:
5637
return master_location
5638
# If not, use a local sibling
5639
return this_branch.base
5640
except errors.NotBranchError:
5641
format = control_dir.find_branch_format()
5642
if getattr(format, 'get_reference', None) is not None:
5643
return format.get_reference(control_dir)
5645
return control_dir.root_transport.base
5648
6262
class cmd_view(Command):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6349
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6351
current_view, view_dict = tree.views.get_view_info()
5737
6352
if name is None:
5738
6353
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6356
raise errors.BzrCommandError(gettext(
6357
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6359
raise errors.BzrCommandError(gettext(
6360
"Both --delete and --switch specified"))
5747
6362
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6363
self.outf.write(gettext("Deleted all views.\n"))
5749
6364
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6365
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6367
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6368
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6371
raise errors.BzrCommandError(gettext(
6372
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6374
raise errors.BzrCommandError(gettext(
6375
"Both --switch and --all specified"))
5761
6376
elif switch == 'off':
5762
6377
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6378
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6379
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6380
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6382
tree.views.set_view_info(switch, view_dict)
5768
6383
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6384
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6387
self.outf.write(gettext('Views defined:\n'))
5773
6388
for view in sorted(view_dict):
5774
6389
if view == current_view:
5778
6393
view_str = views.view_display_str(view_dict[view])
5779
6394
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6396
self.outf.write(gettext('No views defined.\n'))
5782
6397
elif file_list:
5783
6398
if name is None:
5784
6399
# No name given and no current view set
5786
6401
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6402
raise errors.BzrCommandError(gettext(
6403
"Cannot change the 'off' pseudo view"))
5789
6404
tree.views.set_view(name, sorted(file_list))
5790
6405
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6406
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6408
# list the files
5794
6409
if name is None:
5795
6410
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6411
self.outf.write(gettext('No current view.\n'))
5798
6413
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6414
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6417
class cmd_hooks(Command):
5883
6511
Option('destroy',
5884
6512
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6514
_see_also = ['unshelve', 'configuration']
5888
6516
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6517
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6519
return self.run_for_list(directory=directory)
5892
6520
from bzrlib.shelf_ui import Shelver
5893
6521
if writer is None:
5894
6522
writer = bzrlib.option.diff_writer_registry.get()
5896
6524
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6525
file_list, message, destroy=destroy, directory=directory)
6032
6663
self.outf.write('%s %s\n' % (path, location))
6666
class cmd_export_pot(Command):
6667
__doc__ = """Export command helps and error messages in po format."""
6670
takes_options = [Option('plugin',
6671
help='Export help text from named command '\
6672
'(defaults to all built in commands).',
6674
Option('include-duplicates',
6675
help='Output multiple copies of the same msgid '
6676
'string if it appears more than once.'),
6679
def run(self, plugin=None, include_duplicates=False):
6680
from bzrlib.export_pot import export_pot
6681
export_pot(self.outf, plugin, include_duplicates)
6035
6684
def _register_lazy_builtins():
6036
6685
# register lazy builtins from other modules; called at startup and should
6037
6686
# be only called once.
6038
6687
for (name, aliases, module_name) in [
6039
6688
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6689
('cmd_config', [], 'bzrlib.config'),
6040
6690
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6691
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6692
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6693
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6694
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6695
('cmd_verify_signatures', [],
6696
'bzrlib.commit_signature_commands'),
6697
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6699
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
