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):
87
"""Return location of branch for this control dir."""
89
this_branch = control_dir.open_branch()
90
# This may be a heavy checkout, where we want the master branch
91
master_location = this_branch.get_bound_location()
92
if master_location is not None:
93
return master_location
94
# If not, use a local sibling
95
return this_branch.base
96
except errors.NotBranchError:
97
format = control_dir.find_branch_format()
98
if getattr(format, 'get_reference', None) is not None:
99
return format.get_reference(control_dir)
101
return control_dir.root_transport.base
104
def lookup_new_sibling_branch(control_dir, location):
105
"""Lookup the location for a new sibling branch.
107
:param control_dir: Control directory relative to which to look up
109
:param location: Name of the new branch
110
:return: Full location to the new branch
112
location = directory_service.directories.dereference(location)
113
if '/' not in location and '\\' not in location:
114
# This path is meant to be relative to the existing branch
115
this_url = _get_branch_location(control_dir)
116
# Perhaps the target control dir supports colocated branches?
118
root = controldir.ControlDir.open(this_url,
119
possible_transports=[control_dir.user_transport])
120
except errors.NotBranchError:
123
colocated = root._format.colocated_branches
126
return urlutils.join_segment_parameters(this_url,
127
{"branch": urlutils.escape(location)})
129
return urlutils.join(this_url, '..', urlutils.escape(location))
133
def lookup_sibling_branch(control_dir, location):
134
"""Lookup sibling branch.
136
:param control_dir: Control directory relative to which to lookup the
138
:param location: Location to look up
139
:return: branch to open
142
# Perhaps it's a colocated branch?
143
return control_dir.open_branch(location)
144
except (errors.NotBranchError, errors.NoColocatedBranchSupport):
146
return Branch.open(location)
147
except errors.NotBranchError:
148
this_url = _get_branch_location(control_dir)
151
this_url, '..', urlutils.escape(location)))
154
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
155
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]))
157
return internal_tree_files(file_list, default_branch, canonicalize,
88
161
def tree_files_for_add(file_list):
172
248
: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)
250
return WorkingTree.open_containing_paths(
251
file_list, default_directory='.',
223
256
def _get_view_info_for_change_reporter(tree):
353
404
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
407
def run(self, revision_id=None, revision=None, directory=u'.'):
357
408
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')
409
raise errors.BzrCommandError(gettext('You can only supply one of'
410
' revision_id or --revision'))
360
411
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
412
raise errors.BzrCommandError(gettext('You must supply either'
413
' --revision or a revision_id'))
415
b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
365
417
revisions = b.repository.revisions
366
418
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
419
raise errors.BzrCommandError(gettext('Repository %r does not support '
420
'access to raw revision texts'))
370
422
b.repository.lock_read()
491
546
location_list=['.']
493
548
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
549
d = controldir.ControlDir.open(location)
497
552
working = d.open_workingtree()
498
553
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
554
raise errors.BzrCommandError(gettext("No working tree to remove"))
500
555
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
556
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
557
" of a remote path"))
504
559
if (working.has_changes()):
505
560
raise errors.UncommittedChanges(working)
561
if working.get_shelf_manager().last_shelf() is not None:
562
raise errors.ShelvedChanges(working)
507
564
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
565
raise errors.BzrCommandError(gettext("You cannot remove the working tree"
566
" from a lightweight checkout"))
511
568
d.destroy_workingtree()
571
class cmd_repair_workingtree(Command):
572
__doc__ = """Reset the working tree state file.
574
This is not meant to be used normally, but more as a way to recover from
575
filesystem corruption, etc. This rebuilds the working inventory back to a
576
'known good' state. Any new modifications (adding a file, renaming, etc)
577
will be lost, though modified files will still be detected as such.
579
Most users will want something more like "bzr revert" or "bzr update"
580
unless the state file has become corrupted.
582
By default this attempts to recover the current state by looking at the
583
headers of the state file. If the state file is too corrupted to even do
584
that, you can supply --revision to force the state of the tree.
587
takes_options = ['revision', 'directory',
589
help='Reset the tree even if it doesn\'t appear to be'
594
def run(self, revision=None, directory='.', force=False):
595
tree, _ = WorkingTree.open_containing(directory)
596
self.add_cleanup(tree.lock_tree_write().unlock)
600
except errors.BzrError:
601
pass # There seems to be a real error here, so we'll reset
604
raise errors.BzrCommandError(gettext(
605
'The tree does not appear to be corrupt. You probably'
606
' want "bzr revert" instead. Use "--force" if you are'
607
' sure you want to reset the working tree.'))
611
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
613
tree.reset_state(revision_ids)
614
except errors.BzrError, e:
615
if revision_ids is None:
616
extra = (gettext(', the header appears corrupt, try passing -r -1'
617
' to set the state to the last commit'))
620
raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
514
623
class cmd_revno(Command):
515
624
__doc__ = """Show current revision number.
520
629
_see_also = ['info']
521
630
takes_args = ['location?']
522
631
takes_options = [
523
Option('tree', help='Show revno of working tree'),
632
Option('tree', help='Show revno of working tree.'),
527
def run(self, tree=False, location=u'.'):
637
def run(self, tree=False, location=u'.', revision=None):
638
if revision is not None and tree:
639
raise errors.BzrCommandError(gettext("--tree and --revision can "
640
"not be used together"))
530
644
wt = WorkingTree.open_containing(location)[0]
645
self.add_cleanup(wt.lock_read().unlock)
532
646
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
647
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
649
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
651
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
652
self.add_cleanup(b.lock_read().unlock)
654
if len(revision) != 1:
655
raise errors.BzrCommandError(gettext(
656
"Tags can only be placed on a single revision, "
658
revid = revision[0].as_revision_id(b)
660
revid = b.last_revision()
662
revno_t = b.revision_id_to_dotted_revno(revid)
663
except errors.NoSuchRevision:
665
revno = ".".join(str(n) for n in revno_t)
546
666
self.cleanup_now()
547
self.outf.write(str(revno) + '\n')
667
self.outf.write(revno + '\n')
550
670
class cmd_revision_info(Command):
704
826
takes_args = ['dir+']
830
help='No error if existing, make parent directories as needed.',
705
834
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)
837
def add_file_with_parents(cls, wt, relpath):
838
if wt.path2id(relpath) is not None:
840
cls.add_file_with_parents(wt, osutils.dirname(relpath))
844
def add_file_single(cls, wt, relpath):
847
def run(self, dir_list, parents=False):
849
add_file = self.add_file_with_parents
851
add_file = self.add_file_single
853
wt, relpath = WorkingTree.open_containing(dir)
858
if e.errno != errno.EEXIST:
717
raise errors.NotVersionedError(path=base)
862
add_file(wt, relpath)
864
self.outf.write(gettext('added %s\n') % dir)
720
867
class cmd_relpath(Command):
757
904
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
758
905
if kind and kind not in ['file', 'directory', 'symlink']:
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
906
raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
761
908
revision = _get_one_revision('inventory', revision)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
909
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
910
self.add_cleanup(work_tree.lock_read().unlock)
765
911
if revision is not None:
766
912
tree = revision.as_tree(work_tree.branch)
768
914
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
915
self.add_cleanup(tree.lock_read().unlock)
920
self.add_cleanup(tree.lock_read().unlock)
775
921
if file_list is not None:
776
922
file_ids = tree.paths2ids(file_list, trees=extra_trees,
777
923
require_versioned=True)
778
924
# find_ids_across_trees may include some paths that don't
779
925
# exist in 'tree'.
780
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
781
for file_id in file_ids if file_id in tree)
926
entries = tree.iter_entries_by_dir(specific_file_ids=file_ids)
783
entries = tree.inventory.entries()
928
entries = tree.iter_entries_by_dir()
786
for path, entry in entries:
930
for path, entry in sorted(entries):
787
931
if kind and kind != entry.kind:
790
936
self.outf.write('%-50s %s\n' % (path, entry.file_id))
828
974
return self.run_auto(names_list, after, dry_run)
830
raise errors.BzrCommandError('--dry-run requires --auto.')
976
raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
831
977
if names_list is None:
833
979
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)
980
raise errors.BzrCommandError(gettext("missing file argument"))
981
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
982
for file_name in rel_names[0:-1]:
984
raise errors.BzrCommandError(gettext("can not move root of branch"))
985
self.add_cleanup(tree.lock_tree_write().unlock)
838
986
self._run(tree, names_list, rel_names, after)
840
988
def run_auto(self, names_list, after, dry_run):
841
989
if names_list is not None and len(names_list) > 1:
842
raise errors.BzrCommandError('Only one path may be specified to'
990
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)
993
raise errors.BzrCommandError(gettext('--after cannot be specified with'
995
work_tree, file_list = WorkingTree.open_containing_paths(
996
names_list, default_directory='.')
997
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
998
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
1000
def _run(self, tree, names_list, rel_names, after):
960
1111
takes_options = ['remember', 'overwrite', 'revision',
961
1112
custom_help('verbose',
962
1113
help='Show logs of pulled revisions.'),
1114
custom_help('directory',
964
1115
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
1116
'rather than the one containing the working directory.'),
970
1118
help="Perform a local pull in a bound "
971
1119
"branch. Local pulls are not applied to "
972
1120
"the master branch."
1123
help="Show base revision text in conflicts.")
975
1125
takes_args = ['location?']
976
1126
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1128
def run(self, location=None, remember=None, overwrite=False,
979
1129
revision=None, verbose=False,
980
directory=None, local=False):
1130
directory=None, local=False,
981
1132
# FIXME: too much stuff is in the command class
982
1133
revision_id = None
983
1134
mergeable = None
1110
1267
Option('strict',
1111
1268
help='Refuse to push if there are uncommitted changes in'
1112
1269
' the working tree, --no-strict disables the check.'),
1271
help="Don't populate the working tree, even for protocols"
1272
" that support it."),
1114
1274
takes_args = ['location?']
1115
1275
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1277
def run(self, location=None, remember=None, overwrite=False,
1118
1278
create_prefix=False, verbose=False, revision=None,
1119
1279
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1280
stacked=False, strict=None, no_tree=False):
1121
1281
from bzrlib.push import _show_push_branch
1123
1283
if directory is None:
1124
1284
directory = '.'
1125
1285
# Get the source branch
1126
1286
(tree, br_from,
1127
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1287
_unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
1128
1288
# Get the tip's revision_id
1129
1289
revision = _get_one_revision('push', revision)
1130
1290
if revision is not None:
1151
1311
# error by the feedback given to them. RBC 20080227.
1152
1312
stacked_on = parent_url
1153
1313
if not stacked_on:
1154
raise errors.BzrCommandError(
1155
"Could not determine branch to refer to.")
1314
raise errors.BzrCommandError(gettext(
1315
"Could not determine branch to refer to."))
1157
1317
# Get the destination location
1158
1318
if location is None:
1159
1319
stored_loc = br_from.get_push_location()
1160
1320
if stored_loc is None:
1161
raise errors.BzrCommandError(
1162
"No push location known or specified.")
1321
parent_loc = br_from.get_parent()
1323
raise errors.BzrCommandError(gettext(
1324
"No push location known or specified. To push to the "
1325
"parent branch (at %s), use 'bzr push :parent'." %
1326
urlutils.unescape_for_display(parent_loc,
1327
self.outf.encoding)))
1329
raise errors.BzrCommandError(gettext(
1330
"No push location known or specified."))
1164
1332
display_url = urlutils.unescape_for_display(stored_loc,
1165
1333
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1334
note(gettext("Using saved push location: %s") % display_url)
1167
1335
location = stored_loc
1169
1337
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1338
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1339
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1340
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1343
class cmd_branch(Command):
1214
1386
def run(self, from_location, to_location=None, revision=None,
1215
1387
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1388
use_existing_dir=False, switch=False, bind=False,
1217
1390
from bzrlib import switch as _mod_switch
1218
1391
from bzrlib.tag import _merge_tags_if_possible
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1392
if self.invoked_as in ['get', 'clone']:
1393
ui.ui_factory.show_user_warning(
1394
'deprecated_command',
1395
deprecated_name=self.invoked_as,
1396
recommended_name='branch',
1397
deprecated_in_version='2.4')
1398
accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
1400
if not (hardlink or files_from):
1401
# accelerator_tree is usually slower because you have to read N
1402
# files (no readahead, lots of seeks, etc), but allow the user to
1403
# explicitly request it
1404
accelerator_tree = None
1405
if files_from is not None and files_from != from_location:
1406
accelerator_tree = WorkingTree.open(files_from)
1221
1407
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1408
self.add_cleanup(br_from.lock_read().unlock)
1224
1409
if revision is not None:
1225
1410
revision_id = revision.as_revision_id(br_from)
1230
1415
revision_id = br_from.last_revision()
1231
1416
if to_location is None:
1232
to_location = urlutils.derive_to_location(from_location)
1417
to_location = getattr(br_from, "name", None)
1418
if to_location is None:
1419
to_location = urlutils.derive_to_location(from_location)
1233
1420
to_transport = transport.get_transport(to_location)
1235
1422
to_transport.mkdir('.')
1236
1423
except errors.FileExists:
1237
if not use_existing_dir:
1238
raise errors.BzrCommandError('Target directory "%s" '
1239
'already exists.' % to_location)
1425
to_dir = controldir.ControlDir.open_from_transport(
1427
except errors.NotBranchError:
1428
if not use_existing_dir:
1429
raise errors.BzrCommandError(gettext('Target directory "%s" '
1430
'already exists.') % to_location)
1242
bzrdir.BzrDir.open_from_transport(to_transport)
1435
to_dir.open_branch()
1243
1436
except errors.NotBranchError:
1246
1439
raise errors.AlreadyBranchError(to_location)
1247
1440
except errors.NoSuchFile:
1248
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1441
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)
1447
# preserve whatever source format we have.
1448
to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1449
possible_transports=[to_transport],
1450
accelerator_tree=accelerator_tree,
1451
hardlink=hardlink, stacked=stacked,
1452
force_new_repo=standalone,
1453
create_tree_if_local=not no_tree,
1454
source_branch=br_from)
1455
branch = to_dir.open_branch(
1456
possible_transports=[
1457
br_from.bzrdir.root_transport, to_transport])
1458
except errors.NoSuchRevision:
1459
to_transport.delete_tree('.')
1460
msg = gettext("The branch {0} has no revision {1}.").format(
1461
from_location, revision)
1462
raise errors.BzrCommandError(msg)
1465
to_repo = to_dir.open_repository()
1466
except errors.NoRepositoryPresent:
1467
to_repo = to_dir.create_repository()
1468
to_repo.fetch(br_from.repository, revision_id=revision_id)
1469
branch = br_from.sprout(to_dir, revision_id=revision_id)
1265
1470
_merge_tags_if_possible(br_from, branch)
1266
1471
# If the source branch is stacked, the new branch may
1267
1472
# be stacked whether we asked for that explicitly or not.
1268
1473
# We therefore need a try/except here and not just 'if stacked:'
1270
note('Created new stacked branch referring to %s.' %
1475
note(gettext('Created new stacked branch referring to %s.') %
1271
1476
branch.get_stacked_on_url())
1272
1477
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
1478
errors.UnstackableRepositoryFormat), e:
1274
note('Branched %d revision(s).' % branch.revno())
1479
note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1276
1481
# Bind to the parent
1277
1482
parent_branch = Branch.open(from_location)
1278
1483
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1484
note(gettext('New branch bound to %s') % from_location)
1281
1486
# Switch to the new branch
1282
1487
wt, _ = WorkingTree.open_containing('.')
1283
1488
_mod_switch.switch(wt.bzrdir, branch)
1284
note('Switched to branch: %s',
1489
note(gettext('Switched to branch: %s'),
1285
1490
urlutils.unescape_for_display(branch.base, 'utf-8'))
1493
class cmd_branches(Command):
1494
__doc__ = """List the branches available at the current location.
1496
This command will print the names of all the branches at the current
1500
takes_args = ['location?']
1502
Option('recursive', short_name='R',
1503
help='Recursively scan for branches rather than '
1504
'just looking in the specified location.')]
1506
def run(self, location=".", recursive=False):
1508
t = transport.get_transport(location)
1509
if not t.listable():
1510
raise errors.BzrCommandError(
1511
"Can't scan this type of location.")
1512
for b in controldir.ControlDir.find_branches(t):
1513
self.outf.write("%s\n" % urlutils.unescape_for_display(
1514
urlutils.relative_url(t.base, b.base),
1515
self.outf.encoding).rstrip("/"))
1517
dir = controldir.ControlDir.open_containing(location)[0]
1519
active_branch = dir.open_branch(name="")
1520
except errors.NotBranchError:
1521
active_branch = None
1522
branches = dir.get_branches()
1524
for name, branch in branches.iteritems():
1527
active = (active_branch is not None and
1528
active_branch.base == branch.base)
1529
names[name] = active
1530
# Only mention the current branch explicitly if it's not
1531
# one of the colocated branches
1532
if not any(names.values()) and active_branch is not None:
1533
self.outf.write("* %s\n" % gettext("(default)"))
1534
for name in sorted(names.keys()):
1535
active = names[name]
1540
self.outf.write("%s %s\n" % (
1541
prefix, name.encode(self.outf.encoding)))
1288
1544
class cmd_checkout(Command):
1289
1545
__doc__ = """Create a new checkout of an existing branch.
1389
1648
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
1649
__doc__ = """Update a working tree to a new revision.
1651
This will perform a merge of the destination revision (the tip of the
1652
branch, or the specified revision) into the working tree, and then make
1653
that revision the basis revision for the working tree.
1655
You can use this to visit an older revision, or to update a working tree
1656
that is out of date from its branch.
1658
If there are any uncommitted changes in the tree, they will be carried
1659
across and remain as uncommitted changes after the update. To discard
1660
these changes, use 'bzr revert'. The uncommitted changes may conflict
1661
with the changes brought in by the change in basis revision.
1663
If the tree's branch is bound to a master branch, bzr will also update
1400
1664
the branch from the master.
1666
You cannot update just a single file or directory, because each Bazaar
1667
working tree has just a single basis revision. If you want to restore a
1668
file that has been removed locally, use 'bzr revert' instead of 'bzr
1669
update'. If you want to restore a file to its state in a previous
1670
revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1671
out the old content of that file to a new location.
1673
The 'dir' argument, if given, must be the location of the root of a
1674
working tree to update. By default, the working tree that contains the
1675
current working directory is used.
1403
1678
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1679
takes_args = ['dir?']
1405
takes_options = ['revision']
1680
takes_options = ['revision',
1682
help="Show base revision text in conflicts."),
1406
1684
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1686
def run(self, dir=None, revision=None, show_base=None):
1409
1687
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]
1688
raise errors.BzrCommandError(gettext(
1689
"bzr update --revision takes exactly one revision"))
1691
tree = WorkingTree.open_containing('.')[0]
1693
tree, relpath = WorkingTree.open_containing(dir)
1696
raise errors.BzrCommandError(gettext(
1697
"bzr update can only update a whole tree, "
1698
"not a file or subdirectory"))
1413
1699
branch = tree.branch
1414
1700
possible_transports = []
1415
1701
master = branch.get_master_branch(
1416
1702
possible_transports=possible_transports)
1417
1703
if master is not None:
1419
1704
branch_location = master.base
1707
branch_location = tree.branch.base
1421
1708
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1709
self.add_cleanup(tree.unlock)
1424
1710
# get rid of the final '/' and be ready for display
1425
1711
branch_location = urlutils.unescape_for_display(
1451
1737
change_reporter,
1452
1738
possible_transports=possible_transports,
1453
1739
revision=revision_id,
1741
show_base=show_base)
1455
1742
except errors.NoSuchRevision, e:
1456
raise errors.BzrCommandError(
1743
raise errors.BzrCommandError(gettext(
1457
1744
"branch has no revision %s\n"
1458
1745
"bzr update --revision only works"
1459
" for a revision in the branch history"
1746
" for a revision in the branch history")
1460
1747
% (e.revision))
1461
1748
revno = tree.branch.revision_id_to_dotted_revno(
1462
1749
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1750
note(gettext('Updated to revision {0} of branch {1}').format(
1751
'.'.join(map(str, revno)), branch_location))
1465
1752
parent_ids = tree.get_parent_ids()
1466
1753
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'.")
1754
note(gettext('Your local commits will now show as pending merges with '
1755
"'bzr status', and can be committed with 'bzr commit'."))
1469
1756
if conflicts != 0:
1530
1818
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1819
'The file deletion mode to be used.',
1532
1820
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1821
safe='Backup changed files (default).',
1535
1822
keep='Delete from bzr but leave the working copy.',
1823
no_backup='Don\'t backup changed files.',
1536
1824
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1825
'recovered and even if they are non-empty directories. '
1826
'(deprecated, use no-backup)')]
1538
1827
aliases = ['rm', 'del']
1539
1828
encoding_type = 'replace'
1541
1830
def run(self, file_list, verbose=False, new=False,
1542
1831
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1832
if file_deletion_strategy == 'force':
1833
note(gettext("(The --force option is deprecated, rather use --no-backup "
1835
file_deletion_strategy = 'no-backup'
1837
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1839
if file_list is not None:
1546
1840
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1842
self.add_cleanup(tree.lock_write().unlock)
1550
1843
# Heuristics should probably all move into tree.remove_smart or
1742
2051
to_transport.ensure_base()
1743
2052
except errors.NoSuchFile:
1744
2053
if not create_prefix:
1745
raise errors.BzrCommandError("Parent directory of %s"
2054
raise errors.BzrCommandError(gettext("Parent directory of %s"
1746
2055
" does not exist."
1747
2056
"\nYou may supply --create-prefix to create all"
1748
" leading parent directories."
2057
" leading parent directories.")
1750
2059
to_transport.create_prefix()
1753
a_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
2062
a_bzrdir = controldir.ControlDir.open_from_transport(to_transport)
1754
2063
except errors.NotBranchError:
1755
2064
# really a NotBzrDir error...
1756
create_branch = bzrdir.BzrDir.create_branch_convenience
2065
create_branch = controldir.ControlDir.create_branch_convenience
2067
force_new_tree = False
2069
force_new_tree = None
1757
2070
branch = create_branch(to_transport.base, format=format,
1758
possible_transports=[to_transport])
2071
possible_transports=[to_transport],
2072
force_new_tree=force_new_tree)
1759
2073
a_bzrdir = branch.bzrdir
1761
2075
from bzrlib.transport.local import LocalTransport
1837
2153
def run(self, location, format=None, no_trees=False):
1838
2154
if format is None:
1839
format = bzrdir.format_registry.make_bzrdir('default')
2155
format = controldir.format_registry.make_bzrdir('default')
1841
2157
if location is None:
1844
2160
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)
2162
(repo, newdir, require_stacking, repository_policy) = (
2163
format.initialize_on_transport_ex(to_transport,
2164
create_prefix=True, make_working_trees=not no_trees,
2165
shared_repo=True, force_new_repo=True,
2166
use_existing_dir=True,
2167
repo_format_name=format.repository_format.get_format_string()))
1850
2168
if not is_quiet():
1851
2169
from bzrlib.info import show_bzrdir_info
1852
show_bzrdir_info(repo.bzrdir, verbose=0, outfile=self.outf)
2170
show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1855
2173
class cmd_diff(Command):
1969
2304
elif ':' in prefix:
1970
2305
old_label, new_label = prefix.split(":")
1972
raise errors.BzrCommandError(
2307
raise errors.BzrCommandError(gettext(
1973
2308
'--prefix expects two values separated by a colon'
1974
' (eg "old/:new/")')
2309
' (eg "old/:new/")'))
1976
2311
if revision and len(revision) > 2:
1977
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
' one or two revision specifiers')
2312
raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2313
' one or two revision specifiers'))
1980
2315
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
2316
raise errors.BzrCommandError(gettext(
2317
'{0} and {1} are mutually exclusive').format(
2318
'--using', '--format'))
1984
2320
(old_tree, new_tree,
1985
2321
old_branch, new_branch,
1986
2322
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2323
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2324
# GNU diff on Windows uses ANSI encoding for filenames
2325
path_encoding = osutils.get_diff_header_encoding()
1988
2326
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2327
specific_files=specific_files,
1990
2328
external_diff_options=diff_options,
1991
2329
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2330
extra_trees=extra_trees,
2331
path_encoding=path_encoding,
1993
2333
format_cls=format)
2053
2389
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2390
takes_options = ['directory', 'null']
2060
2392
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2393
def run(self, null=False, directory=u'.'):
2394
wt = WorkingTree.open_containing(directory)[0]
2395
self.add_cleanup(wt.lock_read().unlock)
2065
2396
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2068
basis_inv = basis.inventory
2071
if file_id in basis_inv:
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2397
self.add_cleanup(basis.lock_read().unlock)
2398
root_id = wt.get_root_id()
2399
for file_id in wt.all_file_ids():
2400
if basis.has_id(file_id):
2402
if root_id == file_id:
2404
path = wt.id2path(file_id)
2405
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2408
self.outf.write(path + '\0')
2297
2634
Option('show-diff',
2298
2635
short_name='p',
2299
2636
help='Show changes made in each revision as a patch.'),
2300
Option('include-merges',
2637
Option('include-merged',
2301
2638
help='Show merged revisions like --levels 0 does.'),
2639
Option('include-merges', hidden=True,
2640
help='Historical alias for --include-merged.'),
2641
Option('omit-merges',
2642
help='Do not report commits with more than one parent.'),
2302
2643
Option('exclude-common-ancestry',
2303
2644
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2645
' of both ancestries (require -rX..Y).'
2647
Option('signatures',
2648
help='Show digital signature validity.'),
2651
help='Show revisions whose properties match this '
2654
ListOption('match-message',
2655
help='Show revisions whose message matches this '
2658
ListOption('match-committer',
2659
help='Show revisions whose committer matches this '
2662
ListOption('match-author',
2663
help='Show revisions whose authors match this '
2666
ListOption('match-bugs',
2667
help='Show revisions whose bugs match this '
2307
2671
encoding_type = 'replace'
2327
2700
_get_info_for_log_files,
2329
2702
direction = (forward and 'forward') or 'reverse'
2703
if symbol_versioning.deprecated_passed(include_merges):
2704
ui.ui_factory.show_user_warning(
2705
'deprecated_command_option',
2706
deprecated_name='--include-merges',
2707
recommended_name='--include-merged',
2708
deprecated_in_version='2.5',
2709
command=self.invoked_as)
2710
if include_merged is None:
2711
include_merged = include_merges
2713
raise errors.BzrCommandError(gettext(
2714
'{0} and {1} are mutually exclusive').format(
2715
'--include-merges', '--include-merged'))
2716
if include_merged is None:
2717
include_merged = False
2330
2718
if (exclude_common_ancestry
2331
2719
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2720
raise errors.BzrCommandError(gettext(
2721
'--exclude-common-ancestry requires -r with two revisions'))
2335
2723
if levels is None:
2338
raise errors.BzrCommandError(
2339
'--levels and --include-merges are mutually exclusive')
2726
raise errors.BzrCommandError(gettext(
2727
'{0} and {1} are mutually exclusive').format(
2728
'--levels', '--include-merged'))
2341
2730
if change is not None:
2342
2731
if len(change) > 1:
2343
2732
raise errors.RangeInChangeOption()
2344
2733
if revision is not None:
2345
raise errors.BzrCommandError(
2346
'--revision and --change are mutually exclusive')
2734
raise errors.BzrCommandError(gettext(
2735
'{0} and {1} are mutually exclusive').format(
2736
'--revision', '--change'))
2348
2738
revision = change
2528
2936
help='Recurse into subdirectories.'),
2529
2937
Option('from-root',
2530
2938
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2939
Option('unknown', short_name='u',
2940
help='Print unknown files.'),
2532
2941
Option('versioned', help='Print versioned files.',
2533
2942
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.'),
2943
Option('ignored', short_name='i',
2944
help='Print ignored files.'),
2945
Option('kind', short_name='k',
2539
2946
help='List entries of a particular kind: file, directory, symlink.',
2543
2952
@display_command
2544
2953
def run(self, revision=None, verbose=False,
2545
2954
recursive=False, from_root=False,
2546
2955
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2956
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2958
if kind and kind not in ('file', 'directory', 'symlink'):
2550
raise errors.BzrCommandError('invalid kind specified')
2959
raise errors.BzrCommandError(gettext('invalid kind specified'))
2552
2961
if verbose and null:
2553
raise errors.BzrCommandError('Cannot set both --verbose and --null')
2962
raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
2554
2963
all = not (unknown or versioned or ignored)
2556
2965
selection = {'I':ignored, '?':unknown, 'V':versioned}
2725
3144
self.outf.write("%s\n" % pattern)
2727
3146
if not name_pattern_list:
2728
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
3147
raise errors.BzrCommandError(gettext("ignore requires at least one "
3148
"NAME_PATTERN or --default-rules."))
2730
3149
name_pattern_list = [globbing.normalize_pattern(p)
2731
3150
for p in name_pattern_list]
3152
bad_patterns_count = 0
3153
for p in name_pattern_list:
3154
if not globbing.Globster.is_pattern_valid(p):
3155
bad_patterns_count += 1
3156
bad_patterns += ('\n %s' % p)
3158
msg = (ngettext('Invalid ignore pattern found. %s',
3159
'Invalid ignore patterns found. %s',
3160
bad_patterns_count) % bad_patterns)
3161
ui.ui_factory.show_error(msg)
3162
raise errors.InvalidPattern('')
2732
3163
for name_pattern in name_pattern_list:
2733
3164
if (name_pattern[0] == '/' or
2734
3165
(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'.')
3166
raise errors.BzrCommandError(gettext(
3167
"NAME_PATTERN should not be an absolute path"))
3168
tree, relpath = WorkingTree.open_containing(directory)
2738
3169
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
3170
ignored = globbing.Globster(name_pattern_list)
3172
self.add_cleanup(tree.lock_read().unlock)
2742
3173
for entry in tree.list_files():
2744
3175
if id is not None:
2745
3176
filename = entry[0]
2746
3177
if ignored.match(filename):
2747
3178
matches.append(filename)
2749
3179
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
3180
self.outf.write(gettext("Warning: the following files are version "
3181
"controlled and match your ignore pattern:\n%s"
2752
3182
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
3183
" unless you 'bzr remove' them.\n") % ("\n".join(matches),))
2756
3186
class cmd_ignored(Command):
2842
3274
Option('per-file-timestamps',
2843
3275
help='Set modification time of files to that of the last '
2844
3276
'revision in which it was changed.'),
3277
Option('uncommitted',
3278
help='Export the working tree contents rather than that of the '
2846
3281
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
3282
root=None, filters=False, per_file_timestamps=False, uncommitted=False,
2848
3284
from bzrlib.export import export
2850
3286
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
3287
branch_or_subdir = directory
3289
(tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3291
if tree is not None:
3292
self.add_cleanup(tree.lock_read().unlock)
3296
raise errors.BzrCommandError(
3297
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)
3300
export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
3302
export(export_tree, dest, format, root, subdir, filtered=filters,
2861
3303
per_file_timestamps=per_file_timestamps)
2862
3304
except errors.NoSuchExportFormat, e:
2863
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
3305
raise errors.BzrCommandError(
3306
gettext('Unsupported export format: %s') % e.format)
2866
3309
class cmd_cat(Command):
2900
3342
if tree is None:
2901
3343
tree = b.basis_tree()
2902
3344
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
3345
self.add_cleanup(rev_tree.lock_read().unlock)
2906
3347
old_file_id = rev_tree.path2id(relpath)
3349
# TODO: Split out this code to something that generically finds the
3350
# best id for a path across one or more trees; it's like
3351
# find_ids_across_trees but restricted to find just one. -- mbp
2908
3353
if name_from_revision:
2909
3354
# Try in revision if requested
2910
3355
if old_file_id is None:
2911
raise errors.BzrCommandError(
2912
"%r is not present in revision %s" % (
3356
raise errors.BzrCommandError(gettext(
3357
"{0!r} is not present in revision {1}").format(
2913
3358
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3360
actual_file_id = old_file_id
2917
3362
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" % (
3363
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3364
actual_file_id = cur_file_id
3365
elif old_file_id is not None:
3366
actual_file_id = old_file_id
3368
raise errors.BzrCommandError(gettext(
3369
"{0!r} is not present in revision {1}").format(
2935
3370
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)
3372
from bzrlib.filter_tree import ContentFilterTree
3373
filter_tree = ContentFilterTree(rev_tree,
3374
rev_tree._content_filter_stack)
3375
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3377
content = rev_tree.get_file_text(actual_file_id)
3379
self.outf.write(content)
2952
3382
class cmd_local_time_offset(Command):
3013
3443
to trigger updates to external systems like bug trackers. The --fixes
3014
3444
option can be used to record the association between a revision and
3015
3445
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
3448
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3449
takes_args = ['selected*']
3076
3481
Option('show-diff', short_name='p',
3077
3482
help='When no message is supplied, show the diff along'
3078
3483
' with the status summary in the message editor.'),
3485
help='When committing to a foreign version control '
3486
'system do not push data that can not be natively '
3080
3489
aliases = ['ci', 'checkin']
3082
3491
def _iter_bug_fix_urls(self, fixes, branch):
3492
default_bugtracker = None
3083
3493
# Configure the properties for bug fixing attributes.
3084
3494
for fixed_bug in fixes:
3085
3495
tokens = fixed_bug.split(':')
3086
if len(tokens) != 2:
3087
raise errors.BzrCommandError(
3496
if len(tokens) == 1:
3497
if default_bugtracker is None:
3498
branch_config = branch.get_config()
3499
default_bugtracker = branch_config.get_user_option(
3501
if default_bugtracker is None:
3502
raise errors.BzrCommandError(gettext(
3503
"No tracker specified for bug %s. Use the form "
3504
"'tracker:id' or specify a default bug tracker "
3505
"using the `bugtracker` option.\nSee "
3506
"\"bzr help bugs\" for more information on this "
3507
"feature. Commit refused.") % fixed_bug)
3508
tag = default_bugtracker
3510
elif len(tokens) != 2:
3511
raise errors.BzrCommandError(gettext(
3088
3512
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3089
3513
"See \"bzr help bugs\" for more information on this "
3090
"feature.\nCommit refused." % fixed_bug)
3091
tag, bug_id = tokens
3514
"feature.\nCommit refused.") % fixed_bug)
3516
tag, bug_id = tokens
3093
3518
yield bugtracker.get_bug_url(tag, branch, bug_id)
3094
3519
except errors.UnknownBugTrackerAbbreviation:
3095
raise errors.BzrCommandError(
3096
'Unrecognized bug %s. Commit refused.' % fixed_bug)
3520
raise errors.BzrCommandError(gettext(
3521
'Unrecognized bug %s. Commit refused.') % fixed_bug)
3097
3522
except errors.MalformedBugIdentifier, e:
3098
raise errors.BzrCommandError(
3099
"%s\nCommit refused." % (str(e),))
3523
raise errors.BzrCommandError(gettext(
3524
"%s\nCommit refused.") % (str(e),))
3101
3526
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3527
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3528
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3530
from bzrlib.errors import (
3105
3531
PointlessCommit,
3106
3532
ConflictsInTree,
3184
3608
# make_commit_message_template_encoded returns user encoding.
3185
3609
# 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")
3611
my_message = set_commit_message(commit_obj)
3612
if my_message is None:
3613
start_message = generate_commit_message_template(commit_obj)
3614
my_message = edit_commit_message_encoded(text,
3615
start_message=start_message)
3616
if my_message is None:
3617
raise errors.BzrCommandError(gettext("please specify a commit"
3618
" message with either --message or --file"))
3619
if my_message == "":
3620
raise errors.BzrCommandError(gettext("Empty commit message specified."
3621
" Please specify a commit message with either"
3622
" --message or --file or leave a blank message"
3623
" with --message \"\"."))
3195
3624
return my_message
3197
3626
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3634
reporter=None, verbose=verbose, revprops=properties,
3206
3635
authors=author, timestamp=commit_stamp,
3207
3636
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3637
exclude=tree.safe_relpath_files(exclude),
3209
3639
except PointlessCommit:
3210
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3640
raise errors.BzrCommandError(gettext("No changes to commit."
3641
" Please 'bzr add' the files you want to commit, or use"
3642
" --unchanged to force an empty commit."))
3212
3643
except ConflictsInTree:
3213
raise errors.BzrCommandError('Conflicts detected in working '
3644
raise errors.BzrCommandError(gettext('Conflicts detected in working '
3214
3645
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3216
3647
except StrictCommitFailed:
3217
raise errors.BzrCommandError("Commit refused because there are"
3218
" unknown files in the working tree.")
3648
raise errors.BzrCommandError(gettext("Commit refused because there are"
3649
" unknown files in the working tree."))
3219
3650
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3651
e.extra_help = (gettext("\n"
3221
3652
'To commit to master branch, run update and then commit.\n'
3222
3653
'You can also pass --local to commit to continue working '
3297
3728
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.
3729
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3731
When the default format has changed after a major new release of
3732
Bazaar, you may be informed during certain operations that you
3733
should upgrade. Upgrading to a newer format may improve performance
3734
or make new features available. It may however limit interoperability
3735
with older repositories or with older versions of Bazaar.
3737
If you wish to upgrade to a particular format rather than the
3738
current default, that can be specified using the --format option.
3739
As a consequence, you can use the upgrade command this way to
3740
"downgrade" to an earlier format, though some conversions are
3741
a one way process (e.g. changing from the 1.x default to the
3742
2.x default) so downgrading is not always possible.
3744
A backup.bzr.~#~ directory is created at the start of the conversion
3745
process (where # is a number). By default, this is left there on
3746
completion. If the conversion fails, delete the new .bzr directory
3747
and rename this one back in its place. Use the --clean option to ask
3748
for the backup.bzr directory to be removed on successful conversion.
3749
Alternatively, you can delete it by hand if everything looks good
3752
If the location given is a shared repository, dependent branches
3753
are also converted provided the repository converts successfully.
3754
If the conversion of a branch fails, remaining branches are still
3757
For more information on upgrades, see the Bazaar Upgrade Guide,
3758
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3761
_see_also = ['check', 'reconcile', 'formats']
3306
3762
takes_args = ['url?']
3307
3763
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'),
3764
RegistryOption('format',
3765
help='Upgrade to a specific format. See "bzr help'
3766
' formats" for details.',
3767
lazy_registry=('bzrlib.controldir', 'format_registry'),
3768
converter=lambda name: controldir.format_registry.make_bzrdir(name),
3769
value_switches=True, title='Branch format'),
3771
help='Remove the backup.bzr directory if successful.'),
3773
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3776
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3777
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3778
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3780
if len(exceptions) == 1:
3781
# Compatibility with historical behavior
3321
3787
class cmd_whoami(Command):
3340
3807
encoding_type = 'replace'
3342
3809
@display_command
3343
def run(self, email=False, branch=False, name=None):
3810
def run(self, email=False, branch=False, name=None, directory=None):
3344
3811
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()
3812
if directory is None:
3813
# use branch if we're inside one; otherwise global config
3815
c = Branch.open_containing(u'.')[0].get_config_stack()
3816
except errors.NotBranchError:
3817
c = _mod_config.GlobalStack()
3819
c = Branch.open(directory).get_config_stack()
3820
identity = c.get('email')
3351
self.outf.write(c.user_email() + '\n')
3822
self.outf.write(_mod_config.extract_email_address(identity)
3353
self.outf.write(c.username() + '\n')
3825
self.outf.write(identity + '\n')
3829
raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3356
3832
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3834
_mod_config.extract_email_address(name)
3359
3835
except errors.NoEmailInUsername, e:
3360
3836
warning('"%s" does not seem to contain an email address. '
3361
3837
'This is allowed, but not recommended.', name)
3363
3839
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3841
if directory is None:
3842
c = Branch.open_containing(u'.')[0].get_config_stack()
3844
c = Branch.open(directory).get_config_stack()
3367
c = config.GlobalConfig()
3368
c.set_user_option('email', name)
3846
c = _mod_config.GlobalStack()
3847
c.set('email', name)
3371
3850
class cmd_nick(Command):
3586
4070
def run(self, testspecs_list=None, verbose=False, one=False,
3587
4071
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
4073
first=False, list_only=False,
3590
4074
randomize=None, exclude=None, strict=False,
3591
4075
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)
4076
parallel=None, lsprof_tests=False,
4079
# During selftest, disallow proxying, as it can cause severe
4080
# performance penalties and is only needed for thread
4081
# safety. The selftest command is assumed to not use threads
4082
# too heavily. The call should be as early as possible, as
4083
# error reporting for past duplicate imports won't have useful
4085
lazy_import.disallow_proxying()
4087
from bzrlib import tests
3602
4089
if testspecs_list is not None:
3603
4090
pattern = '|'.join(testspecs_list)
3608
4095
from bzrlib.tests import SubUnitBzrRunner
3609
4096
except ImportError:
3610
raise errors.BzrCommandError("subunit not available. subunit "
3611
"needs to be installed to use --subunit.")
4097
raise errors.BzrCommandError(gettext("subunit not available. subunit "
4098
"needs to be installed to use --subunit."))
3612
4099
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
4100
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
4101
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
4102
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4103
# following code can be deleted when it's sufficiently deployed
4104
# -- vila/mgz 20100514
4105
if (sys.platform == "win32"
4106
and getattr(sys.stdout, 'fileno', None) is not None):
3617
4108
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
4110
self.additional_selftest_args.setdefault(
3620
4111
'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)
4113
raise errors.BzrCommandError(gettext(
4114
"--benchmark is no longer supported from bzr 2.2; "
4115
"use bzr-usertest instead"))
4116
test_suite_factory = None
4118
exclude_pattern = None
3629
test_suite_factory = None
4120
exclude_pattern = '(' + '|'.join(exclude) + ')'
4122
self._disable_fsync()
3631
4123
selftest_kwargs = {"verbose": verbose,
3632
4124
"pattern": pattern,
3633
4125
"stop_on_failure": one,
3635
4127
"test_suite_factory": test_suite_factory,
3636
4128
"lsprof_timed": lsprof_timed,
3637
4129
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
4130
"matching_tests_first": first,
3640
4131
"list_only": list_only,
3641
4132
"random_seed": randomize,
3642
"exclude_pattern": exclude,
4133
"exclude_pattern": exclude_pattern,
3643
4134
"strict": strict,
3644
4135
"load_list": load_list,
3645
4136
"debug_flags": debugflag,
3646
4137
"starting_with": starting_with
3648
4139
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
4141
# Make deprecation warnings visible, unless -Werror is set
4142
cleanup = symbol_versioning.activate_deprecation_warnings(
4145
result = tests.selftest(**selftest_kwargs)
3650
4148
return int(not result)
4150
def _disable_fsync(self):
4151
"""Change the 'os' functionality to not synchronize."""
4152
self._orig_fsync = getattr(os, 'fsync', None)
4153
if self._orig_fsync is not None:
4154
os.fsync = lambda filedes: None
4155
self._orig_fdatasync = getattr(os, 'fdatasync', None)
4156
if self._orig_fdatasync is not None:
4157
os.fdatasync = lambda filedes: None
3653
4160
class cmd_version(Command):
3654
4161
__doc__ = """Show version of bzr."""
3709
4214
The source of the merge can be specified either in the form of a branch,
3710
4215
or in the form of a path to a file containing a merge directive generated
3711
4216
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.
4217
or the branch most recently merged using --remember. The source of the
4218
merge may also be specified in the form of a path to a file in another
4219
branch: in this case, only the modifications to that file are merged into
4220
the current working tree.
4222
When merging from a branch, by default bzr will try to merge in all new
4223
work from the other branch, automatically determining an appropriate base
4224
revision. If this fails, you may need to give an explicit base.
4226
To pick a different ending revision, pass "--revision OTHER". bzr will
4227
try to merge in all new work up to and including revision OTHER.
4229
If you specify two values, "--revision BASE..OTHER", only revisions BASE
4230
through OTHER, excluding BASE but including OTHER, will be merged. If this
4231
causes some revisions to be skipped, i.e. if the destination branch does
4232
not already contain revision BASE, such a merge is commonly referred to as
4233
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4234
cherrypicks. The changes look like a normal commit, and the history of the
4235
changes from the other branch is not stored in the commit.
4237
Revision numbers are always relative to the source branch.
3725
4239
Merge will do its best to combine the changes in two branches, but there
3726
4240
are some kinds of problems only a human can fix. When it encounters those,
3727
4241
it will mark a conflict. A conflict means that you need to fix something,
3728
before you should commit.
4242
before you can commit.
3730
4244
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.
4246
If there is no default branch set, the first merge will set it (use
4247
--no-remember to avoid setting it). After that, you can omit the branch
4248
to use the default. To change the default, use --remember. The value will
4249
only be saved if the remote location can be accessed.
3737
4251
The results of the merge are placed into the destination working
3738
4252
directory, where they can be reviewed (with bzr diff), tested, and then
3739
4253
committed to record the result of the merge.
3741
4255
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
4256
--force is given. If --force is given, then the changes from the source
4257
will be merged with the current working tree, including any uncommitted
4258
changes in the tree. The --force option can also be used to create a
3743
4259
merge revision which has more than two parents.
3745
4261
If one would like to merge changes from the working tree of the other
3873
4389
self.sanity_check_merger(merger)
3874
4390
if (merger.base_rev_id == merger.other_rev_id and
3875
4391
merger.other_rev_id is not None):
3876
note('Nothing to do.')
4392
# check if location is a nonexistent file (and not a branch) to
4393
# disambiguate the 'Nothing to do'
4394
if merger.interesting_files:
4395
if not merger.other_tree.has_filename(
4396
merger.interesting_files[0]):
4397
note(gettext("merger: ") + str(merger))
4398
raise errors.PathsDoNotExist([location])
4399
note(gettext('Nothing to do.'))
4401
if pull and not preview:
3879
4402
if merger.interesting_files is not None:
3880
raise errors.BzrCommandError('Cannot pull individual files')
4403
raise errors.BzrCommandError(gettext('Cannot pull individual files'))
3881
4404
if (merger.base_rev_id == tree.last_revision()):
3882
4405
result = tree.pull(merger.other_branch, False,
3883
4406
merger.other_rev_id)
3884
4407
result.report(self.outf)
3886
4409
if merger.this_basis is None:
3887
raise errors.BzrCommandError(
4410
raise errors.BzrCommandError(gettext(
3888
4411
"This branch has no commits."
3889
" (perhaps you would prefer 'bzr pull')")
4412
" (perhaps you would prefer 'bzr pull')"))
3891
4414
return self._do_preview(merger)
3892
4415
elif interactive:
3988
4513
if other_revision_id is None:
3989
4514
other_revision_id = _mod_revision.ensure_null(
3990
4515
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):
4516
# Remember where we merge from. We need to remember if:
4517
# - user specify a location (and we don't merge from the parent
4519
# - user ask to remember or there is no previous location set to merge
4520
# from and user didn't ask to *not* remember
4521
if (user_location is not None
4523
or (remember is None
4524
and tree.branch.get_submit_branch() is None)))):
3994
4525
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4526
# Merge tags (but don't set them in the master branch yet, the user
4527
# might revert this merge). Commit will propagate them.
4528
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4529
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4530
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4531
if other_path != '':
4340
4876
theirs_only=False,
4341
4877
log_format=None, long=False, short=False, line=False,
4342
4878
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4879
include_merged=None, revision=None, my_revision=None,
4881
include_merges=symbol_versioning.DEPRECATED_PARAMETER):
4344
4882
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4883
def message(s):
4346
4884
if not is_quiet():
4347
4885
self.outf.write(s)
4887
if symbol_versioning.deprecated_passed(include_merges):
4888
ui.ui_factory.show_user_warning(
4889
'deprecated_command_option',
4890
deprecated_name='--include-merges',
4891
recommended_name='--include-merged',
4892
deprecated_in_version='2.5',
4893
command=self.invoked_as)
4894
if include_merged is None:
4895
include_merged = include_merges
4897
raise errors.BzrCommandError(gettext(
4898
'{0} and {1} are mutually exclusive').format(
4899
'--include-merges', '--include-merged'))
4900
if include_merged is None:
4901
include_merged = False
4350
4903
mine_only = this
4430
4985
if mine_only and not local_extra:
4431
4986
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4987
message(gettext('This branch has no new revisions.\n'))
4433
4988
elif theirs_only and not remote_extra:
4434
4989
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4990
message(gettext('Other branch has no new revisions.\n'))
4436
4991
elif not (mine_only or theirs_only or local_extra or
4438
4993
# We checked both branches, and neither one had extra
4440
message("Branches are up to date.\n")
4995
message(gettext("Branches are up to date.\n"))
4441
4996
self.cleanup_now()
4442
4997
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)
4998
self.add_cleanup(local_branch.lock_write().unlock)
4445
4999
# handle race conditions - a parent might be set while we run.
4446
5000
if local_branch.get_parent() is None:
4447
5001
local_branch.set_parent(remote_branch.base)
4578
5115
Option('long', help='Show commit date in annotations.'),
4582
5120
encoding_type = 'exact'
4584
5122
@display_command
4585
5123
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
5124
show_ids=False, directory=None):
5125
from bzrlib.annotate import (
4588
5128
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
5129
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
5130
if wt is not None:
4592
self.add_cleanup(wt.unlock)
5131
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
5133
self.add_cleanup(branch.lock_read().unlock)
4596
5134
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
5135
self.add_cleanup(tree.lock_read().unlock)
5136
if wt is not None and revision is None:
4600
5137
file_id = wt.path2id(relpath)
4602
5139
file_id = tree.path2id(relpath)
4603
5140
if file_id is None:
4604
5141
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
5142
if wt is not None and revision is None:
4607
5143
# If there is a tree and we're not annotating historical
4608
5144
# versions, annotate the working tree's content.
4609
5145
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
5146
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
5148
annotate_file_tree(tree, file_id, self.outf, long, all,
5149
show_ids=show_ids, branch=branch)
4616
5152
class cmd_re_sign(Command):
4620
5156
hidden = True # is this right ?
4621
5157
takes_args = ['revision_id*']
4622
takes_options = ['revision']
5158
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
5160
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
5161
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')
5162
raise errors.BzrCommandError(gettext('You can only supply one of revision_id or --revision'))
4627
5163
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)
5164
raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5165
b = WorkingTree.open_containing(directory)[0].branch
5166
self.add_cleanup(b.lock_write().unlock)
4632
5167
return self._run(b, revision_id_list, revision)
4634
5169
def _run(self, b, revision_id_list, revision):
4635
5170
import bzrlib.gpg as gpg
4636
gpg_strategy = gpg.GPGStrategy(b.get_config())
5171
gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
4637
5172
if revision_id_list is not None:
4638
5173
b.repository.start_write_group()
4694
5229
_see_also = ['checkouts', 'unbind']
4695
5230
takes_args = ['location?']
5231
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
5233
def run(self, location=None, directory=u'.'):
5234
b, relpath = Branch.open_containing(directory)
4700
5235
if location is None:
4702
5237
location = b.get_old_bound_location()
4703
5238
except errors.UpgradeRequired:
4704
raise errors.BzrCommandError('No location supplied. '
4705
'This format does not remember old locations.')
5239
raise errors.BzrCommandError(gettext('No location supplied. '
5240
'This format does not remember old locations.'))
4707
5242
if location is None:
4708
5243
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
5244
raise errors.BzrCommandError(gettext('Branch is already bound'))
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
5246
raise errors.BzrCommandError(gettext('No location supplied '
5247
'and no previous location known'))
4713
5248
b_other = Branch.open(location)
4715
5250
b.bind(b_other)
4716
5251
except errors.DivergedBranches:
4717
raise errors.BzrCommandError('These branches have diverged.'
4718
' Try merging, and then bind again.')
5252
raise errors.BzrCommandError(gettext('These branches have diverged.'
5253
' Try merging, and then bind again.'))
4719
5254
if b.get_config().has_explicit_nickname():
4720
5255
b.nick = b_other.nick
4784
5320
b = control.open_branch()
4786
5322
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5323
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)
5325
self.add_cleanup(b.lock_write().unlock)
5326
return self._run(b, tree, dry_run, verbose, revision, force,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5329
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4795
5331
from bzrlib.log import log_formatter, show_log
4796
5332
from bzrlib.uncommit import uncommit
4827
5363
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
5366
self.outf.write(gettext('Dry-run, pretending to remove'
5367
' the above revisions.\n'))
4833
self.outf.write('The above revision(s) will be removed.\n')
5369
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')
5372
if not ui.ui_factory.confirm_action(
5373
gettext(u'Uncommit these revisions'),
5374
'bzrlib.builtins.uncommit',
5376
self.outf.write(gettext('Canceled\n'))
4840
5379
mutter('Uncommitting from {%s} to {%s}',
4841
5380
last_rev_id, rev_id)
4842
5381
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)
5382
revno=revno, local=local, keep_tags=keep_tags)
5383
self.outf.write(gettext('You can restore the old tip by running:\n'
5384
' bzr pull . -r revid:%s\n') % last_rev_id)
4848
5387
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5388
__doc__ = """Break a dead lock.
5390
This command breaks a lock on a repository, branch, working directory or
4851
5393
CAUTION: Locks should only be broken when you are sure that the process
4852
5394
holding the lock has been stopped.
4936
5495
return host, port
4938
5497
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4940
from bzrlib.transport import get_transport, transport_server_registry
5498
protocol=None, client_timeout=None):
5499
from bzrlib import transport
4941
5500
if directory is None:
4942
5501
directory = os.getcwd()
4943
5502
if protocol is None:
4944
protocol = transport_server_registry.get()
5503
protocol = transport.transport_server_registry.get()
4945
5504
host, port = self.get_host_and_port(port)
4946
url = urlutils.local_path_to_url(directory)
5505
url = transport.location_to_url(directory)
4947
5506
if not allow_writes:
4948
5507
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5508
t = transport.get_transport_from_url(url)
5510
protocol(t, host, port, inet, client_timeout)
5511
except TypeError, e:
5512
# We use symbol_versioning.deprecated_in just so that people
5513
# grepping can find it here.
5514
# symbol_versioning.deprecated_in((2, 5, 0))
5515
symbol_versioning.warn(
5516
'Got TypeError(%s)\ntrying to call protocol: %s.%s\n'
5517
'Most likely it needs to be updated to support a'
5518
' "timeout" parameter (added in bzr 2.5.0)'
5519
% (e, protocol.__module__, protocol),
5521
protocol(t, host, port, inet)
4953
5524
class cmd_join(Command):
5359
5935
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5936
self.add_cleanup(branch.lock_write().unlock)
5363
5938
if tag_name is None:
5364
raise errors.BzrCommandError("No tag specified to delete.")
5939
raise errors.BzrCommandError(gettext("No tag specified to delete."))
5365
5940
branch.tags.delete_tag(tag_name)
5366
self.outf.write('Deleted tag %s.\n' % tag_name)
5941
note(gettext('Deleted tag %s.') % tag_name)
5369
5944
if len(revision) != 1:
5370
raise errors.BzrCommandError(
5945
raise errors.BzrCommandError(gettext(
5371
5946
"Tags can only be placed on a single revision, "
5373
5948
revision_id = revision[0].as_revision_id(branch)
5375
5950
revision_id = branch.last_revision()
5376
5951
if tag_name is None:
5377
5952
tag_name = branch.automatic_tag_name(revision_id)
5378
5953
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):
5954
raise errors.BzrCommandError(gettext(
5955
"Please specify a tag name."))
5957
existing_target = branch.tags.lookup_tag(tag_name)
5958
except errors.NoSuchTag:
5959
existing_target = None
5960
if not force and existing_target not in (None, revision_id):
5382
5961
raise errors.TagAlreadyExists(tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5962
if existing_target == revision_id:
5963
note(gettext('Tag %s already exists for that revision.') % tag_name)
5965
branch.tags.set_tag(tag_name, revision_id)
5966
if existing_target is None:
5967
note(gettext('Created tag %s.') % tag_name)
5969
note(gettext('Updated tag %s.') % tag_name)
5387
5972
class cmd_tags(Command):
5393
5978
_see_also = ['tag']
5394
5979
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5980
custom_help('directory',
5981
help='Branch whose tags should be displayed.'),
5982
RegistryOption('sort',
5401
5983
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5984
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
5990
@display_command
5991
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5992
from bzrlib.tag import tag_sort_methods
5416
5993
branch, relpath = Branch.open_containing(directory)
5418
5995
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
5999
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]])
6001
# Restrict to the specified range
6002
tags = self._tags_for_range(branch, revision)
6004
sort = tag_sort_methods.get()
5444
6006
if not show_ids:
5445
6007
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
6008
for index, (tag, revid) in enumerate(tags):
5457
6021
for tag, revspec in tags:
5458
6022
self.outf.write('%-20s %s\n' % (tag, revspec))
6024
def _tags_for_range(self, branch, revision):
6026
rev1, rev2 = _get_revision_range(revision, branch, self.name())
6027
revid1, revid2 = rev1.rev_id, rev2.rev_id
6028
# _get_revision_range will always set revid2 if it's not specified.
6029
# If revid1 is None, it means we want to start from the branch
6030
# origin which is always a valid ancestor. If revid1 == revid2, the
6031
# ancestry check is useless.
6032
if revid1 and revid1 != revid2:
6033
# FIXME: We really want to use the same graph than
6034
# branch.iter_merge_sorted_revisions below, but this is not
6035
# easily available -- vila 2011-09-23
6036
if branch.repository.get_graph().is_ancestor(revid2, revid1):
6037
# We don't want to output anything in this case...
6039
# only show revisions between revid1 and revid2 (inclusive)
6040
tagged_revids = branch.tags.get_reverse_tag_dict()
6042
for r in branch.iter_merge_sorted_revisions(
6043
start_revision_id=revid2, stop_revision_id=revid1,
6044
stop_rule='include'):
6045
revid_tags = tagged_revids.get(r[0], None)
6047
found.extend([(tag, r[0]) for tag in revid_tags])
5461
6051
class cmd_reconfigure(Command):
5462
6052
__doc__ = """Reconfigure the type of a bzr directory.
5476
6066
takes_args = ['location?']
5477
6067
takes_options = [
5478
6068
RegistryOption.from_kwargs(
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
6071
help='The relation between branch and tree.',
5482
6072
value_switches=True, enum_switch=False,
5483
6073
branch='Reconfigure to be an unbound branch with no working tree.',
5484
6074
tree='Reconfigure to be an unbound branch with a working tree.',
5485
6075
checkout='Reconfigure to be a bound branch with a working tree.',
5486
6076
lightweight_checkout='Reconfigure to be a lightweight'
5487
6077
' checkout (with no local history).',
6079
RegistryOption.from_kwargs(
6081
title='Repository type',
6082
help='Location fo the repository.',
6083
value_switches=True, enum_switch=False,
5488
6084
standalone='Reconfigure to be a standalone branch '
5489
6085
'(i.e. stop using shared repository).',
5490
6086
use_shared='Reconfigure to use a shared repository.',
6088
RegistryOption.from_kwargs(
6090
title='Trees in Repository',
6091
help='Whether new branches in the repository have trees.',
6092
value_switches=True, enum_switch=False,
5491
6093
with_trees='Reconfigure repository to create '
5492
6094
'working trees on branches by default.',
5493
6095
with_no_trees='Reconfigure repository to not create '
5520
6122
# At the moment you can use --stacked-on and a different
5521
6123
# reconfiguration shape at the same time; there seems no good reason
5523
if target_type is None:
6125
if (tree_type is None and
6126
repository_type is None and
6127
repository_trees is None):
5524
6128
if stacked_on or unstacked:
5527
raise errors.BzrCommandError('No target configuration '
5529
elif target_type == 'branch':
6131
raise errors.BzrCommandError(gettext('No target configuration '
6133
reconfiguration = None
6134
if tree_type == 'branch':
5530
6135
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5531
elif target_type == 'tree':
6136
elif tree_type == 'tree':
5532
6137
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5533
elif target_type == 'checkout':
6138
elif tree_type == 'checkout':
5534
6139
reconfiguration = reconfigure.Reconfigure.to_checkout(
5535
6140
directory, bind_to)
5536
elif target_type == 'lightweight-checkout':
6141
elif tree_type == 'lightweight-checkout':
5537
6142
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5538
6143
directory, bind_to)
5539
elif target_type == 'use-shared':
6145
reconfiguration.apply(force)
6146
reconfiguration = None
6147
if repository_type == 'use-shared':
5540
6148
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5541
elif target_type == 'standalone':
6149
elif repository_type == 'standalone':
5542
6150
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5543
elif target_type == 'with-trees':
6152
reconfiguration.apply(force)
6153
reconfiguration = None
6154
if repository_trees == 'with-trees':
5544
6155
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5545
6156
directory, True)
5546
elif target_type == 'with-no-trees':
6157
elif repository_trees == 'with-no-trees':
5547
6158
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5548
6159
directory, False)
5549
reconfiguration.apply(force)
6161
reconfiguration.apply(force)
6162
reconfiguration = None
5552
6165
class cmd_switch(Command):
5600
6214
had_explicit_nick = False
5601
6215
if create_branch:
5602
6216
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)
6217
raise errors.BzrCommandError(
6218
gettext('cannot create branch without source branch'))
6219
to_location = lookup_new_sibling_branch(control_dir, to_location)
5611
6220
to_branch = branch.bzrdir.sprout(to_location,
5612
possible_transports=[branch.bzrdir.root_transport],
5613
source_branch=branch).open_branch()
6221
possible_transports=[branch.bzrdir.root_transport],
6222
source_branch=branch).open_branch()
5616
to_branch = Branch.open(to_location)
5617
except errors.NotBranchError:
5618
this_url = self._get_branch_location(control_dir)
5619
to_branch = Branch.open(
5620
urlutils.join(this_url, '..', to_location))
6224
to_branch = lookup_sibling_branch(control_dir, to_location)
5621
6225
if revision is not None:
5622
6226
revision = revision.as_revision_id(to_branch)
5623
6227
switch.switch(control_dir, to_branch, force, revision_id=revision)
5624
6228
if had_explicit_nick:
5625
6229
branch = control_dir.open_branch() #get the new branch!
5626
6230
branch.nick = to_branch.nick
5627
note('Switched to branch: %s',
6231
note(gettext('Switched to branch: %s'),
5628
6232
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
6236
class cmd_view(Command):
5735
tree, file_list = tree_files(file_list, apply_view=False)
6323
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
6325
current_view, view_dict = tree.views.get_view_info()
5737
6326
if name is None:
5738
6327
name = current_view
5741
raise errors.BzrCommandError(
5742
"Both --delete and a file list specified")
6330
raise errors.BzrCommandError(gettext(
6331
"Both --delete and a file list specified"))
5744
raise errors.BzrCommandError(
5745
"Both --delete and --switch specified")
6333
raise errors.BzrCommandError(gettext(
6334
"Both --delete and --switch specified"))
5747
6336
tree.views.set_view_info(None, {})
5748
self.outf.write("Deleted all views.\n")
6337
self.outf.write(gettext("Deleted all views.\n"))
5749
6338
elif name is None:
5750
raise errors.BzrCommandError("No current view to delete")
6339
raise errors.BzrCommandError(gettext("No current view to delete"))
5752
6341
tree.views.delete_view(name)
5753
self.outf.write("Deleted '%s' view.\n" % name)
6342
self.outf.write(gettext("Deleted '%s' view.\n") % name)
5756
raise errors.BzrCommandError(
5757
"Both --switch and a file list specified")
6345
raise errors.BzrCommandError(gettext(
6346
"Both --switch and a file list specified"))
5759
raise errors.BzrCommandError(
5760
"Both --switch and --all specified")
6348
raise errors.BzrCommandError(gettext(
6349
"Both --switch and --all specified"))
5761
6350
elif switch == 'off':
5762
6351
if current_view is None:
5763
raise errors.BzrCommandError("No current view to disable")
6352
raise errors.BzrCommandError(gettext("No current view to disable"))
5764
6353
tree.views.set_view_info(None, view_dict)
5765
self.outf.write("Disabled '%s' view.\n" % (current_view))
6354
self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
5767
6356
tree.views.set_view_info(switch, view_dict)
5768
6357
view_str = views.view_display_str(tree.views.lookup_view())
5769
self.outf.write("Using '%s' view: %s\n" % (switch, view_str))
6358
self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
5772
self.outf.write('Views defined:\n')
6361
self.outf.write(gettext('Views defined:\n'))
5773
6362
for view in sorted(view_dict):
5774
6363
if view == current_view:
5778
6367
view_str = views.view_display_str(view_dict[view])
5779
6368
self.outf.write('%s %-20s %s\n' % (active, view, view_str))
5781
self.outf.write('No views defined.\n')
6370
self.outf.write(gettext('No views defined.\n'))
5782
6371
elif file_list:
5783
6372
if name is None:
5784
6373
# No name given and no current view set
5786
6375
elif name == 'off':
5787
raise errors.BzrCommandError(
5788
"Cannot change the 'off' pseudo view")
6376
raise errors.BzrCommandError(gettext(
6377
"Cannot change the 'off' pseudo view"))
5789
6378
tree.views.set_view(name, sorted(file_list))
5790
6379
view_str = views.view_display_str(tree.views.lookup_view())
5791
self.outf.write("Using '%s' view: %s\n" % (name, view_str))
6380
self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
5793
6382
# list the files
5794
6383
if name is None:
5795
6384
# No name given and no current view set
5796
self.outf.write('No current view.\n')
6385
self.outf.write(gettext('No current view.\n'))
5798
6387
view_str = views.view_display_str(tree.views.lookup_view(name))
5799
self.outf.write("'%s' view is: %s\n" % (name, view_str))
6388
self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
5802
6391
class cmd_hooks(Command):
5883
6485
Option('destroy',
5884
6486
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6488
_see_also = ['unshelve', 'configuration']
5888
6490
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6491
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6493
return self.run_for_list(directory=directory)
5892
6494
from bzrlib.shelf_ui import Shelver
5893
6495
if writer is None:
5894
6496
writer = bzrlib.option.diff_writer_registry.get()
5896
6498
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6499
file_list, message, destroy=destroy, directory=directory)
6032
6637
self.outf.write('%s %s\n' % (path, location))
6640
class cmd_export_pot(Command):
6641
__doc__ = """Export command helps and error messages in po format."""
6644
takes_options = [Option('plugin',
6645
help='Export help text from named command '\
6646
'(defaults to all built in commands).',
6648
Option('include-duplicates',
6649
help='Output multiple copies of the same msgid '
6650
'string if it appears more than once.'),
6653
def run(self, plugin=None, include_duplicates=False):
6654
from bzrlib.export_pot import export_pot
6655
export_pot(self.outf, plugin, include_duplicates)
6035
6658
def _register_lazy_builtins():
6036
6659
# register lazy builtins from other modules; called at startup and should
6037
6660
# be only called once.
6038
6661
for (name, aliases, module_name) in [
6039
6662
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6663
('cmd_config', [], 'bzrlib.config'),
6040
6664
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6665
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6666
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6667
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6668
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6669
('cmd_verify_signatures', [],
6670
'bzrlib.commit_signature_commands'),
6671
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6673
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
