73
78
_parse_revision_str,
75
80
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
86
def _get_branch_location(control_dir, possible_transports=None):
87
"""Return location of branch for this control dir."""
89
this_branch = control_dir.open_branch(
90
possible_transports=possible_transports)
91
# This may be a heavy checkout, where we want the master branch
92
master_location = this_branch.get_bound_location()
93
if master_location is not None:
94
return master_location
95
# If not, use a local sibling
96
return this_branch.base
97
except errors.NotBranchError:
98
format = control_dir.find_branch_format()
99
if getattr(format, 'get_reference', None) is not None:
100
return format.get_reference(control_dir)
102
return control_dir.root_transport.base
105
def _is_colocated(control_dir, possible_transports=None):
106
"""Check if the branch in control_dir is colocated.
108
:param control_dir: Control directory
109
:return: Boolean indicating whether
111
# This path is meant to be relative to the existing branch
112
this_url = _get_branch_location(control_dir,
113
possible_transports=possible_transports)
114
# Perhaps the target control dir supports colocated branches?
116
root = controldir.ControlDir.open(this_url,
117
possible_transports=possible_transports)
118
except errors.NotBranchError:
119
return (False, this_url)
122
wt = control_dir.open_workingtree()
123
except (errors.NoWorkingTree, errors.NotLocalUrl):
124
return (False, this_url)
127
root._format.colocated_branches and
128
control_dir.control_url == root.control_url,
132
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
133
"""Lookup the location for a new sibling branch.
135
:param control_dir: Control directory relative to which to look up
137
:param location: Name of the new branch
138
:return: Full location to the new branch
140
location = directory_service.directories.dereference(location)
141
if '/' not in location and '\\' not in location:
142
(colocated, this_url) = _is_colocated(control_dir, possible_transports)
145
return urlutils.join_segment_parameters(this_url,
146
{"branch": urlutils.escape(location)})
148
return urlutils.join(this_url, '..', urlutils.escape(location))
152
def open_sibling_branch(control_dir, location, possible_transports=None):
153
"""Open a branch, possibly a sibling.
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):
165
this_url = _get_branch_location(control_dir)
168
this_url, '..', urlutils.escape(location)))
171
def open_nearby_branch(near=None, location=None, possible_transports=None):
172
"""Open a nearby branch.
174
:param near: Optional location of container from which to open branch
175
:param location: Location of the branch
176
:return: Branch instance
182
return Branch.open(location,
183
possible_transports=possible_transports)
184
except errors.NotBranchError:
186
cdir = controldir.ControlDir.open(near,
187
possible_transports=possible_transports)
188
return open_sibling_branch(cdir, location,
189
possible_transports=possible_transports)
192
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
193
def tree_files(file_list, default_branch=u'.', canonicalize=True,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
195
return internal_tree_files(file_list, default_branch, canonicalize,
88
199
def tree_files_for_add(file_list):
172
286
:return: workingtree, [relative_paths]
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
288
return WorkingTree.open_containing_paths(
289
file_list, default_directory='.',
223
294
def _get_view_info_for_change_reporter(tree):
353
442
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
445
def run(self, revision_id=None, revision=None, directory=u'.'):
357
446
if revision_id is not None and revision is not None:
358
raise errors.BzrCommandError('You can only supply one of'
359
' revision_id or --revision')
447
raise errors.BzrCommandError(gettext('You can only supply one of'
448
' revision_id or --revision'))
360
449
if revision_id is None and revision is None:
361
raise errors.BzrCommandError('You must supply either'
362
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
450
raise errors.BzrCommandError(gettext('You must supply either'
451
' --revision or a revision_id'))
453
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
455
revisions = b.repository.revisions
366
456
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
457
raise errors.BzrCommandError(gettext('Repository %r does not support '
458
'access to raw revision texts'))
370
460
b.repository.lock_read()
491
584
location_list=['.']
493
586
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
587
d = controldir.ControlDir.open(location)
497
590
working = d.open_workingtree()
498
591
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
592
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
593
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
594
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
595
" of a remote path"))
504
597
if (working.has_changes()):
505
598
raise errors.UncommittedChanges(working)
599
if working.get_shelf_manager().last_shelf() is not None:
600
raise errors.ShelvedChanges(working)
507
602
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
603
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
604
" from a lightweight checkout"))
511
606
d.destroy_workingtree()
609
class cmd_repair_workingtree(Command):
610
__doc__ = """Reset the working tree state file.
612
This is not meant to be used normally, but more as a way to recover from
613
filesystem corruption, etc. This rebuilds the working inventory back to a
614
'known good' state. Any new modifications (adding a file, renaming, etc)
615
will be lost, though modified files will still be detected as such.
617
Most users will want something more like "bzr revert" or "bzr update"
618
unless the state file has become corrupted.
620
By default this attempts to recover the current state by looking at the
621
headers of the state file. If the state file is too corrupted to even do
622
that, you can supply --revision to force the state of the tree.
625
takes_options = ['revision', 'directory',
627
help='Reset the tree even if it doesn\'t appear to be'
632
def run(self, revision=None, directory='.', force=False):
633
tree, _ = WorkingTree.open_containing(directory)
634
self.add_cleanup(tree.lock_tree_write().unlock)
638
except errors.BzrError:
639
pass # There seems to be a real error here, so we'll reset
642
raise errors.BzrCommandError(gettext(
643
'The tree does not appear to be corrupt. You probably'
644
' want "bzr revert" instead. Use "--force" if you are'
645
' sure you want to reset the working tree.'))
649
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
651
tree.reset_state(revision_ids)
652
except errors.BzrError, e:
653
if revision_ids is None:
654
extra = (gettext(', the header appears corrupt, try passing -r -1'
655
' to set the state to the last commit'))
658
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
661
class cmd_revno(Command):
515
662
__doc__ = """Show current revision number.
520
667
_see_also = ['info']
521
668
takes_args = ['location?']
522
669
takes_options = [
523
Option('tree', help='Show revno of working tree'),
670
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
675
def run(self, tree=False, location=u'.', revision=None):
676
if revision is not None and tree:
677
raise errors.BzrCommandError(gettext("--tree and --revision can "
678
"not be used together"))
530
682
wt = WorkingTree.open_containing(location)[0]
683
self.add_cleanup(wt.lock_read().unlock)
532
684
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
685
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
687
revid = wt.last_revision()
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
538
except errors.NoSuchRevision:
540
revno = ".".join(str(n) for n in revno_t)
542
689
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
690
self.add_cleanup(b.lock_read().unlock)
692
if len(revision) != 1:
693
raise errors.BzrCommandError(gettext(
694
"Tags can only be placed on a single revision, "
696
revid = revision[0].as_revision_id(b)
698
revid = b.last_revision()
700
revno_t = b.revision_id_to_dotted_revno(revid)
701
except errors.NoSuchRevision:
703
revno = ".".join(str(n) for n in revno_t)
546
704
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
705
self.outf.write(revno + '\n')
550
708
class cmd_revision_info(Command):
704
864
takes_args = ['dir+']
868
help='No error if existing, make parent directories as needed.',
705
872
encoding_type = 'replace'
707
def run(self, dir_list):
709
wt, dd = WorkingTree.open_containing(d)
710
base = os.path.dirname(dd)
711
id = wt.path2id(base)
715
self.outf.write('added %s\n' % d)
875
def add_file_with_parents(cls, wt, relpath):
876
if wt.path2id(relpath) is not None:
878
cls.add_file_with_parents(wt, osutils.dirname(relpath))
882
def add_file_single(cls, wt, relpath):
885
def run(self, dir_list, parents=False):
887
add_file = self.add_file_with_parents
889
add_file = self.add_file_single
891
wt, relpath = WorkingTree.open_containing(dir)
896
if e.errno != errno.EEXIST:
717
raise errors.NotVersionedError(path=base)
900
add_file(wt, relpath)
902
self.outf.write(gettext('added %s\n') % dir)
720
905
class cmd_relpath(Command):
828
1012
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
1014
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
1015
if names_list is None:
833
1017
if len(names_list) < 2:
834
raise errors.BzrCommandError("missing file argument")
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
1018
raise errors.BzrCommandError(gettext("missing file argument"))
1019
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
1020
for file_name in rel_names[0:-1]:
1022
raise errors.BzrCommandError(gettext("can not move root of branch"))
1023
self.add_cleanup(tree.lock_tree_write().unlock)
838
1024
self._run(tree, names_list, rel_names, after)
840
1026
def run_auto(self, names_list, after, dry_run):
841
1027
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
1028
raise errors.BzrCommandError(gettext('Only one path may be specified to'
845
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
1031
raise errors.BzrCommandError(gettext('--after cannot be specified with'
1033
work_tree, file_list = WorkingTree.open_containing_paths(
1034
names_list, default_directory='.')
1035
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
1036
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
1038
def _run(self, tree, names_list, rel_names, after):
960
1150
takes_options = ['remember', 'overwrite', 'revision',
961
1151
custom_help('verbose',
962
1152
help='Show logs of pulled revisions.'),
1153
custom_help('directory',
964
1154
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
1155
'rather than the one containing the working directory.'),
970
1157
help="Perform a local pull in a bound "
971
1158
"branch. Local pulls are not applied to "
972
1159
"the master branch."
1162
help="Show base revision text in conflicts.")
975
1164
takes_args = ['location?']
976
1165
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1167
def run(self, location=None, remember=None, overwrite=False,
979
1168
revision=None, verbose=False,
980
directory=None, local=False):
1169
directory=None, local=False,
981
1171
# FIXME: too much stuff is in the command class
982
1172
revision_id = None
983
1173
mergeable = None
1110
1306
Option('strict',
1111
1307
help='Refuse to push if there are uncommitted changes in'
1112
1308
' the working tree, --no-strict disables the check.'),
1310
help="Don't populate the working tree, even for protocols"
1311
" that support it."),
1114
1313
takes_args = ['location?']
1115
1314
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1316
def run(self, location=None, remember=None, overwrite=False,
1118
1317
create_prefix=False, verbose=False, revision=None,
1119
1318
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1319
stacked=False, strict=None, no_tree=False):
1121
1320
from bzrlib.push import _show_push_branch
1123
1322
if directory is None:
1124
1323
directory = '.'
1125
1324
# Get the source branch
1126
1325
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1326
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1128
1327
# Get the tip's revision_id
1129
1328
revision = _get_one_revision('push', revision)
1130
1329
if revision is not None:
1151
1350
# error by the feedback given to them. RBC 20080227.
1152
1351
stacked_on = parent_url
1153
1352
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1353
raise errors.BzrCommandError(gettext(
1354
"Could not determine branch to refer to."))
1157
1356
# Get the destination location
1158
1357
if location is None:
1159
1358
stored_loc = br_from.get_push_location()
1160
1359
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1360
parent_loc = br_from.get_parent()
1362
raise errors.BzrCommandError(gettext(
1363
"No push location known or specified. To push to the "
1364
"parent branch (at %s), use 'bzr push :parent'." %
1365
urlutils.unescape_for_display(parent_loc,
1366
self.outf.encoding)))
1368
raise errors.BzrCommandError(gettext(
1369
"No push location known or specified."))
1164
1371
display_url = urlutils.unescape_for_display(stored_loc,
1165
1372
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1373
note(gettext("Using saved push location: %s") % display_url)
1167
1374
location = stored_loc
1169
1376
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1377
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1378
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1379
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1382
class cmd_branch(Command):
1214
1425
def run(self, from_location, to_location=None, revision=None,
1215
1426
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1427
use_existing_dir=False, switch=False, bind=False,
1217
1429
from bzrlib import switch as _mod_switch
1218
1430
from bzrlib.tag import _merge_tags_if_possible
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1431
if self.invoked_as in ['get', 'clone']:
1432
ui.ui_factory.show_user_warning(
1433
'deprecated_command',
1434
deprecated_name=self.invoked_as,
1435
recommended_name='branch',
1436
deprecated_in_version='2.4')
1437
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1439
if not (hardlink or files_from):
1440
# accelerator_tree is usually slower because you have to read N
1441
# files (no readahead, lots of seeks, etc), but allow the user to
1442
# explicitly request it
1443
accelerator_tree = None
1444
if files_from is not None and files_from != from_location:
1445
accelerator_tree = WorkingTree.open(files_from)
1221
1446
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1447
self.add_cleanup(br_from.lock_read().unlock)
1224
1448
if revision is not None:
1225
1449
revision_id = revision.as_revision_id(br_from)
1230
1454
revision_id = br_from.last_revision()
1231
1455
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1456
to_location = getattr(br_from, "name", None)
1458
to_location = urlutils.derive_to_location(from_location)
1233
1459
to_transport = transport.get_transport(to_location)
1235
1461
to_transport.mkdir('.')
1236
1462
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1464
to_dir = controldir.ControlDir.open_from_transport(
1466
except errors.NotBranchError:
1467
if not use_existing_dir:
1468
raise errors.BzrCommandError(gettext('Target directory "%s" '
1469
'already exists.') % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1474
to_dir.open_branch()
1243
1475
except errors.NotBranchError:
1246
1478
raise errors.AlreadyBranchError(to_location)
1247
1479
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1480
raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
1251
# preserve whatever source format we have.
1252
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1253
possible_transports=[to_transport],
1254
accelerator_tree=accelerator_tree,
1255
hardlink=hardlink, stacked=stacked,
1256
force_new_repo=standalone,
1257
create_tree_if_local=not no_tree,
1258
source_branch=br_from)
1259
branch = dir.open_branch()
1260
except errors.NoSuchRevision:
1261
to_transport.delete_tree('.')
1262
msg = "The branch %s has no revision %s." % (from_location,
1264
raise errors.BzrCommandError(msg)
1486
# preserve whatever source format we have.
1487
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1488
possible_transports=[to_transport],
1489
accelerator_tree=accelerator_tree,
1490
hardlink=hardlink, stacked=stacked,
1491
force_new_repo=standalone,
1492
create_tree_if_local=not no_tree,
1493
source_branch=br_from)
1494
branch = to_dir.open_branch(
1495
possible_transports=[
1496
br_from.bzrdir.root_transport, to_transport])
1497
except errors.NoSuchRevision:
1498
to_transport.delete_tree('.')
1499
msg = gettext("The branch {0} has no revision {1}.").format(
1500
from_location, revision)
1501
raise errors.BzrCommandError(msg)
1504
to_repo = to_dir.open_repository()
1505
except errors.NoRepositoryPresent:
1506
to_repo = to_dir.create_repository()
1507
to_repo.fetch(br_from.repository, revision_id=revision_id)
1508
branch = br_from.sprout(to_dir, revision_id=revision_id)
1265
1509
_merge_tags_if_possible(br_from, branch)
1266
1510
# If the source branch is stacked, the new branch may
1267
1511
# be stacked whether we asked for that explicitly or not.
1268
1512
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1514
note(gettext('Created new stacked branch referring to %s.') %
1271
1515
branch.get_stacked_on_url())
1272
1516
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
1517
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1518
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1520
# Bind to the parent
1277
1521
parent_branch = Branch.open(from_location)
1278
1522
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1523
note(gettext('New branch bound to %s') % from_location)
1281
1525
# Switch to the new branch
1282
1526
wt, _ = WorkingTree.open_containing('.')
1283
1527
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1528
note(gettext('Switched to branch: %s'),
1285
1529
urlutils.unescape_for_display(branch.base, 'utf-8'))
1532
class cmd_branches(Command):
1533
__doc__ = """List the branches available at the current location.
1535
This command will print the names of all the branches at the current
1539
takes_args = ['location?']
1541
Option('recursive', short_name='R',
1542
help='Recursively scan for branches rather than '
1543
'just looking in the specified location.')]
1545
def run(self, location=".", recursive=False):
1547
t = transport.get_transport(location)
1548
if not t.listable():
1549
raise errors.BzrCommandError(
1550
"Can't scan this type of location.")
1551
for b in controldir.ControlDir.find_branches(t):
1552
self.outf.write("%s\n" % urlutils.unescape_for_display(
1553
urlutils.relative_url(t.base, b.base),
1554
self.outf.encoding).rstrip("/"))
1556
dir = controldir.ControlDir.open_containing(location)[0]
1558
active_branch = dir.open_branch(name="")
1559
except errors.NotBranchError:
1560
active_branch = None
1561
branches = dir.get_branches()
1563
for name, branch in branches.iteritems():
1566
active = (active_branch is not None and
1567
active_branch.base == branch.base)
1568
names[name] = active
1569
# Only mention the current branch explicitly if it's not
1570
# one of the colocated branches
1571
if not any(names.values()) and active_branch is not None:
1572
self.outf.write("* %s\n" % gettext("(default)"))
1573
for name in sorted(names.keys()):
1574
active = names[name]
1579
self.outf.write("%s %s\n" % (
1580
prefix, name.encode(self.outf.encoding)))
1288
1583
class cmd_checkout(Command):
1289
1584
__doc__ = """Create a new checkout of an existing branch.
1389
1687
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1392
This will perform a merge into the working tree, and may generate
1393
conflicts. If you have any local changes, you will still
1394
need to commit them after the update for the update to be complete.
1396
If you want to discard your local changes, you can just do a
1397
'bzr revert' instead of 'bzr commit' after the update.
1399
If the tree's branch is bound to a master branch, it will also update
1688
__doc__ = """Update a working tree to a new revision.
1690
This will perform a merge of the destination revision (the tip of the
1691
branch, or the specified revision) into the working tree, and then make
1692
that revision the basis revision for the working tree.
1694
You can use this to visit an older revision, or to update a working tree
1695
that is out of date from its branch.
1697
If there are any uncommitted changes in the tree, they will be carried
1698
across and remain as uncommitted changes after the update. To discard
1699
these changes, use 'bzr revert'. The uncommitted changes may conflict
1700
with the changes brought in by the change in basis revision.
1702
If the tree's branch is bound to a master branch, bzr will also update
1400
1703
the branch from the master.
1705
You cannot update just a single file or directory, because each Bazaar
1706
working tree has just a single basis revision. If you want to restore a
1707
file that has been removed locally, use 'bzr revert' instead of 'bzr
1708
update'. If you want to restore a file to its state in a previous
1709
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1710
out the old content of that file to a new location.
1712
The 'dir' argument, if given, must be the location of the root of a
1713
working tree to update. By default, the working tree that contains the
1714
current working directory is used.
1403
1717
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1718
takes_args = ['dir?']
1405
takes_options = ['revision']
1719
takes_options = ['revision',
1721
help="Show base revision text in conflicts."),
1406
1723
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1725
def run(self, dir=None, revision=None, show_base=None):
1409
1726
if revision is not None and len(revision) != 1:
1410
raise errors.BzrCommandError(
1411
"bzr update --revision takes exactly one revision")
1412
tree = WorkingTree.open_containing(dir)[0]
1727
raise errors.BzrCommandError(gettext(
1728
"bzr update --revision takes exactly one revision"))
1730
tree = WorkingTree.open_containing('.')[0]
1732
tree, relpath = WorkingTree.open_containing(dir)
1735
raise errors.BzrCommandError(gettext(
1736
"bzr update can only update a whole tree, "
1737
"not a file or subdirectory"))
1413
1738
branch = tree.branch
1414
1739
possible_transports = []
1415
1740
master = branch.get_master_branch(
1416
1741
possible_transports=possible_transports)
1417
1742
if master is not None:
1419
1743
branch_location = master.base
1746
branch_location = tree.branch.base
1421
1747
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1748
self.add_cleanup(tree.unlock)
1424
1749
# get rid of the final '/' and be ready for display
1425
1750
branch_location = urlutils.unescape_for_display(
1451
1776
change_reporter,
1452
1777
possible_transports=possible_transports,
1453
1778
revision=revision_id,
1780
show_base=show_base)
1455
1781
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1782
raise errors.BzrCommandError(gettext(
1457
1783
"branch has no revision %s\n"
1458
1784
"bzr update --revision only works"
1459
" for a revision in the branch history"
1785
" for a revision in the branch history")
1460
1786
% (e.revision))
1461
1787
revno = tree.branch.revision_id_to_dotted_revno(
1462
1788
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1789
note(gettext('Updated to revision {0} of branch {1}').format(
1790
'.'.join(map(str, revno)), branch_location))
1465
1791
parent_ids = tree.get_parent_ids()
1466
1792
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1467
note('Your local commits will now show as pending merges with '
1468
"'bzr status', and can be committed with 'bzr commit'.")
1793
note(gettext('Your local commits will now show as pending merges with '
1794
"'bzr status', and can be committed with 'bzr commit'."))
1469
1795
if conflicts != 0:
1530
1857
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1858
'The file deletion mode to be used.',
1532
1859
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1860
safe='Backup changed files (default).',
1535
1861
keep='Delete from bzr but leave the working copy.',
1862
no_backup='Don\'t backup changed files.',
1536
1863
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1864
'recovered and even if they are non-empty directories. '
1865
'(deprecated, use no-backup)')]
1538
1866
aliases = ['rm', 'del']
1539
1867
encoding_type = 'replace'
1541
1869
def run(self, file_list, verbose=False, new=False,
1542
1870
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1871
if file_deletion_strategy == 'force':
1872
note(gettext("(The --force option is deprecated, rather use --no-backup "
1874
file_deletion_strategy = 'no-backup'
1876
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1878
if file_list is not None:
1546
1879
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1881
self.add_cleanup(tree.lock_write().unlock)
1550
1882
# Heuristics should probably all move into tree.remove_smart or
1742
2090
to_transport.ensure_base()
1743
2091
except errors.NoSuchFile:
1744
2092
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
2093
raise errors.BzrCommandError(gettext("Parent directory of %s"
1746
2094
" does not exist."
1747
2095
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
2096
" leading parent directories.")
1750
2098
to_transport.create_prefix()
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2101
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1754
2102
except errors.NotBranchError:
1755
2103
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
2104
create_branch = controldir.ControlDir.create_branch_convenience
2106
force_new_tree = False
2108
force_new_tree = None
1757
2109
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
2110
possible_transports=[to_transport],
2111
force_new_tree=force_new_tree)
1759
2112
a_bzrdir = branch.bzrdir
1761
2114
from bzrlib.transport.local import LocalTransport
1837
2192
def run(self, location, format=None, no_trees=False):
1838
2193
if format is None:
1839
format = bzrdir.format_registry.make_bzrdir('default')
2194
format = controldir.format_registry.make_bzrdir('default')
1841
2196
if location is None:
1844
2199
to_transport = transport.get_transport(location)
1845
to_transport.ensure_base()
1847
newdir = format.initialize_on_transport(to_transport)
1848
repo = newdir.create_repository(shared=True)
1849
repo.set_make_working_trees(not no_trees)
2201
(repo, newdir, require_stacking, repository_policy) = (
2202
format.initialize_on_transport_ex(to_transport,
2203
create_prefix=True, make_working_trees=not no_trees,
2204
shared_repo=True, force_new_repo=True,
2205
use_existing_dir=True,
2206
repo_format_name=format.repository_format.get_format_string()))
1850
2207
if not is_quiet():
1851
2208
from bzrlib.info import show_bzrdir_info
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2209
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1855
2212
class cmd_diff(Command):
1969
2343
elif ':' in prefix:
1970
2344
old_label, new_label = prefix.split(":")
1972
raise errors.BzrCommandError(
2346
raise errors.BzrCommandError(gettext(
1973
2347
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2348
' (eg "old/:new/")'))
1976
2350
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2351
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2352
' one or two revision specifiers'))
1980
2354
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2355
raise errors.BzrCommandError(gettext(
2356
'{0} and {1} are mutually exclusive').format(
2357
'--using', '--format'))
1984
2359
(old_tree, new_tree,
1985
2360
old_branch, new_branch,
1986
2361
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2362
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2363
# GNU diff on Windows uses ANSI encoding for filenames
2364
path_encoding = osutils.get_diff_header_encoding()
1988
2365
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2366
specific_files=specific_files,
1990
2367
external_diff_options=diff_options,
1991
2368
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2369
extra_trees=extra_trees,
2370
path_encoding=path_encoding,
1993
2372
format_cls=format)
2053
2428
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2429
takes_options = ['directory', 'null']
2060
2431
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2432
def run(self, null=False, directory=u'.'):
2433
wt = WorkingTree.open_containing(directory)[0]
2434
self.add_cleanup(wt.lock_read().unlock)
2065
2435
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2436
self.add_cleanup(basis.lock_read().unlock)
2068
2437
basis_inv = basis.inventory
2069
2438
inv = wt.inventory
2070
2439
for file_id in inv:
2071
if file_id in basis_inv:
2440
if basis_inv.has_id(file_id):
2073
2442
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2444
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2445
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2448
self.outf.write(path + '\0')
2297
2674
Option('show-diff',
2298
2675
short_name='p',
2299
2676
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2677
Option('include-merged',
2301
2678
help='Show merged revisions like --levels 0 does.'),
2679
Option('include-merges', hidden=True,
2680
help='Historical alias for --include-merged.'),
2681
Option('omit-merges',
2682
help='Do not report commits with more than one parent.'),
2302
2683
Option('exclude-common-ancestry',
2303
2684
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2685
' of both ancestries (require -rX..Y).'
2687
Option('signatures',
2688
help='Show digital signature validity.'),
2691
help='Show revisions whose properties match this '
2694
ListOption('match-message',
2695
help='Show revisions whose message matches this '
2698
ListOption('match-committer',
2699
help='Show revisions whose committer matches this '
2702
ListOption('match-author',
2703
help='Show revisions whose authors match this '
2706
ListOption('match-bugs',
2707
help='Show revisions whose bugs match this '
2307
2711
encoding_type = 'replace'
2327
2740
_get_info_for_log_files,
2329
2742
direction = (forward and 'forward') or 'reverse'
2743
if symbol_versioning.deprecated_passed(include_merges):
2744
ui.ui_factory.show_user_warning(
2745
'deprecated_command_option',
2746
deprecated_name='--include-merges',
2747
recommended_name='--include-merged',
2748
deprecated_in_version='2.5',
2749
command=self.invoked_as)
2750
if include_merged is None:
2751
include_merged = include_merges
2753
raise errors.BzrCommandError(gettext(
2754
'{0} and {1} are mutually exclusive').format(
2755
'--include-merges', '--include-merged'))
2756
if include_merged is None:
2757
include_merged = False
2330
2758
if (exclude_common_ancestry
2331
2759
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2760
raise errors.BzrCommandError(gettext(
2761
'--exclude-common-ancestry requires -r with two revisions'))
2335
2763
if levels is None:
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2766
raise errors.BzrCommandError(gettext(
2767
'{0} and {1} are mutually exclusive').format(
2768
'--levels', '--include-merged'))
2341
2770
if change is not None:
2342
2771
if len(change) > 1:
2343
2772
raise errors.RangeInChangeOption()
2344
2773
if revision is not None:
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2774
raise errors.BzrCommandError(gettext(
2775
'{0} and {1} are mutually exclusive').format(
2776
'--revision', '--change'))
2348
2778
revision = change
2528
2976
help='Recurse into subdirectories.'),
2529
2977
Option('from-root',
2530
2978
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2979
Option('unknown', short_name='u',
2980
help='Print unknown files.'),
2532
2981
Option('versioned', help='Print versioned files.',
2533
2982
short_name='V'),
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2983
Option('ignored', short_name='i',
2984
help='Print ignored files.'),
2985
Option('kind', short_name='k',
2539
2986
help='List entries of a particular kind: file, directory, symlink.',
2543
2992
@display_command
2544
2993
def run(self, revision=None, verbose=False,
2545
2994
recursive=False, from_root=False,
2546
2995
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2996
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2998
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2999
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
3001
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
3002
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
3003
all = not (unknown or versioned or ignored)
2556
3005
selection = {'I':ignored, '?':unknown, 'V':versioned}
2725
3184
self.outf.write("%s\n" % pattern)
2727
3186
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3187
raise errors.BzrCommandError(gettext("ignore requires at least one "
3188
"NAME_PATTERN or --default-rules."))
2730
3189
name_pattern_list = [globbing.normalize_pattern(p)
2731
3190
for p in name_pattern_list]
3192
bad_patterns_count = 0
3193
for p in name_pattern_list:
3194
if not globbing.Globster.is_pattern_valid(p):
3195
bad_patterns_count += 1
3196
bad_patterns += ('\n %s' % p)
3198
msg = (ngettext('Invalid ignore pattern found. %s',
3199
'Invalid ignore patterns found. %s',
3200
bad_patterns_count) % bad_patterns)
3201
ui.ui_factory.show_error(msg)
3202
raise errors.InvalidPattern('')
2732
3203
for name_pattern in name_pattern_list:
2733
3204
if (name_pattern[0] == '/' or
2734
3205
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
raise errors.BzrCommandError(
2736
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
3206
raise errors.BzrCommandError(gettext(
3207
"NAME_PATTERN should not be an absolute path"))
3208
tree, relpath = WorkingTree.open_containing(directory)
2738
3209
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3210
ignored = globbing.Globster(name_pattern_list)
3212
self.add_cleanup(tree.lock_read().unlock)
2742
3213
for entry in tree.list_files():
2744
3215
if id is not None:
2745
3216
filename = entry[0]
2746
3217
if ignored.match(filename):
2747
3218
matches.append(filename)
2749
3219
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3220
self.outf.write(gettext("Warning: the following files are version "
3221
"controlled and match your ignore pattern:\n%s"
2752
3222
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3223
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2756
3226
class cmd_ignored(Command):
2842
3314
Option('per-file-timestamps',
2843
3315
help='Set modification time of files to that of the last '
2844
3316
'revision in which it was changed.'),
3317
Option('uncommitted',
3318
help='Export the working tree contents rather than that of the '
2846
3321
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
3322
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2848
3324
from bzrlib.export import export
2850
3326
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
3327
branch_or_subdir = directory
3329
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3331
if tree is not None:
3332
self.add_cleanup(tree.lock_read().unlock)
3336
raise errors.BzrCommandError(
3337
gettext("--uncommitted requires a working tree"))
2855
b, subdir = Branch.open_containing(branch_or_subdir)
2858
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
3340
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3342
export(export_tree, dest, format, root, subdir, filtered=filters,
2861
3343
per_file_timestamps=per_file_timestamps)
2862
3344
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3345
raise errors.BzrCommandError(
3346
gettext('Unsupported export format: %s') % e.format)
2866
3349
class cmd_cat(Command):
2900
3382
if tree is None:
2901
3383
tree = b.basis_tree()
2902
3384
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3385
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3387
old_file_id = rev_tree.path2id(relpath)
3389
# TODO: Split out this code to something that generically finds the
3390
# best id for a path across one or more trees; it's like
3391
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3393
if name_from_revision:
2909
3394
# Try in revision if requested
2910
3395
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3396
raise errors.BzrCommandError(gettext(
3397
"{0!r} is not present in revision {1}").format(
2913
3398
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3400
actual_file_id = old_file_id
2917
3402
cur_file_id = tree.path2id(relpath)
2919
if cur_file_id is not None:
2920
# Then try with the actual file id
2922
content = rev_tree.get_file_text(cur_file_id)
2924
except errors.NoSuchId:
2925
# The actual file id didn't exist at that time
2927
if not found and old_file_id is not None:
2928
# Finally try with the old file id
2929
content = rev_tree.get_file_text(old_file_id)
2932
# Can't be found anywhere
2933
raise errors.BzrCommandError(
2934
"%r is not present in revision %s" % (
3403
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3404
actual_file_id = cur_file_id
3405
elif old_file_id is not None:
3406
actual_file_id = old_file_id
3408
raise errors.BzrCommandError(gettext(
3409
"{0!r} is not present in revision {1}").format(
2935
3410
filename, rev_tree.get_revision_id()))
2937
from bzrlib.filters import (
2938
ContentFilterContext,
2939
filtered_output_bytes,
2941
filters = rev_tree._content_filter_stack(relpath)
2942
chunks = content.splitlines(True)
2943
content = filtered_output_bytes(chunks, filters,
2944
ContentFilterContext(relpath, rev_tree))
2946
self.outf.writelines(content)
3412
from bzrlib.filter_tree import ContentFilterTree
3413
filter_tree = ContentFilterTree(rev_tree,
3414
rev_tree._content_filter_stack)
3415
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3417
content = rev_tree.get_file_text(actual_file_id)
3419
self.outf.write(content)
2952
3422
class cmd_local_time_offset(Command):
3013
3483
to trigger updates to external systems like bug trackers. The --fixes
3014
3484
option can be used to record the association between a revision and
3015
3485
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3034
# TODO: Run hooks on tree to-be-committed, and after commit.
3036
# TODO: Strict commit that fails if there are deleted files.
3037
# (what does "deleted files" mean ??)
3039
# TODO: Give better message for -s, --summary, used by tla people
3041
# XXX: verbose currently does nothing
3043
3488
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3489
takes_args = ['selected*']
3076
3521
Option('show-diff', short_name='p',
3077
3522
help='When no message is supplied, show the diff along'
3078
3523
' with the status summary in the message editor.'),
3525
help='When committing to a foreign version control '
3526
'system do not push data that can not be natively '
3080
3529
aliases = ['ci', 'checkin']
3082
3531
def _iter_bug_fix_urls(self, fixes, branch):
3532
default_bugtracker = None
3083
3533
# Configure the properties for bug fixing attributes.
3084
3534
for fixed_bug in fixes:
3085
3535
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3536
if len(tokens) == 1:
3537
if default_bugtracker is None:
3538
branch_config = branch.get_config()
3539
default_bugtracker = branch_config.get_user_option(
3541
if default_bugtracker is None:
3542
raise errors.BzrCommandError(gettext(
3543
"No tracker specified for bug %s. Use the form "
3544
"'tracker:id' or specify a default bug tracker "
3545
"using the `bugtracker` option.\nSee "
3546
"\"bzr help bugs\" for more information on this "
3547
"feature. Commit refused.") % fixed_bug)
3548
tag = default_bugtracker
3550
elif len(tokens) != 2:
3551
raise errors.BzrCommandError(gettext(
3088
3552
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
3553
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3554
"feature.\nCommit refused.") % fixed_bug)
3556
tag, bug_id = tokens
3093
3558
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
3559
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3560
raise errors.BzrCommandError(gettext(
3561
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3097
3562
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3563
raise errors.BzrCommandError(gettext(
3564
"%s\nCommit refused.") % (str(e),))
3101
3566
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3567
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3568
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3570
from bzrlib.errors import (
3105
3571
PointlessCommit,
3106
3572
ConflictsInTree,
3184
3648
# make_commit_message_template_encoded returns user encoding.
3185
3649
# We probably want to be using edit_commit_message instead to
3187
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3189
start_message=start_message)
3190
if my_message is None:
3191
raise errors.BzrCommandError("please specify a commit"
3192
" message with either --message or --file")
3193
if my_message == "":
3194
raise errors.BzrCommandError("empty commit message specified")
3651
my_message = set_commit_message(commit_obj)
3652
if my_message is None:
3653
start_message = generate_commit_message_template(commit_obj)
3654
my_message = edit_commit_message_encoded(text,
3655
start_message=start_message)
3656
if my_message is None:
3657
raise errors.BzrCommandError(gettext("please specify a commit"
3658
" message with either --message or --file"))
3659
if my_message == "":
3660
raise errors.BzrCommandError(gettext("Empty commit message specified."
3661
" Please specify a commit message with either"
3662
" --message or --file or leave a blank message"
3663
" with --message \"\"."))
3195
3664
return my_message
3197
3666
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3674
reporter=None, verbose=verbose, revprops=properties,
3206
3675
authors=author, timestamp=commit_stamp,
3207
3676
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3677
exclude=tree.safe_relpath_files(exclude),
3209
3679
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3680
raise errors.BzrCommandError(gettext("No changes to commit."
3681
" Please 'bzr add' the files you want to commit, or use"
3682
" --unchanged to force an empty commit."))
3212
3683
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3684
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3214
3685
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3216
3687
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3688
raise errors.BzrCommandError(gettext("Commit refused because there are"
3689
" unknown files in the working tree."))
3219
3690
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3691
e.extra_help = (gettext("\n"
3221
3692
'To commit to master branch, run update and then commit.\n'
3222
3693
'You can also pass --local to commit to continue working '
3297
3768
class cmd_upgrade(Command):
3298
__doc__ = """Upgrade branch storage to current format.
3300
The check command or bzr developers may sometimes advise you to run
3301
this command. When the default format has changed you may also be warned
3302
during other operations to upgrade.
3769
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3771
When the default format has changed after a major new release of
3772
Bazaar, you may be informed during certain operations that you
3773
should upgrade. Upgrading to a newer format may improve performance
3774
or make new features available. It may however limit interoperability
3775
with older repositories or with older versions of Bazaar.
3777
If you wish to upgrade to a particular format rather than the
3778
current default, that can be specified using the --format option.
3779
As a consequence, you can use the upgrade command this way to
3780
"downgrade" to an earlier format, though some conversions are
3781
a one way process (e.g. changing from the 1.x default to the
3782
2.x default) so downgrading is not always possible.
3784
A backup.bzr.~#~ directory is created at the start of the conversion
3785
process (where # is a number). By default, this is left there on
3786
completion. If the conversion fails, delete the new .bzr directory
3787
and rename this one back in its place. Use the --clean option to ask
3788
for the backup.bzr directory to be removed on successful conversion.
3789
Alternatively, you can delete it by hand if everything looks good
3792
If the location given is a shared repository, dependent branches
3793
are also converted provided the repository converts successfully.
3794
If the conversion of a branch fails, remaining branches are still
3797
For more information on upgrades, see the Bazaar Upgrade Guide,
3798
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3801
_see_also = ['check', 'reconcile', 'formats']
3306
3802
takes_args = ['url?']
3307
3803
takes_options = [
3308
RegistryOption('format',
3309
help='Upgrade to a specific format. See "bzr help'
3310
' formats" for details.',
3311
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3312
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3313
value_switches=True, title='Branch format'),
3804
RegistryOption('format',
3805
help='Upgrade to a specific format. See "bzr help'
3806
' formats" for details.',
3807
lazy_registry=('bzrlib.controldir', 'format_registry'),
3808
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3809
value_switches=True, title='Branch format'),
3811
help='Remove the backup.bzr directory if successful.'),
3813
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3816
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3817
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3818
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3820
if len(exceptions) == 1:
3821
# Compatibility with historical behavior
3321
3827
class cmd_whoami(Command):
3340
3847
encoding_type = 'replace'
3342
3849
@display_command
3343
def run(self, email=False, branch=False, name=None):
3850
def run(self, email=False, branch=False, name=None, directory=None):
3344
3851
if name is None:
3345
# use branch if we're inside one; otherwise global config
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3852
if directory is None:
3853
# use branch if we're inside one; otherwise global config
3855
c = Branch.open_containing(u'.')[0].get_config_stack()
3856
except errors.NotBranchError:
3857
c = _mod_config.GlobalStack()
3859
c = Branch.open(directory).get_config_stack()
3860
identity = c.get('email')
3351
self.outf.write(c.user_email() + '\n')
3862
self.outf.write(_mod_config.extract_email_address(identity)
3353
self.outf.write(c.username() + '\n')
3865
self.outf.write(identity + '\n')
3869
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3872
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3874
_mod_config.extract_email_address(name)
3359
3875
except errors.NoEmailInUsername, e:
3360
3876
warning('"%s" does not seem to contain an email address. '
3361
3877
'This is allowed, but not recommended.', name)
3363
3879
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3881
if directory is None:
3882
c = Branch.open_containing(u'.')[0].get_config_stack()
3884
c = Branch.open(directory).get_config_stack()
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3886
c = _mod_config.GlobalStack()
3887
c.set('email', name)
3371
3890
class cmd_nick(Command):
3372
3891
__doc__ = """Print or set the branch nickname.
3374
If unset, the tree root directory name is used as the nickname.
3375
To print the current nickname, execute with no argument.
3893
If unset, the colocated branch name is used for colocated branches, and
3894
the branch directory name is used for other branches. To print the
3895
current nickname, execute with no argument.
3377
3897
Bound branches use the nickname of its master branch unless it is set
3586
4111
def run(self, testspecs_list=None, verbose=False, one=False,
3587
4112
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
4114
first=False, list_only=False,
3590
4115
randomize=None, exclude=None, strict=False,
3591
4116
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
parallel=None, lsprof_tests=False):
3593
from bzrlib.tests import selftest
3594
import bzrlib.benchmarks as benchmarks
3595
from bzrlib.benchmarks import tree_creator
3597
# Make deprecation warnings visible, unless -Werror is set
3598
symbol_versioning.activate_deprecation_warnings(override=False)
3600
if cache_dir is not None:
3601
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
4117
parallel=None, lsprof_tests=False,
4120
# During selftest, disallow proxying, as it can cause severe
4121
# performance penalties and is only needed for thread
4122
# safety. The selftest command is assumed to not use threads
4123
# too heavily. The call should be as early as possible, as
4124
# error reporting for past duplicate imports won't have useful
4126
lazy_import.disallow_proxying()
4128
from bzrlib import tests
3602
4130
if testspecs_list is not None:
3603
4131
pattern = '|'.join(testspecs_list)
3608
4136
from bzrlib.tests import SubUnitBzrRunner
3609
4137
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
4138
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4139
"needs to be installed to use --subunit."))
3612
4140
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
4141
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
4142
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4143
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4144
# following code can be deleted when it's sufficiently deployed
4145
# -- vila/mgz 20100514
4146
if (sys.platform == "win32"
4147
and getattr(sys.stdout, 'fileno', None) is not None):
3617
4149
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
4151
self.additional_selftest_args.setdefault(
3620
4152
'suite_decorators', []).append(parallel)
3622
test_suite_factory = benchmarks.test_suite
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
verbose = not is_quiet()
3625
# TODO: should possibly lock the history file...
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
4154
raise errors.BzrCommandError(gettext(
4155
"--benchmark is no longer supported from bzr 2.2; "
4156
"use bzr-usertest instead"))
4157
test_suite_factory = None
4159
exclude_pattern = None
3629
test_suite_factory = None
4161
exclude_pattern = '(' + '|'.join(exclude) + ')'
4163
self._disable_fsync()
3631
4164
selftest_kwargs = {"verbose": verbose,
3632
4165
"pattern": pattern,
3633
4166
"stop_on_failure": one,
3635
4168
"test_suite_factory": test_suite_factory,
3636
4169
"lsprof_timed": lsprof_timed,
3637
4170
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
4171
"matching_tests_first": first,
3640
4172
"list_only": list_only,
3641
4173
"random_seed": randomize,
3642
"exclude_pattern": exclude,
4174
"exclude_pattern": exclude_pattern,
3643
4175
"strict": strict,
3644
4176
"load_list": load_list,
3645
4177
"debug_flags": debugflag,
3646
4178
"starting_with": starting_with
3648
4180
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
4182
# Make deprecation warnings visible, unless -Werror is set
4183
cleanup = symbol_versioning.activate_deprecation_warnings(
4186
result = tests.selftest(**selftest_kwargs)
3650
4189
return int(not result)
4191
def _disable_fsync(self):
4192
"""Change the 'os' functionality to not synchronize."""
4193
self._orig_fsync = getattr(os, 'fsync', None)
4194
if self._orig_fsync is not None:
4195
os.fsync = lambda filedes: None
4196
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4197
if self._orig_fdatasync is not None:
4198
os.fdatasync = lambda filedes: None
3653
4201
class cmd_version(Command):
3654
4202
__doc__ = """Show version of bzr."""
3709
4255
The source of the merge can be specified either in the form of a branch,
3710
4256
or in the form of a path to a file containing a merge directive generated
3711
4257
with bzr send. If neither is specified, the default is the upstream branch
3712
or the branch most recently merged using --remember.
3714
When merging a branch, by default the tip will be merged. To pick a different
3715
revision, pass --revision. If you specify two values, the first will be used as
3716
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3717
available revisions, like this is commonly referred to as "cherrypicking".
3719
Revision numbers are always relative to the branch being merged.
3721
By default, bzr will try to merge in all new work from the other
3722
branch, automatically determining an appropriate base. If this
3723
fails, you may need to give an explicit base.
4258
or the branch most recently merged using --remember. The source of the
4259
merge may also be specified in the form of a path to a file in another
4260
branch: in this case, only the modifications to that file are merged into
4261
the current working tree.
4263
When merging from a branch, by default bzr will try to merge in all new
4264
work from the other branch, automatically determining an appropriate base
4265
revision. If this fails, you may need to give an explicit base.
4267
To pick a different ending revision, pass "--revision OTHER". bzr will
4268
try to merge in all new work up to and including revision OTHER.
4270
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4271
through OTHER, excluding BASE but including OTHER, will be merged. If this
4272
causes some revisions to be skipped, i.e. if the destination branch does
4273
not already contain revision BASE, such a merge is commonly referred to as
4274
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4275
cherrypicks. The changes look like a normal commit, and the history of the
4276
changes from the other branch is not stored in the commit.
4278
Revision numbers are always relative to the source branch.
3725
4280
Merge will do its best to combine the changes in two branches, but there
3726
4281
are some kinds of problems only a human can fix. When it encounters those,
3727
4282
it will mark a conflict. A conflict means that you need to fix something,
3728
before you should commit.
4283
before you can commit.
3730
4285
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3732
If there is no default branch set, the first merge will set it. After
3733
that, you can omit the branch to use the default. To change the
3734
default, use --remember. The value will only be saved if the remote
3735
location can be accessed.
4287
If there is no default branch set, the first merge will set it (use
4288
--no-remember to avoid setting it). After that, you can omit the branch
4289
to use the default. To change the default, use --remember. The value will
4290
only be saved if the remote location can be accessed.
3737
4292
The results of the merge are placed into the destination working
3738
4293
directory, where they can be reviewed (with bzr diff), tested, and then
3739
4294
committed to record the result of the merge.
3741
4296
merge refuses to run if there are any uncommitted changes, unless
3742
--force is given. The --force option can also be used to create a
4297
--force is given. If --force is given, then the changes from the source
4298
will be merged with the current working tree, including any uncommitted
4299
changes in the tree. The --force option can also be used to create a
3743
4300
merge revision which has more than two parents.
3745
4302
If one would like to merge changes from the working tree of the other
3873
4430
self.sanity_check_merger(merger)
3874
4431
if (merger.base_rev_id == merger.other_rev_id and
3875
4432
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4433
# check if location is a nonexistent file (and not a branch) to
4434
# disambiguate the 'Nothing to do'
4435
if merger.interesting_files:
4436
if not merger.other_tree.has_filename(
4437
merger.interesting_files[0]):
4438
note(gettext("merger: ") + str(merger))
4439
raise errors.PathsDoNotExist([location])
4440
note(gettext('Nothing to do.'))
4442
if pull and not preview:
3879
4443
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4444
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4445
if (merger.base_rev_id == tree.last_revision()):
3882
4446
result = tree.pull(merger.other_branch, False,
3883
4447
merger.other_rev_id)
3884
4448
result.report(self.outf)
3886
4450
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4451
raise errors.BzrCommandError(gettext(
3888
4452
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4453
" (perhaps you would prefer 'bzr pull')"))
3891
4455
return self._do_preview(merger)
3892
4456
elif interactive:
3988
4554
if other_revision_id is None:
3989
4555
other_revision_id = _mod_revision.ensure_null(
3990
4556
other_branch.last_revision())
3991
# Remember where we merge from
3992
if ((remember or tree.branch.get_submit_branch() is None) and
3993
user_location is not None):
4557
# Remember where we merge from. We need to remember if:
4558
# - user specify a location (and we don't merge from the parent
4560
# - user ask to remember or there is no previous location set to merge
4561
# from and user didn't ask to *not* remember
4562
if (user_location is not None
4564
or (remember is None
4565
and tree.branch.get_submit_branch() is None)))):
3994
4566
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4567
# Merge tags (but don't set them in the master branch yet, the user
4568
# might revert this merge). Commit will propagate them.
4569
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4570
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4571
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4572
if other_path != '':
4340
4916
theirs_only=False,
4341
4917
log_format=None, long=False, short=False, line=False,
4342
4918
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4919
include_merged=None, revision=None, my_revision=None,
4921
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4344
4922
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4923
def message(s):
4346
4924
if not is_quiet():
4347
4925
self.outf.write(s)
4927
if symbol_versioning.deprecated_passed(include_merges):
4928
ui.ui_factory.show_user_warning(
4929
'deprecated_command_option',
4930
deprecated_name='--include-merges',
4931
recommended_name='--include-merged',
4932
deprecated_in_version='2.5',
4933
command=self.invoked_as)
4934
if include_merged is None:
4935
include_merged = include_merges
4937
raise errors.BzrCommandError(gettext(
4938
'{0} and {1} are mutually exclusive').format(
4939
'--include-merges', '--include-merged'))
4940
if include_merged is None:
4941
include_merged = False
4350
4943
mine_only = this
4430
5025
if mine_only and not local_extra:
4431
5026
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
5027
message(gettext('This branch has no new revisions.\n'))
4433
5028
elif theirs_only and not remote_extra:
4434
5029
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
5030
message(gettext('Other branch has no new revisions.\n'))
4436
5031
elif not (mine_only or theirs_only or local_extra or
4438
5033
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
5035
message(gettext("Branches are up to date.\n"))
4441
5036
self.cleanup_now()
4442
5037
if not status_code and parent is None and other_branch is not None:
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
5038
self.add_cleanup(local_branch.lock_write().unlock)
4445
5039
# handle race conditions - a parent might be set while we run.
4446
5040
if local_branch.get_parent() is None:
4447
5041
local_branch.set_parent(remote_branch.base)
4578
5155
Option('long', help='Show commit date in annotations.'),
4582
5160
encoding_type = 'exact'
4584
5162
@display_command
4585
5163
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5164
show_ids=False, directory=None):
5165
from bzrlib.annotate import (
4588
5168
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5169
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
5170
if wt is not None:
4592
self.add_cleanup(wt.unlock)
5171
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5173
self.add_cleanup(branch.lock_read().unlock)
4596
5174
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
5175
self.add_cleanup(tree.lock_read().unlock)
5176
if wt is not None and revision is None:
4600
5177
file_id = wt.path2id(relpath)
4602
5179
file_id = tree.path2id(relpath)
4603
5180
if file_id is None:
4604
5181
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
5182
if wt is not None and revision is None:
4607
5183
# If there is a tree and we're not annotating historical
4608
5184
# versions, annotate the working tree's content.
4609
5185
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
5186
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5188
annotate_file_tree(tree, file_id, self.outf, long, all,
5189
show_ids=show_ids, branch=branch)
4616
5192
class cmd_re_sign(Command):
4620
5196
hidden = True # is this right ?
4621
5197
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5198
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
5200
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5201
if revision_id_list is not None and revision is not None:
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
5202
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5203
if revision_id_list is None and revision is None:
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
5204
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5205
b = WorkingTree.open_containing(directory)[0].branch
5206
self.add_cleanup(b.lock_write().unlock)
4632
5207
return self._run(b, revision_id_list, revision)
4634
5209
def _run(self, b, revision_id_list, revision):
4635
5210
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5211
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4637
5212
if revision_id_list is not None:
4638
5213
b.repository.start_write_group()
4694
5269
_see_also = ['checkouts', 'unbind']
4695
5270
takes_args = ['location?']
5271
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5273
def run(self, location=None, directory=u'.'):
5274
b, relpath = Branch.open_containing(directory)
4700
5275
if location is None:
4702
5277
location = b.get_old_bound_location()
4703
5278
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5279
raise errors.BzrCommandError(gettext('No location supplied. '
5280
'This format does not remember old locations.'))
4707
5282
if location is None:
4708
5283
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5284
raise errors.BzrCommandError(gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5286
raise errors.BzrCommandError(gettext('No location supplied '
5287
'and no previous location known'))
4713
5288
b_other = Branch.open(location)
4715
5290
b.bind(b_other)
4716
5291
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5292
raise errors.BzrCommandError(gettext('These branches have diverged.'
5293
' Try merging, and then bind again.'))
4719
5294
if b.get_config().has_explicit_nickname():
4720
5295
b.nick = b_other.nick
4784
5360
b = control.open_branch()
4786
5362
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5363
self.add_cleanup(tree.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5365
self.add_cleanup(b.lock_write().unlock)
5366
return self._run(b, tree, dry_run, verbose, revision, force,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5369
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4795
5371
from bzrlib.log import log_formatter, show_log
4796
5372
from bzrlib.uncommit import uncommit
4827
5403
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5406
self.outf.write(gettext('Dry-run, pretending to remove'
5407
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5409
self.outf.write(gettext('The above revision(s) will be removed.\n'))
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5412
if not ui.ui_factory.confirm_action(
5413
gettext(u'Uncommit these revisions'),
5414
'bzrlib.builtins.uncommit',
5416
self.outf.write(gettext('Canceled\n'))
4840
5419
mutter('Uncommitting from {%s} to {%s}',
4841
5420
last_rev_id, rev_id)
4842
5421
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
5422
revno=revno, local=local, keep_tags=keep_tags)
5423
self.outf.write(gettext('You can restore the old tip by running:\n'
5424
' bzr pull . -r revid:%s\n') % last_rev_id)
4848
5427
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5428
__doc__ = """Break a dead lock.
5430
This command breaks a lock on a repository, branch, working directory or
4851
5433
CAUTION: Locks should only be broken when you are sure that the process
4852
5434
holding the lock has been stopped.
4936
5535
return host, port
4938
5537
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5538
protocol=None, client_timeout=None):
5539
from bzrlib import transport
4941
5540
if directory is None:
4942
5541
directory = os.getcwd()
4943
5542
if protocol is None:
4944
protocol = transport_server_registry.get()
5543
protocol = transport.transport_server_registry.get()
4945
5544
host, port = self.get_host_and_port(port)
4946
url = urlutils.local_path_to_url(directory)
5545
url = transport.location_to_url(directory)
4947
5546
if not allow_writes:
4948
5547
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5548
t = transport.get_transport_from_url(url)
5550
protocol(t, host, port, inet, client_timeout)
5551
except TypeError, e:
5552
# We use symbol_versioning.deprecated_in just so that people
5553
# grepping can find it here.
5554
# symbol_versioning.deprecated_in((2, 5, 0))
5555
symbol_versioning.warn(
5556
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5557
'Most likely it needs to be updated to support a'
5558
' "timeout" parameter (added in bzr 2.5.0)'
5559
% (e, protocol.__module__, protocol),
5561
protocol(t, host, port, inet)
4953
5564
class cmd_join(Command):
5359
5975
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5976
self.add_cleanup(branch.lock_write().unlock)
5363
5978
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5979
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5980
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5981
note(gettext('Deleted tag %s.') % tag_name)
5369
5984
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5985
raise errors.BzrCommandError(gettext(
5371
5986
"Tags can only be placed on a single revision, "
5373
5988
revision_id = revision[0].as_revision_id(branch)
5375
5990
revision_id = branch.last_revision()
5376
5991
if tag_name is None:
5377
5992
tag_name = branch.automatic_tag_name(revision_id)
5378
5993
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
if (not force) and branch.tags.has_tag(tag_name):
5994
raise errors.BzrCommandError(gettext(
5995
"Please specify a tag name."))
5997
existing_target = branch.tags.lookup_tag(tag_name)
5998
except errors.NoSuchTag:
5999
existing_target = None
6000
if not force and existing_target not in (None, revision_id):
5382
6001
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
6002
if existing_target == revision_id:
6003
note(gettext('Tag %s already exists for that revision.') % tag_name)
6005
branch.tags.set_tag(tag_name, revision_id)
6006
if existing_target is None:
6007
note(gettext('Created tag %s.') % tag_name)
6009
note(gettext('Updated tag %s.') % tag_name)
5387
6012
class cmd_tags(Command):
5393
6018
_see_also = ['tag']
5394
6019
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
6020
custom_help('directory',
6021
help='Branch whose tags should be displayed.'),
6022
RegistryOption('sort',
5401
6023
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
6024
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
6030
@display_command
6031
def run(self, directory='.', sort=None, show_ids=False, revision=None):
6032
from bzrlib.tag import tag_sort_methods
5416
6033
branch, relpath = Branch.open_containing(directory)
5418
6035
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
6039
self.add_cleanup(branch.lock_read().unlock)
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
5433
elif sort == 'time':
5435
for tag, revid in tags:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
6041
# Restrict to the specified range
6042
tags = self._tags_for_range(branch, revision)
6044
sort = tag_sort_methods.get()
5444
6046
if not show_ids:
5445
6047
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
6048
for index, (tag, revid) in enumerate(tags):
5457
6061
for tag, revspec in tags:
5458
6062
self.outf.write('%-20s %s\n' % (tag, revspec))
6064
def _tags_for_range(self, branch, revision):
6066
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6067
revid1, revid2 = rev1.rev_id, rev2.rev_id
6068
# _get_revision_range will always set revid2 if it's not specified.
6069
# If revid1 is None, it means we want to start from the branch
6070
# origin which is always a valid ancestor. If revid1 == revid2, the
6071
# ancestry check is useless.
6072
if revid1 and revid1 != revid2:
6073
# FIXME: We really want to use the same graph than
6074
# branch.iter_merge_sorted_revisions below, but this is not
6075
# easily available -- vila 2011-09-23
6076
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6077
# We don't want to output anything in this case...
6079
# only show revisions between revid1 and revid2 (inclusive)
6080
tagged_revids = branch.tags.get_reverse_tag_dict()
6082
for r in branch.iter_merge_sorted_revisions(
6083
start_revision_id=revid2, stop_revision_id=revid1,
6084
stop_rule='include'):
6085
revid_tags = tagged_revids.get(r[0], None)
6087
found.extend([(tag, r[0]) for tag in revid_tags])
5461
6091
class cmd_reconfigure(Command):
5462
6092
__doc__ = """Reconfigure the type of a bzr directory.
5476
6106
takes_args = ['location?']
5477
6107
takes_options = [
5478
6108
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6111
help='The relation between branch and tree.',
5482
6112
value_switches=True, enum_switch=False,
5483
6113
branch='Reconfigure to be an unbound branch with no working tree.',
5484
6114
tree='Reconfigure to be an unbound branch with a working tree.',
5485
6115
checkout='Reconfigure to be a bound branch with a working tree.',
5486
6116
lightweight_checkout='Reconfigure to be a lightweight'
5487
6117
' checkout (with no local history).',
6119
RegistryOption.from_kwargs(
6121
title='Repository type',
6122
help='Location fo the repository.',
6123
value_switches=True, enum_switch=False,
5488
6124
standalone='Reconfigure to be a standalone branch '
5489
6125
'(i.e. stop using shared repository).',
5490
6126
use_shared='Reconfigure to use a shared repository.',
6128
RegistryOption.from_kwargs(
6130
title='Trees in Repository',
6131
help='Whether new branches in the repository have trees.',
6132
value_switches=True, enum_switch=False,
5491
6133
with_trees='Reconfigure repository to create '
5492
6134
'working trees on branches by default.',
5493
6135
with_no_trees='Reconfigure repository to not create '
5520
6162
# At the moment you can use --stacked-on and a different
5521
6163
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
6165
if (tree_type is None and
6166
repository_type is None and
6167
repository_trees is None):
5524
6168
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6171
raise errors.BzrCommandError(gettext('No target configuration '
6173
reconfiguration = None
6174
if tree_type == 'branch':
5530
6175
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
6176
elif tree_type == 'tree':
5532
6177
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
6178
elif tree_type == 'checkout':
5534
6179
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
6180
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
6181
elif tree_type == 'lightweight-checkout':
5537
6182
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
6183
directory, bind_to)
5539
elif target_type == 'use-shared':
6185
reconfiguration.apply(force)
6186
reconfiguration = None
6187
if repository_type == 'use-shared':
5540
6188
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
6189
elif repository_type == 'standalone':
5542
6190
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
6192
reconfiguration.apply(force)
6193
reconfiguration = None
6194
if repository_trees == 'with-trees':
5544
6195
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6196
directory, True)
5546
elif target_type == 'with-no-trees':
6197
elif repository_trees == 'with-no-trees':
5547
6198
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6199
directory, False)
5549
reconfiguration.apply(force)
6201
reconfiguration.apply(force)
6202
reconfiguration = None
5552
6205
class cmd_switch(Command):
5584
6238
def run(self, to_location=None, force=False, create_branch=False,
6239
revision=None, directory=u'.'):
5586
6240
from bzrlib import switch
6241
tree_location = directory
5588
6242
revision = _get_one_revision('switch', revision)
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
6243
possible_transports = []
6244
control_dir = controldir.ControlDir.open_containing(tree_location,
6245
possible_transports=possible_transports)[0]
5590
6246
if to_location is None:
5591
6247
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
6248
raise errors.BzrCommandError(gettext('You must supply either a'
6249
' revision or a location'))
6250
to_location = tree_location
5596
branch = control_dir.open_branch()
6252
branch = control_dir.open_branch(
6253
possible_transports=possible_transports)
5597
6254
had_explicit_nick = branch.get_config().has_explicit_nickname()
5598
6255
except errors.NotBranchError:
5600
6257
had_explicit_nick = False
5601
6258
if create_branch:
5602
6259
if branch is None:
5603
raise errors.BzrCommandError('cannot create branch without'
5605
to_location = directory_service.directories.dereference(
5607
if '/' not in to_location and '\\' not in to_location:
5608
# This path is meant to be relative to the existing branch
5609
this_url = self._get_branch_location(control_dir)
5610
to_location = urlutils.join(this_url, '..', to_location)
6260
raise errors.BzrCommandError(
6261
gettext('cannot create branch without source branch'))
6262
to_location = lookup_new_sibling_branch(control_dir, to_location,
6263
possible_transports=possible_transports)
5611
6264
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
6265
possible_transports=possible_transports,
6266
source_branch=branch).open_branch()
5616
to_branch = Branch.open(to_location)
6269
to_branch = Branch.open(to_location,
6270
possible_transports=possible_transports)
5617
6271
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
6272
to_branch = open_sibling_branch(control_dir, to_location,
6273
possible_transports=possible_transports)
5621
6274
if revision is not None:
5622
6275
revision = revision.as_revision_id(to_branch)
5623
6276
switch.switch(control_dir, to_branch, force, revision_id=revision)
5624
6277
if had_explicit_nick:
5625
6278
branch = control_dir.open_branch() #get the new branch!
5626
6279
branch.nick = to_branch.nick
5627
note('Switched to branch: %s',
6280
note(gettext('Switched to branch: %s'),
5628
6281
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5630
def _get_branch_location(self, control_dir):
5631
"""Return location of branch for this control dir."""
5633
this_branch = control_dir.open_branch()
5634
# This may be a heavy checkout, where we want the master branch
5635
master_location = this_branch.get_bound_location()
5636
if master_location is not None:
5637
return master_location
5638
# If not, use a local sibling
5639
return this_branch.base
5640
except errors.NotBranchError:
5641
format = control_dir.find_branch_format()
5642
if getattr(format, 'get_reference', None) is not None:
5643
return format.get_reference(control_dir)
5645
return control_dir.root_transport.base
5648
6285
class cmd_view(Command):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6372
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6374
current_view, view_dict = tree.views.get_view_info()
5737
6375
if name is None:
5738
6376
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6379
raise errors.BzrCommandError(gettext(
6380
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6382
raise errors.BzrCommandError(gettext(
6383
"Both --delete and --switch specified"))
5747
6385
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6386
self.outf.write(gettext("Deleted all views.\n"))
5749
6387
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6388
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6390
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6391
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6394
raise errors.BzrCommandError(gettext(
6395
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6397
raise errors.BzrCommandError(gettext(
6398
"Both --switch and --all specified"))
5761
6399
elif switch == 'off':
5762
6400
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6401
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6402
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6403
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6405
tree.views.set_view_info(switch, view_dict)
5768
6406
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6407
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6410
self.outf.write(gettext('Views defined:\n'))
5773
6411
for view in sorted(view_dict):
5774
6412
if view == current_view:
5778
6416
view_str = views.view_display_str(view_dict[view])
5779
6417
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6419
self.outf.write(gettext('No views defined.\n'))
5782
6420
elif file_list:
5783
6421
if name is None:
5784
6422
# No name given and no current view set
5786
6424
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6425
raise errors.BzrCommandError(gettext(
6426
"Cannot change the 'off' pseudo view"))
5789
6427
tree.views.set_view(name, sorted(file_list))
5790
6428
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6429
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6431
# list the files
5794
6432
if name is None:
5795
6433
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6434
self.outf.write(gettext('No current view.\n'))
5798
6436
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6437
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6440
class cmd_hooks(Command):
5836
6474
takes_args = ["location?"]
6476
takes_options = ['directory',
6477
Option('force', help='Remove branch even if it is the active branch.')]
5838
6479
aliases = ["rmbranch"]
5840
def run(self, location=None):
5841
if location is None:
5843
branch = Branch.open_containing(location)[0]
5844
branch.bzrdir.destroy_branch()
6481
def run(self, directory=None, location=None, force=False):
6482
br = open_nearby_branch(near=directory, location=location)
6483
if not force and br.bzrdir.has_workingtree():
6485
active_branch = br.bzrdir.open_branch(name="")
6486
except errors.NotBranchError:
6487
active_branch = None
6488
if (active_branch is not None and
6489
br.control_url == active_branch.control_url):
6490
raise errors.BzrCommandError(
6491
gettext("Branch is active. Use --force to remove it."))
6492
br.bzrdir.destroy_branch(br.name)
5847
6495
class cmd_shelve(Command):
5848
6496
__doc__ = """Temporarily set aside some changes from the current tree.
5883
6544
Option('destroy',
5884
6545
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6547
_see_also = ['unshelve', 'configuration']
5888
6549
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6550
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6552
return self.run_for_list(directory=directory)
5892
6553
from bzrlib.shelf_ui import Shelver
5893
6554
if writer is None:
5894
6555
writer = bzrlib.option.diff_writer_registry.get()
5896
6557
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6558
file_list, message, destroy=destroy, directory=directory)
6032
6696
self.outf.write('%s %s\n' % (path, location))
6699
class cmd_export_pot(Command):
6700
__doc__ = """Export command helps and error messages in po format."""
6703
takes_options = [Option('plugin',
6704
help='Export help text from named command '\
6705
'(defaults to all built in commands).',
6707
Option('include-duplicates',
6708
help='Output multiple copies of the same msgid '
6709
'string if it appears more than once.'),
6712
def run(self, plugin=None, include_duplicates=False):
6713
from bzrlib.export_pot import export_pot
6714
export_pot(self.outf, plugin, include_duplicates)
6035
6717
def _register_lazy_builtins():
6036
6718
# register lazy builtins from other modules; called at startup and should
6037
6719
# be only called once.
6038
6720
for (name, aliases, module_name) in [
6039
6721
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6722
('cmd_config', [], 'bzrlib.config'),
6040
6723
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6724
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6725
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6726
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6727
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6728
('cmd_verify_signatures', [],
6729
'bzrlib.commit_signature_commands'),
6730
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6732
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
