78
73
_parse_revision_str,
80
75
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)))
175
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
177
return internal_tree_files(file_list, default_branch, canonicalize,
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]))
181
88
def tree_files_for_add(file_list):
268
172
:return: workingtree, [relative_paths]
270
return WorkingTree.open_containing_paths(
271
file_list, default_directory='.',
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)
276
223
def _get_view_info_for_change_reporter(tree):
424
353
self.outf.write(revtext.decode('utf-8'))
427
def run(self, revision_id=None, revision=None, directory=u'.'):
356
def run(self, revision_id=None, revision=None):
428
357
if revision_id is not None and revision is not None:
429
raise errors.BzrCommandError(gettext('You can only supply one of'
430
' revision_id or --revision'))
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
431
360
if revision_id is None and revision is None:
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]
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
437
365
revisions = b.repository.revisions
438
366
if revisions is None:
439
raise errors.BzrCommandError(gettext('Repository %r does not support '
440
'access to raw revision texts'))
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
442
370
b.repository.lock_read()
566
491
location_list=['.']
568
493
for location in location_list:
569
d = controldir.ControlDir.open(location)
494
d = bzrdir.BzrDir.open(location)
572
497
working = d.open_workingtree()
573
498
except errors.NoWorkingTree:
574
raise errors.BzrCommandError(gettext("No working tree to remove"))
499
raise errors.BzrCommandError("No working tree to remove")
575
500
except errors.NotLocalUrl:
576
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
577
" of a remote path"))
501
raise errors.BzrCommandError("You cannot remove the working tree"
579
504
if (working.has_changes()):
580
505
raise errors.UncommittedChanges(working)
581
if working.get_shelf_manager().last_shelf() is not None:
582
raise errors.ShelvedChanges(working)
584
507
if working.user_url != working.branch.user_url:
585
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
586
" from a lightweight checkout"))
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
588
511
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))
643
514
class cmd_revno(Command):
644
515
__doc__ = """Show current revision number.
649
520
_see_also = ['info']
650
521
takes_args = ['location?']
651
522
takes_options = [
652
Option('tree', help='Show revno of working tree.'),
523
Option('tree', help='Show revno of working tree'),
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"))
527
def run(self, tree=False, location=u'.'):
664
530
wt = WorkingTree.open_containing(location)[0]
665
self.add_cleanup(wt.lock_read().unlock)
666
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
667
533
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
669
535
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
671
542
b = Branch.open_containing(location)[0]
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)
544
self.add_cleanup(b.unlock)
686
546
self.cleanup_now()
687
self.outf.write(revno + '\n')
547
self.outf.write(str(revno) + '\n')
690
550
class cmd_revision_info(Command):
846
704
takes_args = ['dir+']
850
help='No error if existing, make parent directories as needed.',
854
705
encoding_type = 'replace'
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:
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)
882
add_file(wt, relpath)
884
self.outf.write(gettext('added %s\n') % dir)
717
raise errors.NotVersionedError(path=base)
887
720
class cmd_relpath(Command):
994
828
return self.run_auto(names_list, after, dry_run)
996
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
830
raise errors.BzrCommandError('--dry-run requires --auto.')
997
831
if names_list is None:
999
833
if len(names_list) < 2:
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)
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)
1006
838
self._run(tree, names_list, rel_names, after)
1008
840
def run_auto(self, names_list, after, dry_run):
1009
841
if names_list is not None and len(names_list) > 1:
1010
raise errors.BzrCommandError(gettext('Only one path may be specified to'
842
raise errors.BzrCommandError('Only one path may be specified to'
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)
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)
1018
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
1020
852
def _run(self, tree, names_list, rel_names, after):
1132
960
takes_options = ['remember', 'overwrite', 'revision',
1133
961
custom_help('verbose',
1134
962
help='Show logs of pulled revisions.'),
1135
custom_help('directory',
1136
964
help='Branch to pull into, '
1137
'rather than the one containing the working directory.'),
965
'rather than the one containing the working directory.',
1139
970
help="Perform a local pull in a bound "
1140
971
"branch. Local pulls are not applied to "
1141
972
"the master branch."
1144
help="Show base revision text in conflicts.")
1146
975
takes_args = ['location?']
1147
976
encoding_type = 'replace'
1149
def run(self, location=None, remember=None, overwrite=False,
978
def run(self, location=None, remember=False, overwrite=False,
1150
979
revision=None, verbose=False,
1151
directory=None, local=False,
980
directory=None, local=False):
1153
981
# FIXME: too much stuff is in the command class
1154
982
revision_id = None
1155
983
mergeable = None
1288
1110
Option('strict',
1289
1111
help='Refuse to push if there are uncommitted changes in'
1290
1112
' the working tree, --no-strict disables the check.'),
1292
help="Don't populate the working tree, even for protocols"
1293
" that support it."),
1295
1114
takes_args = ['location?']
1296
1115
encoding_type = 'replace'
1298
def run(self, location=None, remember=None, overwrite=False,
1117
def run(self, location=None, remember=False, overwrite=False,
1299
1118
create_prefix=False, verbose=False, revision=None,
1300
1119
use_existing_dir=False, directory=None, stacked_on=None,
1301
stacked=False, strict=None, no_tree=False):
1120
stacked=False, strict=None):
1302
1121
from bzrlib.push import _show_push_branch
1304
1123
if directory is None:
1305
1124
directory = '.'
1306
1125
# Get the source branch
1307
1126
(tree, br_from,
1308
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1309
1128
# Get the tip's revision_id
1310
1129
revision = _get_one_revision('push', revision)
1311
1130
if revision is not None:
1332
1151
# error by the feedback given to them. RBC 20080227.
1333
1152
stacked_on = parent_url
1334
1153
if not stacked_on:
1335
raise errors.BzrCommandError(gettext(
1336
"Could not determine branch to refer to."))
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1338
1157
# Get the destination location
1339
1158
if location is None:
1340
1159
stored_loc = br_from.get_push_location()
1341
1160
if stored_loc is None:
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."))
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1353
1164
display_url = urlutils.unescape_for_display(stored_loc,
1354
1165
self.outf.encoding)
1355
note(gettext("Using saved push location: %s") % display_url)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1356
1167
location = stored_loc
1358
1169
_show_push_branch(br_from, revision_id, location, self.outf,
1359
1170
verbose=verbose, overwrite=overwrite, remember=remember,
1360
1171
stacked_on=stacked_on, create_prefix=create_prefix,
1361
use_existing_dir=use_existing_dir, no_tree=no_tree)
1172
use_existing_dir=use_existing_dir)
1364
1175
class cmd_branch(Command):
1407
1214
def run(self, from_location, to_location=None, revision=None,
1408
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1409
use_existing_dir=False, switch=False, bind=False,
1216
use_existing_dir=False, switch=False, bind=False):
1411
1217
from bzrlib import switch as _mod_switch
1412
1218
from bzrlib.tag import _merge_tags_if_possible
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(
1219
accelerator_tree, br_from = bzrdir.BzrDir.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)
1428
1221
revision = _get_one_revision('branch', revision)
1429
self.add_cleanup(br_from.lock_read().unlock)
1223
self.add_cleanup(br_from.unlock)
1430
1224
if revision is not None:
1431
1225
revision_id = revision.as_revision_id(br_from)
1436
1230
revision_id = br_from.last_revision()
1437
1231
if to_location is None:
1438
to_location = getattr(br_from, "name", None)
1440
to_location = urlutils.derive_to_location(from_location)
1232
to_location = urlutils.derive_to_location(from_location)
1441
1233
to_transport = transport.get_transport(to_location)
1443
1235
to_transport.mkdir('.')
1444
1236
except errors.FileExists:
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)
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1456
to_dir.open_branch()
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1457
1243
except errors.NotBranchError:
1460
1246
raise errors.AlreadyBranchError(to_location)
1461
1247
except errors.NoSuchFile:
1462
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
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)
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)
1491
1265
_merge_tags_if_possible(br_from, branch)
1492
1266
# If the source branch is stacked, the new branch may
1493
1267
# be stacked whether we asked for that explicitly or not.
1494
1268
# We therefore need a try/except here and not just 'if stacked:'
1496
note(gettext('Created new stacked branch referring to %s.') %
1270
note('Created new stacked branch referring to %s.' %
1497
1271
branch.get_stacked_on_url())
1498
1272
except (errors.NotStacked, errors.UnstackableBranchFormat,
1499
1273
errors.UnstackableRepositoryFormat), e:
1500
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1274
note('Branched %d revision(s).' % branch.revno())
1502
1276
# Bind to the parent
1503
1277
parent_branch = Branch.open(from_location)
1504
1278
branch.bind(parent_branch)
1505
note(gettext('New branch bound to %s') % from_location)
1279
note('New branch bound to %s' % from_location)
1507
1281
# Switch to the new branch
1508
1282
wt, _ = WorkingTree.open_containing('.')
1509
1283
_mod_switch.switch(wt.bzrdir, branch)
1510
note(gettext('Switched to branch: %s'),
1284
note('Switched to branch: %s',
1511
1285
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)))
1565
1288
class cmd_checkout(Command):
1566
1289
__doc__ = """Create a new checkout of an existing branch.
1669
1389
class cmd_update(Command):
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
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
1685
1400
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.
1699
1403
_see_also = ['pull', 'working-trees', 'status-flags']
1700
1404
takes_args = ['dir?']
1701
takes_options = ['revision',
1703
help="Show base revision text in conflicts."),
1405
takes_options = ['revision']
1705
1406
aliases = ['up']
1707
def run(self, dir=None, revision=None, show_base=None):
1408
def run(self, dir='.', revision=None):
1708
1409
if revision is not None and len(revision) != 1:
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"))
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1412
tree = WorkingTree.open_containing(dir)[0]
1720
1413
branch = tree.branch
1721
1414
possible_transports = []
1722
1415
master = branch.get_master_branch(
1723
1416
possible_transports=possible_transports)
1724
1417
if master is not None:
1725
1419
branch_location = master.base
1421
tree.lock_tree_write()
1728
1422
branch_location = tree.branch.base
1729
tree.lock_tree_write()
1730
1423
self.add_cleanup(tree.unlock)
1731
1424
# get rid of the final '/' and be ready for display
1732
1425
branch_location = urlutils.unescape_for_display(
1758
1451
change_reporter,
1759
1452
possible_transports=possible_transports,
1760
1453
revision=revision_id,
1762
show_base=show_base)
1763
1455
except errors.NoSuchRevision, e:
1764
raise errors.BzrCommandError(gettext(
1456
raise errors.BzrCommandError(
1765
1457
"branch has no revision %s\n"
1766
1458
"bzr update --revision only works"
1767
" for a revision in the branch history")
1459
" for a revision in the branch history"
1768
1460
% (e.revision))
1769
1461
revno = tree.branch.revision_id_to_dotted_revno(
1770
1462
_mod_revision.ensure_null(tree.last_revision()))
1771
note(gettext('Updated to revision {0} of branch {1}').format(
1772
'.'.join(map(str, revno)), branch_location))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1773
1465
parent_ids = tree.get_parent_ids()
1774
1466
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1775
note(gettext('Your local commits will now show as pending merges with '
1776
"'bzr status', and can be committed with 'bzr commit'."))
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1777
1469
if conflicts != 0:
1839
1530
RegistryOption.from_kwargs('file-deletion-strategy',
1840
1531
'The file deletion mode to be used.',
1841
1532
title='Deletion Strategy', value_switches=True, enum_switch=False,
1842
safe='Backup changed files (default).',
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1843
1535
keep='Delete from bzr but leave the working copy.',
1844
no_backup='Don\'t backup changed files.',
1845
1536
force='Delete all the specified files, even if they can not be '
1846
'recovered and even if they are non-empty directories. '
1847
'(deprecated, use no-backup)')]
1537
'recovered and even if they are non-empty directories.')]
1848
1538
aliases = ['rm', 'del']
1849
1539
encoding_type = 'replace'
1851
1541
def run(self, file_list, verbose=False, new=False,
1852
1542
file_deletion_strategy='safe'):
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)
1543
tree, file_list = tree_files(file_list)
1860
1545
if file_list is not None:
1861
1546
file_list = [f for f in file_list]
1863
self.add_cleanup(tree.lock_write().unlock)
1549
self.add_cleanup(tree.unlock)
1864
1550
# Heuristics should probably all move into tree.remove_smart or
2072
1742
to_transport.ensure_base()
2073
1743
except errors.NoSuchFile:
2074
1744
if not create_prefix:
2075
raise errors.BzrCommandError(gettext("Parent directory of %s"
1745
raise errors.BzrCommandError("Parent directory of %s"
2076
1746
" does not exist."
2077
1747
"\nYou may supply --create-prefix to create all"
2078
" leading parent directories.")
1748
" leading parent directories."
2080
1750
to_transport.create_prefix()
2083
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2084
1754
except errors.NotBranchError:
2085
1755
# really a NotBzrDir error...
2086
create_branch = controldir.ControlDir.create_branch_convenience
2088
force_new_tree = False
2090
force_new_tree = None
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
2091
1757
branch = create_branch(to_transport.base, format=format,
2092
possible_transports=[to_transport],
2093
force_new_tree=force_new_tree)
1758
possible_transports=[to_transport])
2094
1759
a_bzrdir = branch.bzrdir
2096
1761
from bzrlib.transport.local import LocalTransport
2174
1837
def run(self, location, format=None, no_trees=False):
2175
1838
if format is None:
2176
format = controldir.format_registry.make_bzrdir('default')
1839
format = bzrdir.format_registry.make_bzrdir('default')
2178
1841
if location is None:
2181
1844
to_transport = transport.get_transport(location)
1845
to_transport.ensure_base()
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()))
1847
newdir = format.initialize_on_transport(to_transport)
1848
repo = newdir.create_repository(shared=True)
1849
repo.set_make_working_trees(not no_trees)
2189
1850
if not is_quiet():
2190
1851
from bzrlib.info import show_bzrdir_info
2191
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2194
1855
class cmd_diff(Command):
2325
1969
elif ':' in prefix:
2326
1970
old_label, new_label = prefix.split(":")
2328
raise errors.BzrCommandError(gettext(
1972
raise errors.BzrCommandError(
2329
1973
'--prefix expects two values separated by a colon'
2330
' (eg "old/:new/")'))
1974
' (eg "old/:new/")')
2332
1976
if revision and len(revision) > 2:
2333
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2334
' one or two revision specifiers'))
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2336
1980
if using is not None and format is not None:
2337
raise errors.BzrCommandError(gettext(
2338
'{0} and {1} are mutually exclusive').format(
2339
'--using', '--format'))
1981
raise errors.BzrCommandError('--using and --format are mutually '
2341
1984
(old_tree, new_tree,
2342
1985
old_branch, new_branch,
2343
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2344
1987
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()
2347
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
2348
1989
specific_files=specific_files,
2349
1990
external_diff_options=diff_options,
2350
1991
old_label=old_label, new_label=new_label,
2351
extra_trees=extra_trees,
2352
path_encoding=path_encoding,
1992
extra_trees=extra_trees, using=using,
2354
1993
format_cls=format)
2410
2053
_see_also = ['status', 'ls']
2411
takes_options = ['directory', 'null']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2413
2060
@display_command
2414
def run(self, null=False, directory=u'.'):
2415
wt = WorkingTree.open_containing(directory)[0]
2416
self.add_cleanup(wt.lock_read().unlock)
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2417
2065
basis = wt.basis_tree()
2418
self.add_cleanup(basis.lock_read().unlock)
2067
self.add_cleanup(basis.unlock)
2419
2068
basis_inv = basis.inventory
2420
2069
inv = wt.inventory
2421
2070
for file_id in inv:
2422
if basis_inv.has_id(file_id):
2071
if file_id in basis_inv:
2424
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2426
2075
path = inv.id2path(file_id)
2427
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2076
if not os.access(osutils.abspath(path), os.F_OK):
2430
2079
self.outf.write(path + '\0')
2656
2297
Option('show-diff',
2657
2298
short_name='p',
2658
2299
help='Show changes made in each revision as a patch.'),
2659
Option('include-merged',
2300
Option('include-merges',
2660
2301
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.'),
2665
2302
Option('exclude-common-ancestry',
2666
2303
help='Display only the revisions that are not part'
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 '
2304
' of both ancestries (require -rX..Y)'
2693
2307
encoding_type = 'replace'
2722
2327
_get_info_for_log_files,
2724
2329
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
2740
2330
if (exclude_common_ancestry
2741
2331
and (revision is None or len(revision) != 2)):
2742
raise errors.BzrCommandError(gettext(
2743
'--exclude-common-ancestry requires -r with two revisions'))
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2745
2335
if levels is None:
2748
raise errors.BzrCommandError(gettext(
2749
'{0} and {1} are mutually exclusive').format(
2750
'--levels', '--include-merged'))
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2752
2341
if change is not None:
2753
2342
if len(change) > 1:
2754
2343
raise errors.RangeInChangeOption()
2755
2344
if revision is not None:
2756
raise errors.BzrCommandError(gettext(
2757
'{0} and {1} are mutually exclusive').format(
2758
'--revision', '--change'))
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2760
2348
revision = change
2958
2528
help='Recurse into subdirectories.'),
2959
2529
Option('from-root',
2960
2530
help='Print paths relative to the root of the branch.'),
2961
Option('unknown', short_name='u',
2962
help='Print unknown files.'),
2531
Option('unknown', help='Print unknown files.'),
2963
2532
Option('versioned', help='Print versioned files.',
2964
2533
short_name='V'),
2965
Option('ignored', short_name='i',
2966
help='Print ignored files.'),
2967
Option('kind', short_name='k',
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2968
2539
help='List entries of a particular kind: file, directory, symlink.',
2974
2543
@display_command
2975
2544
def run(self, revision=None, verbose=False,
2976
2545
recursive=False, from_root=False,
2977
2546
unknown=False, versioned=False, ignored=False,
2978
null=False, kind=None, show_ids=False, path=None, directory=None):
2547
null=False, kind=None, show_ids=False, path=None):
2980
2549
if kind and kind not in ('file', 'directory', 'symlink'):
2981
raise errors.BzrCommandError(gettext('invalid kind specified'))
2550
raise errors.BzrCommandError('invalid kind specified')
2983
2552
if verbose and null:
2984
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2985
2554
all = not (unknown or versioned or ignored)
2987
2556
selection = {'I':ignored, '?':unknown, 'V':versioned}
3166
2725
self.outf.write("%s\n" % pattern)
3168
2727
if not name_pattern_list:
3169
raise errors.BzrCommandError(gettext("ignore requires at least one "
3170
"NAME_PATTERN or --default-rules."))
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3171
2730
name_pattern_list = [globbing.normalize_pattern(p)
3172
2731
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('')
3185
2732
for name_pattern in name_pattern_list:
3186
2733
if (name_pattern[0] == '/' or
3187
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
3188
raise errors.BzrCommandError(gettext(
3189
"NAME_PATTERN should not be an absolute path"))
3190
tree, relpath = WorkingTree.open_containing(directory)
2735
raise errors.BzrCommandError(
2736
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
3191
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
3192
2739
ignored = globbing.Globster(name_pattern_list)
3194
self.add_cleanup(tree.lock_read().unlock)
3195
2742
for entry in tree.list_files():
3197
2744
if id is not None:
3198
2745
filename = entry[0]
3199
2746
if ignored.match(filename):
3200
2747
matches.append(filename)
3201
2749
if len(matches) > 0:
3202
self.outf.write(gettext("Warning: the following files are version "
3203
"controlled and match your ignore pattern:\n%s"
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3204
2752
"\nThese files will continue to be version controlled"
3205
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3208
2756
class cmd_ignored(Command):
3296
2842
Option('per-file-timestamps',
3297
2843
help='Set modification time of files to that of the last '
3298
2844
'revision in which it was changed.'),
3299
Option('uncommitted',
3300
help='Export the working tree contents rather than that of the '
3303
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
3304
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2847
root=None, filters=False, per_file_timestamps=False):
3306
2848
from bzrlib.export import export
3308
2850
if branch_or_subdir is None:
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"))
2851
tree = WorkingTree.open_containing(u'.')[0]
3322
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2855
b, subdir = Branch.open_containing(branch_or_subdir)
2858
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3324
export(export_tree, dest, format, root, subdir, filtered=filters,
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3325
2861
per_file_timestamps=per_file_timestamps)
3326
2862
except errors.NoSuchExportFormat, e:
3327
raise errors.BzrCommandError(
3328
gettext('Unsupported export format: %s') % e.format)
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3331
2866
class cmd_cat(Command):
3364
2900
if tree is None:
3365
2901
tree = b.basis_tree()
3366
2902
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
3367
self.add_cleanup(rev_tree.lock_read().unlock)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3369
2906
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
3375
2908
if name_from_revision:
3376
2909
# Try in revision if requested
3377
2910
if old_file_id is None:
3378
raise errors.BzrCommandError(gettext(
3379
"{0!r} is not present in revision {1}").format(
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3380
2913
filename, rev_tree.get_revision_id()))
3382
actual_file_id = old_file_id
2915
content = rev_tree.get_file_text(old_file_id)
3384
2917
cur_file_id = tree.path2id(relpath)
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(
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" % (
3392
2935
filename, rev_tree.get_revision_id()))
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)
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)
3399
content = rev_tree.get_file_text(actual_file_id)
3401
self.outf.write(content)
2949
self.outf.write(content)
3404
2952
class cmd_local_time_offset(Command):
3465
3013
to trigger updates to external systems like bug trackers. The --fixes
3466
3014
option can be used to record the association between a revision and
3467
3015
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3034
# TODO: Run hooks on tree to-be-committed, and after commit.
3036
# TODO: Strict commit that fails if there are deleted files.
3037
# (what does "deleted files" mean ??)
3039
# TODO: Give better message for -s, --summary, used by tla people
3041
# XXX: verbose currently does nothing
3470
3043
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3471
3044
takes_args = ['selected*']
3503
3076
Option('show-diff', short_name='p',
3504
3077
help='When no message is supplied, show the diff along'
3505
3078
' 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 '
3511
3080
aliases = ['ci', 'checkin']
3513
3082
def _iter_bug_fix_urls(self, fixes, branch):
3514
default_bugtracker = None
3515
3083
# Configure the properties for bug fixing attributes.
3516
3084
for fixed_bug in fixes:
3517
3085
tokens = fixed_bug.split(':')
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(
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3534
3088
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3535
3089
"See \"bzr help bugs\" for more information on this "
3536
"feature.\nCommit refused.") % fixed_bug)
3538
tag, bug_id = tokens
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3540
3093
yield bugtracker.get_bug_url(tag, branch, bug_id)
3541
3094
except errors.UnknownBugTrackerAbbreviation:
3542
raise errors.BzrCommandError(gettext(
3543
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3544
3097
except errors.MalformedBugIdentifier, e:
3545
raise errors.BzrCommandError(gettext(
3546
"%s\nCommit refused.") % (str(e),))
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3548
3101
def run(self, message=None, file=None, verbose=False, selected_list=None,
3549
3102
unchanged=False, strict=False, local=False, fixes=None,
3550
author=None, show_diff=False, exclude=None, commit_time=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3552
3104
from bzrlib.errors import (
3553
3105
PointlessCommit,
3554
3106
ConflictsInTree,
3630
3184
# make_commit_message_template_encoded returns user encoding.
3631
3185
# We probably want to be using edit_commit_message instead to
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 \"\"."))
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")
3646
3195
return my_message
3648
3197
# The API permits a commit with a filter of [] to mean 'select nothing'
3656
3205
reporter=None, verbose=verbose, revprops=properties,
3657
3206
authors=author, timestamp=commit_stamp,
3658
3207
timezone=offset,
3659
exclude=tree.safe_relpath_files(exclude),
3208
exclude=safe_relpath_files(tree, exclude))
3661
3209
except PointlessCommit:
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."))
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3665
3212
except ConflictsInTree:
3666
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3213
raise errors.BzrCommandError('Conflicts detected in working '
3667
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3669
3216
except StrictCommitFailed:
3670
raise errors.BzrCommandError(gettext("Commit refused because there are"
3671
" unknown files in the working tree."))
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3672
3219
except errors.BoundBranchOutOfDate, e:
3673
e.extra_help = (gettext("\n"
3220
e.extra_help = ("\n"
3674
3221
'To commit to master branch, run update and then commit.\n'
3675
3222
'You can also pass --local to commit to continue working '
3750
3297
class cmd_upgrade(Command):
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/.
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.
3783
_see_also = ['check', 'reconcile', 'formats']
3305
_see_also = ['check']
3784
3306
takes_args = ['url?']
3785
3307
takes_options = [
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."),
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'),
3798
def run(self, url='.', format=None, clean=False, dry_run=False):
3316
def run(self, url='.', format=None):
3799
3317
from bzrlib.upgrade import upgrade
3800
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3802
if len(exceptions) == 1:
3803
# Compatibility with historical behavior
3318
upgrade(url, format)
3809
3321
class cmd_whoami(Command):
3829
3340
encoding_type = 'replace'
3831
3342
@display_command
3832
def run(self, email=False, branch=False, name=None, directory=None):
3343
def run(self, email=False, branch=False, name=None):
3833
3344
if name is None:
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')
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()
3844
self.outf.write(_mod_config.extract_email_address(identity)
3351
self.outf.write(c.user_email() + '\n')
3847
self.outf.write(identity + '\n')
3353
self.outf.write(c.username() + '\n')
3851
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3854
3356
# display a warning if an email address isn't included in the given name.
3856
_mod_config.extract_email_address(name)
3358
config.extract_email_address(name)
3857
3359
except errors.NoEmailInUsername, e:
3858
3360
warning('"%s" does not seem to contain an email address. '
3859
3361
'This is allowed, but not recommended.', name)
3861
3363
# use global config unless --branch given
3863
if directory is None:
3864
c = Branch.open_containing(u'.')[0].get_config_stack()
3866
c = Branch.open(directory).get_config_stack()
3365
c = Branch.open_containing('.')[0].get_config()
3868
c = _mod_config.GlobalStack()
3869
c.set('email', name)
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3872
3371
class cmd_nick(Command):
4092
3586
def run(self, testspecs_list=None, verbose=False, one=False,
4093
3587
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
4095
3589
first=False, list_only=False,
4096
3590
randomize=None, exclude=None, strict=False,
4097
3591
load_list=None, debugflag=None, starting_with=None, subunit=False,
4098
parallel=None, lsprof_tests=False,
4101
# During selftest, disallow proxying, as it can cause severe
4102
# performance penalties and is only needed for thread
4103
# safety. The selftest command is assumed to not use threads
4104
# too heavily. The call should be as early as possible, as
4105
# error reporting for past duplicate imports won't have useful
4107
lazy_import.disallow_proxying()
4109
from bzrlib import tests
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)
4111
3602
if testspecs_list is not None:
4112
3603
pattern = '|'.join(testspecs_list)
4117
3608
from bzrlib.tests import SubUnitBzrRunner
4118
3609
except ImportError:
4119
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4120
"needs to be installed to use --subunit."))
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
4121
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
4122
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
4123
3614
# stdout, which would corrupt the subunit stream.
4124
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4125
# following code can be deleted when it's sufficiently deployed
4126
# -- vila/mgz 20100514
4127
if (sys.platform == "win32"
4128
and getattr(sys.stdout, 'fileno', None) is not None):
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4130
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
4132
3619
self.additional_selftest_args.setdefault(
4133
3620
'suite_decorators', []).append(parallel)
4135
raise errors.BzrCommandError(gettext(
4136
"--benchmark is no longer supported from bzr 2.2; "
4137
"use bzr-usertest instead"))
4138
test_suite_factory = None
4140
exclude_pattern = None
3622
test_suite_factory = benchmarks.test_suite
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
verbose = not is_quiet()
3625
# TODO: should possibly lock the history file...
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
4142
exclude_pattern = '(' + '|'.join(exclude) + ')'
4144
self._disable_fsync()
3629
test_suite_factory = None
4145
3631
selftest_kwargs = {"verbose": verbose,
4146
3632
"pattern": pattern,
4147
3633
"stop_on_failure": one,
4149
3635
"test_suite_factory": test_suite_factory,
4150
3636
"lsprof_timed": lsprof_timed,
4151
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
4152
3639
"matching_tests_first": first,
4153
3640
"list_only": list_only,
4154
3641
"random_seed": randomize,
4155
"exclude_pattern": exclude_pattern,
3642
"exclude_pattern": exclude,
4156
3643
"strict": strict,
4157
3644
"load_list": load_list,
4158
3645
"debug_flags": debugflag,
4159
3646
"starting_with": starting_with
4161
3648
selftest_kwargs.update(self.additional_selftest_args)
4163
# Make deprecation warnings visible, unless -Werror is set
4164
cleanup = symbol_versioning.activate_deprecation_warnings(
4167
result = tests.selftest(**selftest_kwargs)
3649
result = selftest(**selftest_kwargs)
4170
3650
return int(not result)
4172
def _disable_fsync(self):
4173
"""Change the 'os' functionality to not synchronize."""
4174
self._orig_fsync = getattr(os, 'fsync', None)
4175
if self._orig_fsync is not None:
4176
os.fsync = lambda filedes: None
4177
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4178
if self._orig_fdatasync is not None:
4179
os.fdatasync = lambda filedes: None
4182
3653
class cmd_version(Command):
4183
3654
__doc__ = """Show version of bzr."""
4236
3709
The source of the merge can be specified either in the form of a branch,
4237
3710
or in the form of a path to a file containing a merge directive generated
4238
3711
with bzr send. If neither is specified, the default is the upstream branch
4239
or the branch most recently merged using --remember. The source of the
4240
merge may also be specified in the form of a path to a file in another
4241
branch: in this case, only the modifications to that file are merged into
4242
the current working tree.
4244
When merging from a branch, by default bzr will try to merge in all new
4245
work from the other branch, automatically determining an appropriate base
4246
revision. If this fails, you may need to give an explicit base.
4248
To pick a different ending revision, pass "--revision OTHER". bzr will
4249
try to merge in all new work up to and including revision OTHER.
4251
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4252
through OTHER, excluding BASE but including OTHER, will be merged. If this
4253
causes some revisions to be skipped, i.e. if the destination branch does
4254
not already contain revision BASE, such a merge is commonly referred to as
4255
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4256
cherrypicks. The changes look like a normal commit, and the history of the
4257
changes from the other branch is not stored in the commit.
4259
Revision numbers are always relative to the source 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.
4261
3725
Merge will do its best to combine the changes in two branches, but there
4262
3726
are some kinds of problems only a human can fix. When it encounters those,
4263
3727
it will mark a conflict. A conflict means that you need to fix something,
4264
before you can commit.
3728
before you should commit.
4266
3730
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
4268
If there is no default branch set, the first merge will set it (use
4269
--no-remember to avoid setting it). After that, you can omit the branch
4270
to use the default. To change the default, use --remember. The value will
4271
only be saved if the remote location can be accessed.
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.
4273
3737
The results of the merge are placed into the destination working
4274
3738
directory, where they can be reviewed (with bzr diff), tested, and then
4275
3739
committed to record the result of the merge.
4277
3741
merge refuses to run if there are any uncommitted changes, unless
4278
--force is given. If --force is given, then the changes from the source
4279
will be merged with the current working tree, including any uncommitted
4280
changes in the tree. The --force option can also be used to create a
3742
--force is given. The --force option can also be used to create a
4281
3743
merge revision which has more than two parents.
4283
3745
If one would like to merge changes from the working tree of the other
4411
3873
self.sanity_check_merger(merger)
4412
3874
if (merger.base_rev_id == merger.other_rev_id and
4413
3875
merger.other_rev_id is not None):
4414
# check if location is a nonexistent file (and not a branch) to
4415
# disambiguate the 'Nothing to do'
4416
if merger.interesting_files:
4417
if not merger.other_tree.has_filename(
4418
merger.interesting_files[0]):
4419
note(gettext("merger: ") + str(merger))
4420
raise errors.PathsDoNotExist([location])
4421
note(gettext('Nothing to do.'))
3876
note('Nothing to do.')
4423
if pull and not preview:
4424
3879
if merger.interesting_files is not None:
4425
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3880
raise errors.BzrCommandError('Cannot pull individual files')
4426
3881
if (merger.base_rev_id == tree.last_revision()):
4427
3882
result = tree.pull(merger.other_branch, False,
4428
3883
merger.other_rev_id)
4429
3884
result.report(self.outf)
4431
3886
if merger.this_basis is None:
4432
raise errors.BzrCommandError(gettext(
3887
raise errors.BzrCommandError(
4433
3888
"This branch has no commits."
4434
" (perhaps you would prefer 'bzr pull')"))
3889
" (perhaps you would prefer 'bzr pull')")
4436
3891
return self._do_preview(merger)
4437
3892
elif interactive:
4535
3988
if other_revision_id is None:
4536
3989
other_revision_id = _mod_revision.ensure_null(
4537
3990
other_branch.last_revision())
4538
# Remember where we merge from. We need to remember if:
4539
# - user specify a location (and we don't merge from the parent
4541
# - user ask to remember or there is no previous location set to merge
4542
# from and user didn't ask to *not* remember
4543
if (user_location is not None
4545
or (remember is None
4546
and tree.branch.get_submit_branch() is None)))):
3991
# Remember where we merge from
3992
if ((remember or tree.branch.get_submit_branch() is None) and
3993
user_location is not None):
4547
3994
tree.branch.set_submit_branch(other_branch.base)
4548
# Merge tags (but don't set them in the master branch yet, the user
4549
# might revert this merge). Commit will propagate them.
4550
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4551
3996
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4552
3997
other_revision_id, base_revision_id, other_branch, base_branch)
4553
3998
if other_path != '':
4897
4340
theirs_only=False,
4898
4341
log_format=None, long=False, short=False, line=False,
4899
4342
show_ids=False, verbose=False, this=False, other=False,
4900
include_merged=None, revision=None, my_revision=None,
4902
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4343
include_merges=False, revision=None, my_revision=None):
4903
4344
from bzrlib.missing import find_unmerged, iter_log_revisions
4904
4345
def message(s):
4905
4346
if not is_quiet():
4906
4347
self.outf.write(s)
4908
if symbol_versioning.deprecated_passed(include_merges):
4909
ui.ui_factory.show_user_warning(
4910
'deprecated_command_option',
4911
deprecated_name='--include-merges',
4912
recommended_name='--include-merged',
4913
deprecated_in_version='2.5',
4914
command=self.invoked_as)
4915
if include_merged is None:
4916
include_merged = include_merges
4918
raise errors.BzrCommandError(gettext(
4919
'{0} and {1} are mutually exclusive').format(
4920
'--include-merges', '--include-merged'))
4921
if include_merged is None:
4922
include_merged = False
4924
4350
mine_only = this
5006
4430
if mine_only and not local_extra:
5007
4431
# We checked local, and found nothing extra
5008
message(gettext('This branch has no new revisions.\n'))
4432
message('This branch is up to date.\n')
5009
4433
elif theirs_only and not remote_extra:
5010
4434
# We checked remote, and found nothing extra
5011
message(gettext('Other branch has no new revisions.\n'))
4435
message('Other branch is up to date.\n')
5012
4436
elif not (mine_only or theirs_only or local_extra or
5014
4438
# We checked both branches, and neither one had extra
5016
message(gettext("Branches are up to date.\n"))
4440
message("Branches are up to date.\n")
5017
4441
self.cleanup_now()
5018
4442
if not status_code and parent is None and other_branch is not None:
5019
self.add_cleanup(local_branch.lock_write().unlock)
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
5020
4445
# handle race conditions - a parent might be set while we run.
5021
4446
if local_branch.get_parent() is None:
5022
4447
local_branch.set_parent(remote_branch.base)
5136
4578
Option('long', help='Show commit date in annotations.'),
5141
4582
encoding_type = 'exact'
5143
4584
@display_command
5144
4585
def run(self, filename, all=False, long=False, revision=None,
5145
show_ids=False, directory=None):
5146
from bzrlib.annotate import (
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5149
4588
wt, branch, relpath = \
5150
_open_directory_or_containing_tree_or_branch(filename, directory)
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5151
4590
if wt is not None:
5152
self.add_cleanup(wt.lock_read().unlock)
4592
self.add_cleanup(wt.unlock)
5154
self.add_cleanup(branch.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5155
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
5156
self.add_cleanup(tree.lock_read().unlock)
5157
if wt is not None and revision is None:
4598
self.add_cleanup(tree.unlock)
5158
4600
file_id = wt.path2id(relpath)
5160
4602
file_id = tree.path2id(relpath)
5161
4603
if file_id is None:
5162
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
5163
4606
if wt is not None and revision is None:
5164
4607
# If there is a tree and we're not annotating historical
5165
4608
# versions, annotate the working tree's content.
5166
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
5167
4610
show_ids=show_ids)
5169
annotate_file_tree(tree, file_id, self.outf, long, all,
5170
show_ids=show_ids, branch=branch)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5173
4616
class cmd_re_sign(Command):
5177
4620
hidden = True # is this right ?
5178
4621
takes_args = ['revision_id*']
5179
takes_options = ['directory', 'revision']
4622
takes_options = ['revision']
5181
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4624
def run(self, revision_id_list=None, revision=None):
5182
4625
if revision_id_list is not None and revision is not None:
5183
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5184
4627
if revision_id_list is None and revision is None:
5185
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5186
b = WorkingTree.open_containing(directory)[0].branch
5187
self.add_cleanup(b.lock_write().unlock)
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
5188
4632
return self._run(b, revision_id_list, revision)
5190
4634
def _run(self, b, revision_id_list, revision):
5191
4635
import bzrlib.gpg as gpg
5192
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5193
4637
if revision_id_list is not None:
5194
4638
b.repository.start_write_group()
5250
4694
_see_also = ['checkouts', 'unbind']
5251
4695
takes_args = ['location?']
5252
takes_options = ['directory']
5254
def run(self, location=None, directory=u'.'):
5255
b, relpath = Branch.open_containing(directory)
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5256
4700
if location is None:
5258
4702
location = b.get_old_bound_location()
5259
4703
except errors.UpgradeRequired:
5260
raise errors.BzrCommandError(gettext('No location supplied. '
5261
'This format does not remember old locations.'))
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5263
4707
if location is None:
5264
4708
if b.get_bound_location() is not None:
5265
raise errors.BzrCommandError(gettext('Branch is already bound'))
4709
raise errors.BzrCommandError('Branch is already bound')
5267
raise errors.BzrCommandError(gettext('No location supplied '
5268
'and no previous location known'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5269
4713
b_other = Branch.open(location)
5271
4715
b.bind(b_other)
5272
4716
except errors.DivergedBranches:
5273
raise errors.BzrCommandError(gettext('These branches have diverged.'
5274
' Try merging, and then bind again.'))
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5275
4719
if b.get_config().has_explicit_nickname():
5276
4720
b.nick = b_other.nick
5341
4784
b = control.open_branch()
5343
4786
if tree is not None:
5344
self.add_cleanup(tree.lock_write().unlock)
4788
self.add_cleanup(tree.unlock)
5346
self.add_cleanup(b.lock_write().unlock)
5347
return self._run(b, tree, dry_run, verbose, revision, force,
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5350
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5352
4795
from bzrlib.log import log_formatter, show_log
5353
4796
from bzrlib.uncommit import uncommit
5384
4827
end_revision=last_revno)
5387
self.outf.write(gettext('Dry-run, pretending to remove'
5388
' the above revisions.\n'))
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5390
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5393
if not ui.ui_factory.confirm_action(
5394
gettext(u'Uncommit these revisions'),
5395
'bzrlib.builtins.uncommit',
5397
self.outf.write(gettext('Canceled\n'))
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5400
4840
mutter('Uncommitting from {%s} to {%s}',
5401
4841
last_rev_id, rev_id)
5402
4842
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5403
revno=revno, local=local, keep_tags=keep_tags)
5404
self.outf.write(gettext('You can restore the old tip by running:\n'
5405
' bzr pull . -r revid:%s\n') % last_rev_id)
4843
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
5408
4848
class cmd_break_lock(Command):
5409
__doc__ = """Break a dead lock.
5411
This command breaks a lock on a repository, branch, working directory or
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5414
4851
CAUTION: Locks should only be broken when you are sure that the process
5415
4852
holding the lock has been stopped.
5516
4936
return host, port
5518
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5519
protocol=None, client_timeout=None):
5520
from bzrlib import transport
4940
from bzrlib.transport import get_transport, transport_server_registry
5521
4941
if directory is None:
5522
4942
directory = os.getcwd()
5523
4943
if protocol is None:
5524
protocol = transport.transport_server_registry.get()
4944
protocol = transport_server_registry.get()
5525
4945
host, port = self.get_host_and_port(port)
5526
url = transport.location_to_url(directory)
4946
url = urlutils.local_path_to_url(directory)
5527
4947
if not allow_writes:
5528
4948
url = 'readonly+' + url
5529
t = transport.get_transport_from_url(url)
5531
protocol(t, host, port, inet, client_timeout)
5532
except TypeError, e:
5533
# We use symbol_versioning.deprecated_in just so that people
5534
# grepping can find it here.
5535
# symbol_versioning.deprecated_in((2, 5, 0))
5536
symbol_versioning.warn(
5537
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5538
'Most likely it needs to be updated to support a'
5539
' "timeout" parameter (added in bzr 2.5.0)'
5540
% (e, protocol.__module__, protocol),
5542
protocol(t, host, port, inet)
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5545
4953
class cmd_join(Command):
5956
5359
branch, relpath = Branch.open_containing(directory)
5957
self.add_cleanup(branch.lock_write().unlock)
5361
self.add_cleanup(branch.unlock)
5959
5363
if tag_name is None:
5960
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5364
raise errors.BzrCommandError("No tag specified to delete.")
5961
5365
branch.tags.delete_tag(tag_name)
5962
note(gettext('Deleted tag %s.') % tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5965
5369
if len(revision) != 1:
5966
raise errors.BzrCommandError(gettext(
5370
raise errors.BzrCommandError(
5967
5371
"Tags can only be placed on a single revision, "
5969
5373
revision_id = revision[0].as_revision_id(branch)
5971
5375
revision_id = branch.last_revision()
5972
5376
if tag_name is None:
5973
5377
tag_name = branch.automatic_tag_name(revision_id)
5974
5378
if tag_name is None:
5975
raise errors.BzrCommandError(gettext(
5976
"Please specify a tag name."))
5978
existing_target = branch.tags.lookup_tag(tag_name)
5979
except errors.NoSuchTag:
5980
existing_target = None
5981
if not force and existing_target not in (None, revision_id):
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5982
5382
raise errors.TagAlreadyExists(tag_name)
5983
if existing_target == revision_id:
5984
note(gettext('Tag %s already exists for that revision.') % tag_name)
5986
branch.tags.set_tag(tag_name, revision_id)
5987
if existing_target is None:
5988
note(gettext('Created tag %s.') % tag_name)
5990
note(gettext('Updated tag %s.') % tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5993
5387
class cmd_tags(Command):
5999
5393
_see_also = ['tag']
6000
5394
takes_options = [
6001
custom_help('directory',
6002
help='Branch whose tags should be displayed.'),
6003
RegistryOption('sort',
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
6004
5401
'Sort tags by different criteria.', title='Sorting',
6005
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
6011
5409
@display_command
6012
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6013
from bzrlib.tag import tag_sort_methods
6014
5416
branch, relpath = Branch.open_containing(directory)
6016
5418
tags = branch.tags.get_tag_dict().items()
6020
self.add_cleanup(branch.lock_read().unlock)
5423
self.add_cleanup(branch.unlock)
6022
# Restrict to the specified range
6023
tags = self._tags_for_range(branch, revision)
6025
sort = tag_sort_methods.get()
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
5433
elif sort == 'time':
5435
for tag, revid in tags:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
6027
5444
if not show_ids:
6028
5445
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
6029
5446
for index, (tag, revid) in enumerate(tags):
6042
5457
for tag, revspec in tags:
6043
5458
self.outf.write('%-20s %s\n' % (tag, revspec))
6045
def _tags_for_range(self, branch, revision):
6047
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6048
revid1, revid2 = rev1.rev_id, rev2.rev_id
6049
# _get_revision_range will always set revid2 if it's not specified.
6050
# If revid1 is None, it means we want to start from the branch
6051
# origin which is always a valid ancestor. If revid1 == revid2, the
6052
# ancestry check is useless.
6053
if revid1 and revid1 != revid2:
6054
# FIXME: We really want to use the same graph than
6055
# branch.iter_merge_sorted_revisions below, but this is not
6056
# easily available -- vila 2011-09-23
6057
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6058
# We don't want to output anything in this case...
6060
# only show revisions between revid1 and revid2 (inclusive)
6061
tagged_revids = branch.tags.get_reverse_tag_dict()
6063
for r in branch.iter_merge_sorted_revisions(
6064
start_revision_id=revid2, stop_revision_id=revid1,
6065
stop_rule='include'):
6066
revid_tags = tagged_revids.get(r[0], None)
6068
found.extend([(tag, r[0]) for tag in revid_tags])
6072
5461
class cmd_reconfigure(Command):
6073
5462
__doc__ = """Reconfigure the type of a bzr directory.
6087
5476
takes_args = ['location?']
6088
5477
takes_options = [
6089
5478
RegistryOption.from_kwargs(
6092
help='The relation between branch and tree.',
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6093
5482
value_switches=True, enum_switch=False,
6094
5483
branch='Reconfigure to be an unbound branch with no working tree.',
6095
5484
tree='Reconfigure to be an unbound branch with a working tree.',
6096
5485
checkout='Reconfigure to be a bound branch with a working tree.',
6097
5486
lightweight_checkout='Reconfigure to be a lightweight'
6098
5487
' checkout (with no local history).',
6100
RegistryOption.from_kwargs(
6102
title='Repository type',
6103
help='Location fo the repository.',
6104
value_switches=True, enum_switch=False,
6105
5488
standalone='Reconfigure to be a standalone branch '
6106
5489
'(i.e. stop using shared repository).',
6107
5490
use_shared='Reconfigure to use a shared repository.',
6109
RegistryOption.from_kwargs(
6111
title='Trees in Repository',
6112
help='Whether new branches in the repository have trees.',
6113
value_switches=True, enum_switch=False,
6114
5491
with_trees='Reconfigure repository to create '
6115
5492
'working trees on branches by default.',
6116
5493
with_no_trees='Reconfigure repository to not create '
6143
5520
# At the moment you can use --stacked-on and a different
6144
5521
# reconfiguration shape at the same time; there seems no good reason
6146
if (tree_type is None and
6147
repository_type is None and
6148
repository_trees is None):
5523
if target_type is None:
6149
5524
if stacked_on or unstacked:
6152
raise errors.BzrCommandError(gettext('No target configuration '
6154
reconfiguration = None
6155
if tree_type == 'branch':
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6156
5530
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
6157
elif tree_type == 'tree':
5531
elif target_type == 'tree':
6158
5532
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
6159
elif tree_type == 'checkout':
5533
elif target_type == 'checkout':
6160
5534
reconfiguration = reconfigure.Reconfigure.to_checkout(
6161
5535
directory, bind_to)
6162
elif tree_type == 'lightweight-checkout':
5536
elif target_type == 'lightweight-checkout':
6163
5537
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
6164
5538
directory, bind_to)
6166
reconfiguration.apply(force)
6167
reconfiguration = None
6168
if repository_type == 'use-shared':
5539
elif target_type == 'use-shared':
6169
5540
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
6170
elif repository_type == 'standalone':
5541
elif target_type == 'standalone':
6171
5542
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
6173
reconfiguration.apply(force)
6174
reconfiguration = None
6175
if repository_trees == 'with-trees':
5543
elif target_type == 'with-trees':
6176
5544
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
6177
5545
directory, True)
6178
elif repository_trees == 'with-no-trees':
5546
elif target_type == 'with-no-trees':
6179
5547
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
6180
5548
directory, False)
6182
reconfiguration.apply(force)
6183
reconfiguration = None
5549
reconfiguration.apply(force)
6186
5552
class cmd_switch(Command):
6219
5584
def run(self, to_location=None, force=False, create_branch=False,
6220
revision=None, directory=u'.'):
6221
5586
from bzrlib import switch
6222
tree_location = directory
6223
5588
revision = _get_one_revision('switch', revision)
6224
possible_transports = []
6225
control_dir = controldir.ControlDir.open_containing(tree_location,
6226
possible_transports=possible_transports)[0]
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6227
5590
if to_location is None:
6228
5591
if revision is None:
6229
raise errors.BzrCommandError(gettext('You must supply either a'
6230
' revision or a location'))
6231
to_location = tree_location
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6233
branch = control_dir.open_branch(
6234
possible_transports=possible_transports)
5596
branch = control_dir.open_branch()
6235
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
6236
5598
except errors.NotBranchError:
6238
5600
had_explicit_nick = False
6239
5601
if create_branch:
6240
5602
if branch is None:
6241
raise errors.BzrCommandError(
6242
gettext('cannot create branch without source branch'))
6243
to_location = lookup_new_sibling_branch(control_dir, to_location,
6244
possible_transports=possible_transports)
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)
6245
5611
to_branch = branch.bzrdir.sprout(to_location,
6246
possible_transports=possible_transports,
6247
source_branch=branch).open_branch()
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
6249
to_branch = lookup_sibling_branch(control_dir, to_location)
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
5621
if revision is not None:
6251
5622
revision = revision.as_revision_id(to_branch)
6252
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
6253
5624
if had_explicit_nick:
6254
5625
branch = control_dir.open_branch() #get the new branch!
6255
5626
branch.nick = to_branch.nick
6256
note(gettext('Switched to branch: %s'),
5627
note('Switched to branch: %s',
6257
5628
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
def _get_branch_location(self, control_dir):
5631
"""Return location of branch for this control dir."""
5633
this_branch = control_dir.open_branch()
5634
# This may be a heavy checkout, where we want the master branch
5635
master_location = this_branch.get_bound_location()
5636
if master_location is not None:
5637
return master_location
5638
# If not, use a local sibling
5639
return this_branch.base
5640
except errors.NotBranchError:
5641
format = control_dir.find_branch_format()
5642
if getattr(format, 'get_reference', None) is not None:
5643
return format.get_reference(control_dir)
5645
return control_dir.root_transport.base
6261
5648
class cmd_view(Command):
6348
tree, file_list = WorkingTree.open_containing_paths(file_list,
5735
tree, file_list = tree_files(file_list, apply_view=False)
6350
5736
current_view, view_dict = tree.views.get_view_info()
6351
5737
if name is None:
6352
5738
name = current_view
6355
raise errors.BzrCommandError(gettext(
6356
"Both --delete and a file list specified"))
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6358
raise errors.BzrCommandError(gettext(
6359
"Both --delete and --switch specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6361
5747
tree.views.set_view_info(None, {})
6362
self.outf.write(gettext("Deleted all views.\n"))
5748
self.outf.write("Deleted all views.\n")
6363
5749
elif name is None:
6364
raise errors.BzrCommandError(gettext("No current view to delete"))
5750
raise errors.BzrCommandError("No current view to delete")
6366
5752
tree.views.delete_view(name)
6367
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6370
raise errors.BzrCommandError(gettext(
6371
"Both --switch and a file list specified"))
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6373
raise errors.BzrCommandError(gettext(
6374
"Both --switch and --all specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6375
5761
elif switch == 'off':
6376
5762
if current_view is None:
6377
raise errors.BzrCommandError(gettext("No current view to disable"))
5763
raise errors.BzrCommandError("No current view to disable")
6378
5764
tree.views.set_view_info(None, view_dict)
6379
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6381
5767
tree.views.set_view_info(switch, view_dict)
6382
5768
view_str = views.view_display_str(tree.views.lookup_view())
6383
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6386
self.outf.write(gettext('Views defined:\n'))
5772
self.outf.write('Views defined:\n')
6387
5773
for view in sorted(view_dict):
6388
5774
if view == current_view:
6392
5778
view_str = views.view_display_str(view_dict[view])
6393
5779
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
6395
self.outf.write(gettext('No views defined.\n'))
5781
self.outf.write('No views defined.\n')
6396
5782
elif file_list:
6397
5783
if name is None:
6398
5784
# No name given and no current view set
6400
5786
elif name == 'off':
6401
raise errors.BzrCommandError(gettext(
6402
"Cannot change the 'off' pseudo view"))
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6403
5789
tree.views.set_view(name, sorted(file_list))
6404
5790
view_str = views.view_display_str(tree.views.lookup_view())
6405
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6407
5793
# list the files
6408
5794
if name is None:
6409
5795
# No name given and no current view set
6410
self.outf.write(gettext('No current view.\n'))
5796
self.outf.write('No current view.\n')
6412
5798
view_str = views.view_display_str(tree.views.lookup_view(name))
6413
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6416
5802
class cmd_hooks(Command):
6510
5883
Option('destroy',
6511
5884
help='Destroy removed changes instead of shelving them.'),
6513
_see_also = ['unshelve', 'configuration']
5886
_see_also = ['unshelve']
6515
5888
def run(self, revision=None, all=False, file_list=None, message=None,
6516
writer=None, list=False, destroy=False, directory=None):
5889
writer=None, list=False, destroy=False):
6518
return self.run_for_list(directory=directory)
5891
return self.run_for_list()
6519
5892
from bzrlib.shelf_ui import Shelver
6520
5893
if writer is None:
6521
5894
writer = bzrlib.option.diff_writer_registry.get()
6523
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
6524
file_list, message, destroy=destroy, directory=directory)
5897
file_list, message, destroy=destroy)
6662
6032
self.outf.write('%s %s\n' % (path, location))
6665
class cmd_export_pot(Command):
6666
__doc__ = """Export command helps and error messages in po format."""
6669
takes_options = [Option('plugin',
6670
help='Export help text from named command '\
6671
'(defaults to all built in commands).',
6673
Option('include-duplicates',
6674
help='Output multiple copies of the same msgid '
6675
'string if it appears more than once.'),
6678
def run(self, plugin=None, include_duplicates=False):
6679
from bzrlib.export_pot import export_pot
6680
export_pot(self.outf, plugin, include_duplicates)
6683
6035
def _register_lazy_builtins():
6684
6036
# register lazy builtins from other modules; called at startup and should
6685
6037
# be only called once.
6686
6038
for (name, aliases, module_name) in [
6687
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6688
('cmd_config', [], 'bzrlib.config'),
6689
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6690
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6691
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6692
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6693
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6694
('cmd_verify_signatures', [],
6695
'bzrlib.commit_signature_commands'),
6696
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6698
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
